bignet debug

* Add VirtualBlueHashes to BlockDAG

* Refactor TestGHOSTDAG to read DAGs from json files

* Added a new DAG for the ghostdag test suite

* Pass BehaviorFlags to delayed blocks

README.md

@@ -40,10 +40,8 @@ recommended that `GOPATH` is set to a directory in your home directory such as
 ```bash
 $ git clone https://github.com/kaspanet/kaspad $GOPATH/src/github.com/kaspanet/kaspad
 $ cd $GOPATH/src/github.com/kaspanet/kaspad
-$ ./test.sh
 $ go install . ./cmd/...
 ```
-`./test.sh` tests can be skipped, but some things might not run correctly on your system if tests fail.
 
 - Kaspad (and utilities) should now be installed in `$GOPATH/bin`. If you did
   not already add the bin directory to your system path during Go installation,

app/app.go

@@ -4,24 +4,24 @@ import (
 	"fmt"
 	"sync/atomic"
 
-	"github.com/kaspanet/kaspad/network/addressmanager"
+	"github.com/kaspanet/kaspad/infrastructure/network/addressmanager"
 
-	"github.com/kaspanet/kaspad/network/netadapter/id"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/id"
 
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol"
 	"github.com/kaspanet/kaspad/domain/blockdag"
 	"github.com/kaspanet/kaspad/domain/blockdag/indexers"
 	"github.com/kaspanet/kaspad/domain/mempool"
 	"github.com/kaspanet/kaspad/domain/mining"
 	"github.com/kaspanet/kaspad/domain/txscript"
 	"github.com/kaspanet/kaspad/infrastructure/config"
-	"github.com/kaspanet/kaspad/infrastructure/dbaccess"
+	"github.com/kaspanet/kaspad/infrastructure/db/dbaccess"
-	"github.com/kaspanet/kaspad/infrastructure/signal"
+	"github.com/kaspanet/kaspad/infrastructure/network/connmanager"
-	"github.com/kaspanet/kaspad/network/connmanager"
+	"github.com/kaspanet/kaspad/infrastructure/network/dnsseed"
-	"github.com/kaspanet/kaspad/network/dnsseed"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/rpc"
-	"github.com/kaspanet/kaspad/network/netadapter"
+	"github.com/kaspanet/kaspad/infrastructure/os/signal"
-	"github.com/kaspanet/kaspad/network/protocol"
-	"github.com/kaspanet/kaspad/network/rpc"
 	"github.com/kaspanet/kaspad/util"
 	"github.com/kaspanet/kaspad/util/panics"
 )
@@ -114,13 +114,14 @@ func New(cfg *config.Config, databaseContext *dbaccess.DatabaseContext, interrup
 	if err != nil {
 		return nil, err
 	}
-	addressManager := addressmanager.New(cfg, databaseContext)
+	addressManager, err := addressmanager.New(cfg, databaseContext)
-
+	if err != nil {
+		return nil, err
+	}
 	connectionManager, err := connmanager.New(cfg, netAdapter, addressManager)
 	if err != nil {
 		return nil, err
 	}
-
 	protocolManager, err := protocol.NewManager(cfg, dag, netAdapter, addressManager, txMempool, connectionManager)
 	if err != nil {
 		return nil, err
@@ -143,8 +144,8 @@ func New(cfg *config.Config, databaseContext *dbaccess.DatabaseContext, interrup
 
 func (a *App) maybeSeedFromDNS() {
 	if !a.cfg.DisableDNSSeed {
-		dnsseed.SeedFromDNS(a.cfg.NetParams(), a.cfg.DNSSeed, domainmessage.SFNodeNetwork, false, nil,
+		dnsseed.SeedFromDNS(a.cfg.NetParams(), a.cfg.DNSSeed, appmessage.SFNodeNetwork, false, nil,
-			a.cfg.Lookup, func(addresses []*domainmessage.NetAddress) {
+			a.cfg.Lookup, func(addresses []*appmessage.NetAddress) {
 				// Kaspad uses a lookup of the dns seeder here. Since seeder returns
 				// IPs of nodes and not its own IP, we can not know real IP of
 				// source. So we'll take first returned address as source.

app/appmessage/README.md

@@ -36,7 +36,7 @@ to a remote node running a kaspa peer. Example syntax is:
 
 	// Reads and validates the next kaspa message from conn using the
 	// protocol version pver and the kaspa network kaspanet. The returns
-	// are a domainmessage.Message, a []byte which contains the unmarshalled
+	// are a appmessage.Message, a []byte which contains the unmarshalled
 	// raw payload, and a possible error.
 	msg, rawPayload, err := wire.ReadMessage(conn, pver, kaspanet)
 	if err != nil {

app/appmessage/base_message.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import "time"
 

app/appmessage/bench_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"bytes"
@@ -16,7 +16,7 @@ import (
 )
 
 // genesisCoinbaseTx is the coinbase transaction for the genesis blocks for
-// the main network, regression test network, and test network.
+// the main network and test network.
 var genesisCoinbaseTxIns = []*TxIn{
 	{
 		PreviousOutpoint: Outpoint{
@@ -352,7 +352,7 @@ func BenchmarkReadBlockHeader(b *testing.B) {
 		0x3a, 0x9f, 0xb8, 0xaa, 0x4b, 0x1e, 0x5e, 0x4a, // MerkleRoot
 		0x29, 0xab, 0x5f, 0x49, 0x00, 0x00, 0x00, 0x00, // Timestamp
 		0xff, 0xff, 0x00, 0x1d, // Bits
-		0xf3, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, // Fake Nonce. TODO: (Ori) Replace to a real nonce
+		0xf3, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, // Fake Nonce
 		0x00, // TxnCount Varint
 	}
 	r := bytes.NewReader(buf)

app/appmessage/blockheader.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"fmt"
@@ -88,7 +88,7 @@ func (h *BlockHeader) IsGenesis() bool {
 // KaspaDecode decodes r using the kaspa protocol encoding into the receiver.
 // This is part of the Message interface implementation.
 // See Deserialize for decoding block headers stored to disk, such as in a
-// database, as opposed to decoding block headers from the domainmessage.
+// database, as opposed to decoding block headers from the appmessage.
 func (h *BlockHeader) KaspaDecode(r io.Reader, pver uint32) error {
 	return readBlockHeader(r, pver, h)
 }
@@ -96,7 +96,7 @@ func (h *BlockHeader) KaspaDecode(r io.Reader, pver uint32) error {
 // KaspaEncode encodes the receiver to w using the kaspa protocol encoding.
 // This is part of the Message interface implementation.
 // See Serialize for encoding block headers to be stored to disk, such as in a
-// database, as opposed to encoding block headers for the domainmessage.
+// database, as opposed to encoding block headers for the appmessage.
 func (h *BlockHeader) KaspaEncode(w io.Writer, pver uint32) error {
 	return writeBlockHeader(w, pver, h)
 }
@@ -105,7 +105,7 @@ func (h *BlockHeader) KaspaEncode(w io.Writer, pver uint32) error {
 // that is suitable for long-term storage such as a database while respecting
 // the Version field.
 func (h *BlockHeader) Deserialize(r io.Reader) error {
-	// At the current time, there is no difference between the domainmessage encoding
+	// At the current time, there is no difference between the appmessage encoding
 	// at protocol version 0 and the stable long-term storage format. As
 	// a result, make use of readBlockHeader.
 	return readBlockHeader(r, 0, h)
@@ -115,7 +115,7 @@ func (h *BlockHeader) Deserialize(r io.Reader) error {
 // that is suitable for long-term storage such as a database while respecting
 // the Version field.
 func (h *BlockHeader) Serialize(w io.Writer) error {
-	// At the current time, there is no difference between the domainmessage encoding
+	// At the current time, there is no difference between the appmessage encoding
 	// at protocol version 0 and the stable long-term storage format. As
 	// a result, make use of writeBlockHeader.
 	return writeBlockHeader(w, 0, h)
@@ -149,7 +149,7 @@ func NewBlockHeader(version int32, parentHashes []*daghash.Hash, hashMerkleRoot
 
 // readBlockHeader reads a kaspa block header from r. See Deserialize for
 // decoding block headers stored to disk, such as in a database, as opposed to
-// decoding from the domainmessage.
+// decoding from the appmessage.
 func readBlockHeader(r io.Reader, pver uint32, bh *BlockHeader) error {
 	var numParentBlocks byte
 	err := readElements(r, &bh.Version, &numParentBlocks)
@@ -175,7 +175,7 @@ func readBlockHeader(r io.Reader, pver uint32, bh *BlockHeader) error {
 
 // writeBlockHeader writes a kaspa block header to w. See Serialize for
 // encoding block headers to be stored to disk, such as in a database, as
-// opposed to encoding for the domainmessage.
+// opposed to encoding for the appmessage.
 func writeBlockHeader(w io.Writer, pver uint32, bh *BlockHeader) error {
 	timestamp := bh.Timestamp.UnixMilliseconds()
 	if err := writeElements(w, bh.Version, bh.NumParentBlocks()); err != nil {

app/appmessage/blockheader_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"bytes"
@@ -47,7 +47,7 @@ func TestBlockHeader(t *testing.T) {
 	}
 }
 
-// TestBlockHeaderEncoding tests the BlockHeader domainmessage encode and decode for various
+// TestBlockHeaderEncoding tests the BlockHeader appmessage encode and decode for various
 // protocol versions.
 func TestBlockHeaderEncoding(t *testing.T) {
 	nonce := uint64(123123) // 0x000000000001e0f3
@@ -66,7 +66,7 @@ func TestBlockHeaderEncoding(t *testing.T) {
 		Nonce:                nonce,
 	}
 
-	// baseBlockHdrEncoded is the domainmessage encoded bytes of baseBlockHdr.
+	// baseBlockHdrEncoded is the appmessage encoded bytes of baseBlockHdr.
 	baseBlockHdrEncoded := []byte{
 		0x01, 0x00, 0x00, 0x00, // Version 1
 		0x02,                                           // NumParentBlocks
@@ -92,14 +92,14 @@ func TestBlockHeaderEncoding(t *testing.T) {
 		0x65, 0x9C, 0x79, 0x3C, 0xE3, 0x70, 0xD9, 0x5F,
 		0x99, 0x0f, 0xed, 0x15, 0x73, 0x01, 0x00, 0x00, // Timestamp
 		0xff, 0xff, 0x00, 0x1d, // Bits
-		0xf3, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, // Fake Nonce. TODO: (Ori) Replace to a real nonce
+		0xf3, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, // Fake Nonce
 	}
 
 	tests := []struct {
 		in   *BlockHeader // Data to encode
 		out  *BlockHeader // Expected decoded data
 		buf  []byte       // Encoded data
-		pver uint32       // Protocol version for domainmessage encoding
+		pver uint32       // Protocol version for appmessage encoding
 	}{
 		// Latest protocol version.
 		{
@@ -112,7 +112,7 @@ func TestBlockHeaderEncoding(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		var buf bytes.Buffer
 		err := writeBlockHeader(&buf, test.pver, test.in)
 		if err != nil {
@@ -137,7 +137,7 @@ func TestBlockHeaderEncoding(t *testing.T) {
 			continue
 		}
 
-		// Decode the block header from domainmessage format.
+		// Decode the block header from appmessage format.
 		var bh BlockHeader
 		rbuf := bytes.NewReader(test.buf)
 		err = readBlockHeader(rbuf, test.pver, &bh)
@@ -182,7 +182,7 @@ func TestBlockHeaderSerialize(t *testing.T) {
 		Nonce:                nonce,
 	}
 
-	// baseBlockHdrEncoded is the domainmessage encoded bytes of baseBlockHdr.
+	// baseBlockHdrEncoded is the appmessage encoded bytes of baseBlockHdr.
 	baseBlockHdrEncoded := []byte{
 		0x01, 0x00, 0x00, 0x00, // Version 1
 		0x02,                                           // NumParentBlocks
@@ -208,7 +208,7 @@ func TestBlockHeaderSerialize(t *testing.T) {
 		0x65, 0x9C, 0x79, 0x3C, 0xE3, 0x70, 0xD9, 0x5F,
 		0x99, 0x0f, 0xed, 0x15, 0x73, 0x01, 0x00, 0x00, // Timestamp
 		0xff, 0xff, 0x00, 0x1d, // Bits
-		0xf3, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, // Fake Nonce. TODO: (Ori) Replace to a real nonce
+		0xf3, 0xe0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, // Fake Nonce
 	}
 
 	tests := []struct {

app/appmessage/common.go

@@ -2,12 +2,12 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"encoding/binary"
 	"fmt"
-	"github.com/kaspanet/kaspad/network/netadapter/id"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/id"
 	"github.com/kaspanet/kaspad/util/binaryserializer"
 	"github.com/kaspanet/kaspad/util/daghash"
 	"github.com/kaspanet/kaspad/util/mstime"

app/appmessage/common_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"bytes"
@@ -57,7 +57,7 @@ var exampleUTXOCommitment = &daghash.Hash{
 	0x65, 0x9C, 0x79, 0x3C, 0xE3, 0x70, 0xD9, 0x5F,
 }
 
-// TestElementEncoding tests domainmessage encode and decode for various element types. This
+// TestElementEncoding tests appmessage encode and decode for various element types. This
 // is mainly to test the "fast" paths in readElement and writeElement which use
 // type assertions to avoid reflection when possible.
 func TestElementEncoding(t *testing.T) {
@@ -129,7 +129,7 @@ func TestElementEncoding(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Write to domainmessage format.
+		// Write to appmessage format.
 		var buf bytes.Buffer
 		err := WriteElement(&buf, test.in)
 		if err != nil {
@@ -142,7 +142,7 @@ func TestElementEncoding(t *testing.T) {
 			continue
 		}
 
-		// Read from domainmessage format.
+		// Read from appmessage format.
 		rbuf := bytes.NewReader(test.buf)
 		val := test.in
 		if reflect.ValueOf(test.in).Kind() != reflect.Ptr {
@@ -165,7 +165,7 @@ func TestElementEncoding(t *testing.T) {
 	}
 }
 
-// TestElementEncodingErrors performs negative tests against domainmessage encode and decode
+// TestElementEncodingErrors performs negative tests against appmessage encode and decode
 // of various element types to confirm error paths work correctly.
 func TestElementEncodingErrors(t *testing.T) {
 	type writeElementReflect int32
@@ -209,7 +209,7 @@ func TestElementEncodingErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		w := newFixedWriter(test.max)
 		err := WriteElement(w, test.in)
 		if !errors.Is(err, test.writeErr) {
@@ -218,7 +218,7 @@ func TestElementEncodingErrors(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		r := newFixedReader(test.max, nil)
 		val := test.in
 		if reflect.ValueOf(test.in).Kind() != reflect.Ptr {
@@ -233,7 +233,7 @@ func TestElementEncodingErrors(t *testing.T) {
 	}
 }
 
-// TestVarIntEncoding tests domainmessage encode and decode for variable length integers.
+// TestVarIntEncoding tests appmessage encode and decode for variable length integers.
 func TestVarIntEncoding(t *testing.T) {
 	tests := []struct {
 		value uint64 // Value to encode
@@ -266,7 +266,7 @@ func TestVarIntEncoding(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		buf := &bytes.Buffer{}
 		err := WriteVarInt(buf, test.value)
 		if err != nil {
@@ -279,7 +279,7 @@ func TestVarIntEncoding(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		rbuf := bytes.NewReader(test.buf)
 		val, err := ReadVarInt(rbuf)
 		if err != nil {
@@ -294,7 +294,7 @@ func TestVarIntEncoding(t *testing.T) {
 	}
 }
 
-// TestVarIntEncodingErrors performs negative tests against domainmessage encode and decode
+// TestVarIntEncodingErrors performs negative tests against appmessage encode and decode
 // of variable length integers to confirm error paths work correctly.
 func TestVarIntEncodingErrors(t *testing.T) {
 	tests := []struct {
@@ -319,7 +319,7 @@ func TestVarIntEncodingErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		w := newFixedWriter(test.max)
 		err := WriteVarInt(w, test.in)
 		if !errors.Is(err, test.writeErr) {
@@ -328,7 +328,7 @@ func TestVarIntEncodingErrors(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		r := newFixedReader(test.max, test.buf)
 		_, err = ReadVarInt(r)
 		if !errors.Is(err, test.readErr) {
@@ -347,7 +347,7 @@ func TestVarIntNonCanonical(t *testing.T) {
 	tests := []struct {
 		name string // Test name for easier identification
 		in   []byte // Value to decode
-		pver uint32 // Protocol version for domainmessage encoding
+		pver uint32 // Protocol version for appmessage encoding
 	}{
 		{
 			"0 encoded with 3 bytes", []byte{0xfd, 0x00, 0x00},
@@ -379,7 +379,7 @@ func TestVarIntNonCanonical(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		rbuf := bytes.NewReader(test.in)
 		val, err := ReadVarInt(rbuf)
 		if msgErr := &(MessageError{}); !errors.As(err, &msgErr) {
@@ -430,7 +430,7 @@ func TestVarIntSerializeSize(t *testing.T) {
 	}
 }
 
-// TestVarStringEncoding tests domainmessage encode and decode for variable length strings.
+// TestVarStringEncoding tests appmessage encode and decode for variable length strings.
 func TestVarStringEncoding(t *testing.T) {
 	pver := ProtocolVersion
 
@@ -441,7 +441,7 @@ func TestVarStringEncoding(t *testing.T) {
 		in   string // String to encode
 		out  string // String to decoded value
 		buf  []byte // Encoded value
-		pver uint32 // Protocol version for domainmessage encoding
+		pver uint32 // Protocol version for appmessage encoding
 	}{
 		// Latest protocol version.
 		// Empty string
@@ -454,7 +454,7 @@ func TestVarStringEncoding(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		var buf bytes.Buffer
 		err := WriteVarString(&buf, test.in)
 		if err != nil {
@@ -467,7 +467,7 @@ func TestVarStringEncoding(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		rbuf := bytes.NewReader(test.buf)
 		val, err := ReadVarString(rbuf, test.pver)
 		if err != nil {
@@ -482,7 +482,7 @@ func TestVarStringEncoding(t *testing.T) {
 	}
 }
 
-// TestVarStringEncodingErrors performs negative tests against domainmessage encode and
+// TestVarStringEncodingErrors performs negative tests against appmessage encode and
 // decode of variable length strings to confirm error paths work correctly.
 func TestVarStringEncodingErrors(t *testing.T) {
 	pver := ProtocolVersion
@@ -493,7 +493,7 @@ func TestVarStringEncodingErrors(t *testing.T) {
 	tests := []struct {
 		in       string // Value to encode
 		buf      []byte // Encoded value
-		pver     uint32 // Protocol version for domainmessage encoding
+		pver     uint32 // Protocol version for appmessage encoding
 		max      int    // Max size of fixed buffer to induce errors
 		writeErr error  // Expected write error
 		readErr  error  // Expected read error
@@ -509,7 +509,7 @@ func TestVarStringEncodingErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		w := newFixedWriter(test.max)
 		err := WriteVarString(w, test.in)
 		if !errors.Is(err, test.writeErr) {
@@ -518,7 +518,7 @@ func TestVarStringEncodingErrors(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		r := newFixedReader(test.max, test.buf)
 		_, err = ReadVarString(r, test.pver)
 		if !errors.Is(err, test.readErr) {
@@ -538,7 +538,7 @@ func TestVarStringOverflowErrors(t *testing.T) {
 
 	tests := []struct {
 		buf  []byte // Encoded value
-		pver uint32 // Protocol version for domainmessage encoding
+		pver uint32 // Protocol version for appmessage encoding
 		err  error  // Expected error
 	}{
 		{[]byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
@@ -549,7 +549,7 @@ func TestVarStringOverflowErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		rbuf := bytes.NewReader(test.buf)
 		_, err := ReadVarString(rbuf, test.pver)
 		if reflect.TypeOf(err) != reflect.TypeOf(test.err) {
@@ -561,7 +561,7 @@ func TestVarStringOverflowErrors(t *testing.T) {
 
 }
 
-// TestVarBytesEncoding tests domainmessage encode and decode for variable length byte array.
+// TestVarBytesEncoding tests appmessage encode and decode for variable length byte array.
 func TestVarBytesEncoding(t *testing.T) {
 	pver := ProtocolVersion
 
@@ -571,7 +571,7 @@ func TestVarBytesEncoding(t *testing.T) {
 	tests := []struct {
 		in   []byte // Byte Array to write
 		buf  []byte // Encoded value
-		pver uint32 // Protocol version for domainmessage encoding
+		pver uint32 // Protocol version for appmessage encoding
 	}{
 		// Latest protocol version.
 		// Empty byte array
@@ -584,7 +584,7 @@ func TestVarBytesEncoding(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		var buf bytes.Buffer
 		err := WriteVarBytes(&buf, test.pver, test.in)
 		if err != nil {
@@ -597,7 +597,7 @@ func TestVarBytesEncoding(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		rbuf := bytes.NewReader(test.buf)
 		val, err := ReadVarBytes(rbuf, test.pver, MaxMessagePayload,
 			"test payload")
@@ -613,7 +613,7 @@ func TestVarBytesEncoding(t *testing.T) {
 	}
 }
 
-// TestVarBytesEncodingErrors performs negative tests against domainmessage encode and
+// TestVarBytesEncodingErrors performs negative tests against appmessage encode and
 // decode of variable length byte arrays to confirm error paths work correctly.
 func TestVarBytesEncodingErrors(t *testing.T) {
 	pver := ProtocolVersion
@@ -624,7 +624,7 @@ func TestVarBytesEncodingErrors(t *testing.T) {
 	tests := []struct {
 		in       []byte // Byte Array to write
 		buf      []byte // Encoded value
-		pver     uint32 // Protocol version for domainmessage encoding
+		pver     uint32 // Protocol version for appmessage encoding
 		max      int    // Max size of fixed buffer to induce errors
 		writeErr error  // Expected write error
 		readErr  error  // Expected read error
@@ -640,7 +640,7 @@ func TestVarBytesEncodingErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		w := newFixedWriter(test.max)
 		err := WriteVarBytes(w, test.pver, test.in)
 		if !errors.Is(err, test.writeErr) {
@@ -649,7 +649,7 @@ func TestVarBytesEncodingErrors(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		r := newFixedReader(test.max, test.buf)
 		_, err = ReadVarBytes(r, test.pver, MaxMessagePayload,
 			"test payload")
@@ -670,7 +670,7 @@ func TestVarBytesOverflowErrors(t *testing.T) {
 
 	tests := []struct {
 		buf  []byte // Encoded value
-		pver uint32 // Protocol version for domainmessage encoding
+		pver uint32 // Protocol version for appmessage encoding
 		err  error  // Expected error
 	}{
 		{[]byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
@@ -681,7 +681,7 @@ func TestVarBytesOverflowErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		rbuf := bytes.NewReader(test.buf)
 		_, err := ReadVarBytes(rbuf, test.pver, MaxMessagePayload,
 			"test payload")

app/appmessage/doc.go

@@ -1,8 +1,8 @@
 /*
-Package domainmessage implements the kaspa domainmessage protocol.
+Package appmessage implements the kaspa appmessage protocol.
 
 At a high level, this package provides support for marshalling and unmarshalling
-supported kaspa messages to and from the domainmessage. This package does not deal
+supported kaspa messages to and from the appmessage. This package does not deal
 with the specifics of message handling such as what to do when a message is
 received. This provides the caller with a high level of flexibility.
 
@@ -19,7 +19,7 @@ Message which allows messages of any type to be read, written, or passed around
 through channels, functions, etc. In addition, concrete implementations of most
 of the currently supported kaspa messages are provided. For these supported
 messages, all of the details of marshalling and unmarshalling to and from the
-domainmessage using kaspa encoding are handled so the caller doesn't have to concern
+appmessage using kaspa encoding are handled so the caller doesn't have to concern
 themselves with the specifics.
 
 Message Interaction
@@ -55,7 +55,7 @@ Protocol Version
 
 The protocol version should be negotiated with the remote peer at a higher
 level than this package via the version (MsgVersion) message exchange, however,
-this package provides the domainmessage.ProtocolVersion constant which indicates the
+this package provides the appmessage.ProtocolVersion constant which indicates the
 latest protocol version this package supports and is typically the value to use
 for all outbound connections before a potentially lower protocol version is
 negotiated.
@@ -66,11 +66,10 @@ The kaspa network is a magic number which is used to identify the start of a
 message and which kaspa network the message applies to. This package provides
 the following constants:
 
-    domainmessage.Mainnet
+    appmessage.Mainnet
-    domainmessage.Testnet (Test network)
+    appmessage.Testnet (Test network)
-    domainmessage.Regtest (Regression test network)
+    appmessage.Simnet  (Simulation test network)
-    domainmessage.Simnet  (Simulation test network)
+    appmessage.Devnet  (Development network)
-    domainmessage.Devnet  (Development network)
 
 Determining Message Type
 
@@ -82,43 +81,43 @@ switch or type assertion. An example of a type switch follows:
 	// Assumes msg is already a valid concrete message such as one created
 	// via NewMsgVersion or read via ReadMessage.
 	switch msg := msg.(type) {
-	case *domainmessage.MsgVersion:
+	case *appmessage.MsgVersion:
 		// The message is a pointer to a MsgVersion struct.
 		fmt.Printf("Protocol version: %d", msg.ProtocolVersion)
-	case *domainmessage.MsgBlock:
+	case *appmessage.MsgBlock:
 		// The message is a pointer to a MsgBlock struct.
 		fmt.Printf("Number of tx in block: %d", msg.Header.TxnCount)
 	}
 
 Reading Messages
 
-In order to unmarshall kaspa messages from the domainmessage, use the ReadMessage
+In order to unmarshall kaspa messages from the appmessage, use the ReadMessage
 function. It accepts any io.Reader, but typically this will be a net.Conn to
 a remote node running a kaspa peer. Example syntax is:
 
 	// Reads and validates the next kaspa message from conn using the
 	// protocol version pver and the kaspa network kaspaNet. The returns
-	// are a domainmessage.Message, a []byte which contains the unmarshalled
+	// are a appmessage.Message, a []byte which contains the unmarshalled
 	// raw payload, and a possible error.
-	msg, rawPayload, err := domainmessage.ReadMessage(conn, pver, kaspaNet)
+	msg, rawPayload, err := appmessage.ReadMessage(conn, pver, kaspaNet)
 	if err != nil {
 		// Log and handle the error
 	}
 
 Writing Messages
 
-In order to marshall kaspa messages to the domainmessage, use the WriteMessage
+In order to marshall kaspa messages to the appmessage, use the WriteMessage
 function. It accepts any io.Writer, but typically this will be a net.Conn to
 a remote node running a kaspa peer. Example syntax to request addresses
 from a remote peer is:
 
 	// Create a new getaddr kaspa message.
-	msg := domainmessage.NewMsgRequestAddresses()
+	msg := appmessage.NewMsgRequestAddresses()
 
 	// Writes a kaspa message msg to conn using the protocol version
 	// pver, and the kaspa network kaspaNet. The return is a possible
 	// error.
-	err := domainmessage.WriteMessage(conn, msg, pver, kaspaNet)
+	err := appmessage.WriteMessage(conn, msg, pver, kaspaNet)
 	if err != nil {
 		// Log and handle the error
 	}
@@ -127,8 +126,8 @@ Errors
 
 Errors returned by this package are either the raw errors provided by underlying
 calls to read/write from streams such as io.EOF, io.ErrUnexpectedEOF, and
-io.ErrShortWrite, or of type domainmessage.MessageError. This allows the caller to
+io.ErrShortWrite, or of type appmessage.MessageError. This allows the caller to
 differentiate between general IO errors and malformed messages through type
 assertions.
 */
-package domainmessage
+package appmessage

app/appmessage/error.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"fmt"

app/appmessage/fakemessage_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import "io"
 
@@ -15,7 +15,7 @@ type fakeMessage struct {
 	forceLenErr    bool
 }
 
-// KaspaDecode doesn't do anything. It just satisfies the domainmessage.Message
+// KaspaDecode doesn't do anything. It just satisfies the appmessage.Message
 // interface.
 func (msg *fakeMessage) KaspaDecode(r io.Reader, pver uint32) error {
 	return nil
@@ -23,7 +23,7 @@ func (msg *fakeMessage) KaspaDecode(r io.Reader, pver uint32) error {
 
 // KaspaEncode writes the payload field of the fake message or forces an error
 // if the forceEncodeErr flag of the fake message is set. It also satisfies the
-// domainmessage.Message interface.
+// appmessage.Message interface.
 func (msg *fakeMessage) KaspaEncode(w io.Writer, pver uint32) error {
 	if msg.forceEncodeErr {
 		err := &MessageError{

app/appmessage/fixedIO_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"bytes"

app/appmessage/message.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"fmt"

app/appmessage/msgaddresses.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"fmt"

app/appmessage/msgaddresses_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"net"

app/appmessage/msgblock.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"bytes"
@@ -60,7 +60,7 @@ func (msg *MsgBlock) ClearTransactions() {
 // KaspaDecode decodes r using the kaspa protocol encoding into the receiver.
 // This is part of the Message interface implementation.
 // See Deserialize for decoding blocks stored to disk, such as in a database, as
-// opposed to decoding blocks from the domainmessage.
+// opposed to decoding blocks from the appmessage.
 func (msg *MsgBlock) KaspaDecode(r io.Reader, pver uint32) error {
 	err := readBlockHeader(r, pver, &msg.Header)
 	if err != nil {
@@ -97,14 +97,14 @@ func (msg *MsgBlock) KaspaDecode(r io.Reader, pver uint32) error {
 // Deserialize decodes a block from r into the receiver using a format that is
 // suitable for long-term storage such as a database while respecting the
 // Version field in the block. This function differs from KaspaDecode in that
-// KaspaDecode decodes from the kaspa domainmessage protocol as it was sent across the
+// KaspaDecode decodes from the kaspa appmessage protocol as it was sent across the
-// network. The domainmessage encoding can technically differ depending on the protocol
+// network. The appmessage encoding can technically differ depending on the protocol
 // version and doesn't even really need to match the format of a stored block at
 // all. As of the time this comment was written, the encoded block is the same
 // in both instances, but there is a distinct difference and separating the two
 // allows the API to be flexible enough to deal with changes.
 func (msg *MsgBlock) Deserialize(r io.Reader) error {
-	// At the current time, there is no difference between the domainmessage encoding
+	// At the current time, there is no difference between the appmessage encoding
 	// at protocol version 0 and the stable long-term storage format. As
 	// a result, make use of KaspaDecode.
 	return msg.KaspaDecode(r, 0)
@@ -117,9 +117,9 @@ func (msg *MsgBlock) Deserialize(r io.Reader) error {
 func (msg *MsgBlock) DeserializeTxLoc(r *bytes.Buffer) ([]TxLoc, error) {
 	fullLen := r.Len()
 
-	// At the current time, there is no difference between the domainmessage encoding
+	// At the current time, there is no difference between the appmessage encoding
 	// at protocol version 0 and the stable long-term storage format. As
-	// a result, make use of existing domainmessage protocol functions.
+	// a result, make use of existing appmessage protocol functions.
 	err := readBlockHeader(r, 0, &msg.Header)
 	if err != nil {
 		return nil, err
@@ -160,7 +160,7 @@ func (msg *MsgBlock) DeserializeTxLoc(r *bytes.Buffer) ([]TxLoc, error) {
 // KaspaEncode encodes the receiver to w using the kaspa protocol encoding.
 // This is part of the Message interface implementation.
 // See Serialize for encoding blocks to be stored to disk, such as in a
-// database, as opposed to encoding blocks for the domainmessage.
+// database, as opposed to encoding blocks for the appmessage.
 func (msg *MsgBlock) KaspaEncode(w io.Writer, pver uint32) error {
 	err := writeBlockHeader(w, pver, &msg.Header)
 	if err != nil {
@@ -185,14 +185,14 @@ func (msg *MsgBlock) KaspaEncode(w io.Writer, pver uint32) error {
 // Serialize encodes the block to w using a format that suitable for long-term
 // storage such as a database while respecting the Version field in the block.
 // This function differs from KaspaEncode in that KaspaEncode encodes the block to
-// the kaspa domainmessage protocol in order to be sent across the network. The domainmessage
+// the kaspa appmessage protocol in order to be sent across the network. The appmessage
 // encoding can technically differ depending on the protocol version and doesn't
 // even really need to match the format of a stored block at all. As of the
 // time this comment was written, the encoded block is the same in both
 // instances, but there is a distinct difference and separating the two allows
 // the API to be flexible enough to deal with changes.
 func (msg *MsgBlock) Serialize(w io.Writer) error {
-	// At the current time, there is no difference between the domainmessage encoding
+	// At the current time, there is no difference between the appmessage encoding
 	// at protocol version 0 and the stable long-term storage format. As
 	// a result, make use of KaspaEncode.
 	return msg.KaspaEncode(w, 0)

app/appmessage/msgblock_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"bytes"
@@ -144,7 +144,7 @@ func TestConvertToPartial(t *testing.T) {
 	}
 }
 
-// TestBlockEncoding tests the MsgBlock domainmessage encode and decode for various numbers
+// TestBlockEncoding tests the MsgBlock appmessage encode and decode for various numbers
 // of transaction inputs and outputs and protocol versions.
 func TestBlockEncoding(t *testing.T) {
 	tests := []struct {
@@ -152,7 +152,7 @@ func TestBlockEncoding(t *testing.T) {
 		out    *MsgBlock // Expected decoded message
 		buf    []byte    // Encoded value
 		txLocs []TxLoc   // Expected transaction locations
-		pver   uint32    // Protocol version for domainmessage encoding
+		pver   uint32    // Protocol version for appmessage encoding
 	}{
 		// Latest protocol version.
 		{
@@ -166,7 +166,7 @@ func TestBlockEncoding(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode the message to domainmessage format.
+		// Encode the message to appmessage format.
 		var buf bytes.Buffer
 		err := test.in.KaspaEncode(&buf, test.pver)
 		if err != nil {
@@ -179,7 +179,7 @@ func TestBlockEncoding(t *testing.T) {
 			continue
 		}
 
-		// Decode the message from domainmessage format.
+		// Decode the message from appmessage format.
 		var msg MsgBlock
 		rbuf := bytes.NewReader(test.buf)
 		err = msg.KaspaDecode(rbuf, test.pver)
@@ -195,7 +195,7 @@ func TestBlockEncoding(t *testing.T) {
 	}
 }
 
-// TestBlockEncodingErrors performs negative tests against domainmessage encode and decode
+// TestBlockEncodingErrors performs negative tests against appmessage encode and decode
 // of MsgBlock to confirm error paths work correctly.
 func TestBlockEncodingErrors(t *testing.T) {
 	pver := ProtocolVersion
@@ -203,7 +203,7 @@ func TestBlockEncodingErrors(t *testing.T) {
 	tests := []struct {
 		in       *MsgBlock // Value to encode
 		buf      []byte    // Encoded value
-		pver     uint32    // Protocol version for domainmessage encoding
+		pver     uint32    // Protocol version for appmessage encoding
 		max      int       // Max size of fixed buffer to induce errors
 		writeErr error     // Expected write error
 		readErr  error     // Expected read error
@@ -236,7 +236,7 @@ func TestBlockEncodingErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		w := newFixedWriter(test.max)
 		err := test.in.KaspaEncode(w, test.pver)
 		if !errors.Is(err, test.writeErr) {
@@ -245,7 +245,7 @@ func TestBlockEncodingErrors(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		var msg MsgBlock
 		r := newFixedReader(test.max, test.buf)
 		err = msg.KaspaDecode(r, test.pver)
@@ -324,7 +324,7 @@ func TestBlockSerialize(t *testing.T) {
 	}
 }
 
-// TestBlockSerializeErrors performs negative tests against domainmessage encode and
+// TestBlockSerializeErrors performs negative tests against appmessage encode and
 // decode of MsgBlock to confirm error paths work correctly.
 func TestBlockSerializeErrors(t *testing.T) {
 	tests := []struct {
@@ -401,7 +401,7 @@ func TestBlockOverflowErrors(t *testing.T) {
 
 	tests := []struct {
 		buf  []byte // Encoded value
-		pver uint32 // Protocol version for domainmessage encoding
+		pver uint32 // Protocol version for appmessage encoding
 		err  error  // Expected error
 	}{
 		// Block that claims to have ~uint64(0) transactions.
@@ -431,7 +431,7 @@ func TestBlockOverflowErrors(t *testing.T) {
 				0x65, 0x9C, 0x79, 0x3C, 0xE3, 0x70, 0xD9, 0x5F,
 				0x61, 0xbc, 0x66, 0x49, 0x00, 0x00, 0x00, 0x00, // Timestamp
 				0xff, 0xff, 0x00, 0x1d, // Bits
-				0x01, 0xe3, 0x62, 0x99, 0x00, 0x00, 0x00, 0x00, // Fake Nonce. TODO: (Ori) Replace to a real nonce
+				0x01, 0xe3, 0x62, 0x99, 0x00, 0x00, 0x00, 0x00, // Fake Nonce
 				0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
 				0xff, // TxnCount
 			}, pver, &MessageError{},
@@ -440,7 +440,7 @@ func TestBlockOverflowErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		var msg MsgBlock
 		r := bytes.NewReader(test.buf)
 		err := msg.KaspaDecode(r, test.pver)
@@ -450,7 +450,7 @@ func TestBlockOverflowErrors(t *testing.T) {
 			continue
 		}
 
-		// Deserialize from domainmessage format.
+		// Deserialize from appmessage format.
 		r = bytes.NewReader(test.buf)
 		err = msg.Deserialize(r)
 		if reflect.TypeOf(err) != reflect.TypeOf(test.err) {
@@ -459,7 +459,7 @@ func TestBlockOverflowErrors(t *testing.T) {
 			continue
 		}
 
-		// Deserialize with transaction location info from domainmessage format.
+		// Deserialize with transaction location info from appmessage format.
 		br := bytes.NewBuffer(test.buf)
 		_, err = msg.DeserializeTxLoc(br)
 		if reflect.TypeOf(err) != reflect.TypeOf(test.err) {
@@ -572,7 +572,7 @@ var blockOneBytes = []byte{
 	0x65, 0x9C, 0x79, 0x3C, 0xE3, 0x70, 0xD9, 0x5F,
 	0x99, 0x0f, 0xed, 0x15, 0x73, 0x01, 0x00, 0x00, // Timestamp
 	0xff, 0xff, 0x00, 0x1d, // Bits
-	0x01, 0xe3, 0x62, 0x99, 0x00, 0x00, 0x00, 0x00, // Fake Nonce. TODO: (Ori) Replace to a real nonce
+	0x01, 0xe3, 0x62, 0x99, 0x00, 0x00, 0x00, 0x00, // Fake Nonce
 	0x01,                   // TxnCount
 	0x01, 0x00, 0x00, 0x00, // Version
 	0x01, // Varint for number of transaction inputs

app/appmessage/msgblocklocator.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgblocklocator_test.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"testing"

app/appmessage/msgdoneibdblocks.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 // MsgDoneIBDBlocks implements the Message interface and represents a kaspa
 // DoneIBDBlocks message. It is used to notify the IBD syncing peer that the

app/appmessage/msgibdblock.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 // MsgIBDBlock implements the Message interface and represents a kaspa
 // ibdblock message. It is used to deliver block and transaction information in

app/appmessage/msgibdblock_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"bytes"
@@ -65,7 +65,7 @@ func TestIBDBlock(t *testing.T) {
 	}
 }
 
-// TestIBDBlockEncoding tests the MsgIBDBlock domainmessage encode and decode for various numbers
+// TestIBDBlockEncoding tests the MsgIBDBlock appmessage encode and decode for various numbers
 // of transaction inputs and outputs and protocol versions.
 func TestIBDBlockEncoding(t *testing.T) {
 	tests := []struct {
@@ -73,7 +73,7 @@ func TestIBDBlockEncoding(t *testing.T) {
 		out    *MsgIBDBlock // Expected decoded message
 		buf    []byte       // Encoded value
 		txLocs []TxLoc      // Expected transaction locations
-		pver   uint32       // Protocol version for domainmessage encoding
+		pver   uint32       // Protocol version for appmessage encoding
 	}{
 		// Latest protocol version.
 		{
@@ -87,7 +87,7 @@ func TestIBDBlockEncoding(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode the message to domainmessage format.
+		// Encode the message to appmessage format.
 		var buf bytes.Buffer
 		err := test.in.KaspaEncode(&buf, test.pver)
 		if err != nil {
@@ -100,7 +100,7 @@ func TestIBDBlockEncoding(t *testing.T) {
 			continue
 		}
 
-		// Decode the message from domainmessage format.
+		// Decode the message from appmessage format.
 		var msg MsgIBDBlock
 		msg.MsgBlock = new(MsgBlock)
 		rbuf := bytes.NewReader(test.buf)

app/appmessage/msginvrelayblock.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msginvtransaction.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgping.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 // MsgPing implements the Message interface and represents a kaspa ping
 // message.

app/appmessage/msgping_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"testing"

app/appmessage/msgpong.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 // MsgPong implements the Message interface and represents a kaspa pong
 // message which is used primarily to confirm that a connection is still valid

app/appmessage/msgpong_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"testing"

app/appmessage/msgreject.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 // MsgReject implements the Message interface and represents a kaspa
 // Reject message. It is used to notify peers why they are banned.

app/appmessage/msgrequestaddresses.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/subnetworkid"

app/appmessage/msgrequestaddresses_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"testing"

app/appmessage/msgrequestblocklocator.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgrequestblocklocator_test.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"testing"

app/appmessage/msgrequestibdblocks.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgrequestibdblocks_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"testing"

app/appmessage/msgrequestnextibdblocks.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 // MsgRequestNextIBDBlocks implements the Message interface and represents a kaspa
 // RequestNextIBDBlocks message. It is used to notify the IBD syncer peer to send

app/appmessage/msgrequestrelayblocks.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgrequestselectedtip.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 // MsgRequestSelectedTip implements the Message interface and represents a kaspa
 // RequestSelectedTip message. It is used to request the selected tip of another peer.

app/appmessage/msgrequestselectedtip_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"testing"

app/appmessage/msgrequesttransactions.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgselectedtip.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgselectedtip_test.go

@@ -1,4 +1,4 @@
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgtransactionnotfound.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/daghash"

app/appmessage/msgtx.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"encoding/binary"
@@ -83,7 +83,7 @@ const (
 	minTxPayload = 10
 
 	// freeListMaxScriptSize is the size of each buffer in the free list
-	// that	is used for deserializing scripts from the domainmessage before they are
+	// that	is used for deserializing scripts from the appmessage before they are
 	// concatenated into a single contiguous buffers. This value was chosen
 	// because it is slightly more than twice the size of the vast majority
 	// of all "standard" scripts. Larger scripts are still deserialized
@@ -406,7 +406,7 @@ func (msg *MsgTx) Copy() *MsgTx {
 // KaspaDecode decodes r using the kaspa protocol encoding into the receiver.
 // This is part of the Message interface implementation.
 // See Deserialize for decoding transactions stored to disk, such as in a
-// database, as opposed to decoding transactions from the domainmessage.
+// database, as opposed to decoding transactions from the appmessage.
 func (msg *MsgTx) KaspaDecode(r io.Reader, pver uint32) error {
 	version, err := binaryserializer.Uint32(r, littleEndian)
 	if err != nil {
@@ -596,15 +596,15 @@ func (msg *MsgTx) KaspaDecode(r io.Reader, pver uint32) error {
 // Deserialize decodes a transaction from r into the receiver using a format
 // that is suitable for long-term storage such as a database while respecting
 // the Version field in the transaction. This function differs from KaspaDecode
-// in that KaspaDecode decodes from the kaspa domainmessage protocol as it was sent
+// in that KaspaDecode decodes from the kaspa appmessage protocol as it was sent
-// across the network. The domainmessage encoding can technically differ depending on
+// across the network. The appmessage encoding can technically differ depending on
 // the protocol version and doesn't even really need to match the format of a
 // stored transaction at all. As of the time this comment was written, the
 // encoded transaction is the same in both instances, but there is a distinct
 // difference and separating the two allows the API to be flexible enough to
 // deal with changes.
 func (msg *MsgTx) Deserialize(r io.Reader) error {
-	// At the current time, there is no difference between the domainmessage encoding
+	// At the current time, there is no difference between the appmessage encoding
 	// at protocol version 0 and the stable long-term storage format. As
 	// a result, make use of KaspaDecode.
 	return msg.KaspaDecode(r, 0)
@@ -613,7 +613,7 @@ func (msg *MsgTx) Deserialize(r io.Reader) error {
 // KaspaEncode encodes the receiver to w using the kaspa protocol encoding.
 // This is part of the Message interface implementation.
 // See Serialize for encoding transactions to be stored to disk, such as in a
-// database, as opposed to encoding transactions for the domainmessage.
+// database, as opposed to encoding transactions for the appmessage.
 func (msg *MsgTx) KaspaEncode(w io.Writer, pver uint32) error {
 	return msg.encode(w, pver, txEncodingFull)
 }
@@ -702,22 +702,22 @@ func (msg *MsgTx) encode(w io.Writer, pver uint32, encodingFlags txEncoding) err
 // Serialize encodes the transaction to w using a format that suitable for
 // long-term storage such as a database while respecting the Version field in
 // the transaction. This function differs from KaspaEncode in that KaspaEncode
-// encodes the transaction to the kaspa domainmessage protocol in order to be sent
+// encodes the transaction to the kaspa appmessage protocol in order to be sent
-// across the network. The domainmessage encoding can technically differ depending on
+// across the network. The appmessage encoding can technically differ depending on
 // the protocol version and doesn't even really need to match the format of a
 // stored transaction at all. As of the time this comment was written, the
 // encoded transaction is the same in both instances, but there is a distinct
 // difference and separating the two allows the API to be flexible enough to
 // deal with changes.
 func (msg *MsgTx) Serialize(w io.Writer) error {
-	// At the current time, there is no difference between the domainmessage encoding
+	// At the current time, there is no difference between the appmessage encoding
 	// at protocol version 0 and the stable long-term storage format. As
 	// a result, make use of KaspaEncode.
 	return msg.KaspaEncode(w, 0)
 }
 
 func (msg *MsgTx) serialize(w io.Writer, encodingFlags txEncoding) error {
-	// At the current time, there is no difference between the domainmessage encoding
+	// At the current time, there is no difference between the appmessage encoding
 	// at protocol version 0 and the stable long-term storage format. As
 	// a result, make use of `encode`.
 	return msg.encode(w, 0, encodingFlags)

app/appmessage/msgtx_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"bytes"
@@ -253,7 +253,7 @@ func TestTxHashAndID(t *testing.T) {
 	}
 }
 
-// TestTxEncoding tests the MsgTx domainmessage encode and decode for various numbers
+// TestTxEncoding tests the MsgTx appmessage encode and decode for various numbers
 // of transaction inputs and outputs and protocol versions.
 func TestTxEncoding(t *testing.T) {
 	// Empty tx message.
@@ -272,7 +272,7 @@ func TestTxEncoding(t *testing.T) {
 		in   *MsgTx // Message to encode
 		out  *MsgTx // Expected decoded message
 		buf  []byte // Encoded value
-		pver uint32 // Protocol version for domainmessage encoding
+		pver uint32 // Protocol version for appmessage encoding
 	}{
 		// Latest protocol version with no transactions.
 		{
@@ -293,7 +293,7 @@ func TestTxEncoding(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode the message to domainmessage format.
+		// Encode the message to appmessage format.
 		var buf bytes.Buffer
 		err := test.in.KaspaEncode(&buf, test.pver)
 		if err != nil {
@@ -306,7 +306,7 @@ func TestTxEncoding(t *testing.T) {
 			continue
 		}
 
-		// Decode the message from domainmessage format.
+		// Decode the message from appmessage format.
 		var msg MsgTx
 		rbuf := bytes.NewReader(test.buf)
 		err = msg.KaspaDecode(rbuf, test.pver)
@@ -322,7 +322,7 @@ func TestTxEncoding(t *testing.T) {
 	}
 }
 
-// TestTxEncodingErrors performs negative tests against domainmessage encode and decode
+// TestTxEncodingErrors performs negative tests against appmessage encode and decode
 // of MsgTx to confirm error paths work correctly.
 func TestTxEncodingErrors(t *testing.T) {
 	pver := ProtocolVersion
@@ -330,7 +330,7 @@ func TestTxEncodingErrors(t *testing.T) {
 	tests := []struct {
 		in       *MsgTx // Value to encode
 		buf      []byte // Encoded value
-		pver     uint32 // Protocol version for domainmessage encoding
+		pver     uint32 // Protocol version for appmessage encoding
 		max      int    // Max size of fixed buffer to induce errors
 		writeErr error  // Expected write error
 		readErr  error  // Expected read error
@@ -363,7 +363,7 @@ func TestTxEncodingErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Encode to domainmessage format.
+		// Encode to appmessage format.
 		w := newFixedWriter(test.max)
 		err := test.in.KaspaEncode(w, test.pver)
 		if !errors.Is(err, test.writeErr) {
@@ -372,7 +372,7 @@ func TestTxEncodingErrors(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		var msg MsgTx
 		r := newFixedReader(test.max, test.buf)
 		err = msg.KaspaDecode(r, test.pver)
@@ -528,7 +528,7 @@ func TestTxSerialize(t *testing.T) {
 	}
 }
 
-// TestTxSerializeErrors performs negative tests against domainmessage encode and decode
+// TestTxSerializeErrors performs negative tests against appmessage encode and decode
 // of MsgTx to confirm error paths work correctly.
 func TestTxSerializeErrors(t *testing.T) {
 	tests := []struct {
@@ -629,7 +629,7 @@ func TestTxOverflowErrors(t *testing.T) {
 
 	tests := []struct {
 		buf     []byte // Encoded value
-		pver    uint32 // Protocol version for domainmessage encoding
+		pver    uint32 // Protocol version for appmessage encoding
 		version uint32 // Transaction version
 		err     error  // Expected error
 	}{
@@ -691,7 +691,7 @@ func TestTxOverflowErrors(t *testing.T) {
 
 	t.Logf("Running %d tests", len(tests))
 	for i, test := range tests {
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		var msg MsgTx
 		r := bytes.NewReader(test.buf)
 		err := msg.KaspaDecode(r, test.pver)
@@ -701,7 +701,7 @@ func TestTxOverflowErrors(t *testing.T) {
 			continue
 		}
 
-		// Decode from domainmessage format.
+		// Decode from appmessage format.
 		r = bytes.NewReader(test.buf)
 		err = msg.Deserialize(r)
 		if reflect.TypeOf(err) != reflect.TypeOf(test.err) {
@@ -891,7 +891,7 @@ var multiTxOuts = []*TxOut{
 }
 var multiTx = NewNativeMsgTx(1, multiTxIns, multiTxOuts)
 
-// multiTxEncoded is the domainmessage encoded bytes for multiTx using protocol version
+// multiTxEncoded is the appmessage encoded bytes for multiTx using protocol version
 // 60002 and is used in the various tests.
 var multiTxEncoded = []byte{
 	0x01, 0x00, 0x00, 0x00, // Version

app/appmessage/msgverack.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 // MsgVerAck defines a kaspa verack message which is used for a peer to
 // acknowledge a version message (MsgVersion) after it has used the information

app/appmessage/msgverack_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"testing"

app/appmessage/msgversion.go

@@ -2,14 +2,14 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"fmt"
 	"github.com/kaspanet/kaspad/version"
 	"strings"
 
-	"github.com/kaspanet/kaspad/network/netadapter/id"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/id"
 	"github.com/kaspanet/kaspad/util/mstime"
 
 	"github.com/kaspanet/kaspad/util/daghash"
@@ -20,7 +20,7 @@ import (
 // version message (MsgVersion).
 const MaxUserAgentLen = 256
 
-// DefaultUserAgent for domainmessage in the stack
+// DefaultUserAgent for appmessage in the stack
 var DefaultUserAgent = fmt.Sprintf("/kaspad:%s/", version.Version())
 
 // MsgVersion implements the Message interface and represents a kaspa version
@@ -41,7 +41,7 @@ type MsgVersion struct {
 	// Bitfield which identifies the enabled services.
 	Services ServiceFlag
 
-	// Time the message was generated. This is encoded as an int64 on the domainmessage.
+	// Time the message was generated. This is encoded as an int64 on the appmessage.
 	Timestamp mstime.Time
 
 	// Address of the local peer.
@@ -51,7 +51,7 @@ type MsgVersion struct {
 	ID *id.ID
 
 	// The user agent that generated messsage. This is a encoded as a varString
-	// on the domainmessage. This has a max length of MaxUserAgentLen.
+	// on the appmessage. This has a max length of MaxUserAgentLen.
 	UserAgent string
 
 	// The selected tip hash of the generator of the version message.

app/appmessage/msgversion_test.go

@@ -2,11 +2,11 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"github.com/davecgh/go-spew/spew"
-	"github.com/kaspanet/kaspad/network/netadapter/id"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/id"
 	"github.com/kaspanet/kaspad/util/daghash"
 	"net"
 	"reflect"

app/appmessage/netaddress.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"github.com/kaspanet/kaspad/util/mstime"
@@ -21,7 +21,7 @@ type NetAddress struct {
 	// IP address of the peer.
 	IP net.IP
 
-	// Port the peer is using. This is encoded in big endian on the domainmessage
+	// Port the peer is using. This is encoded in big endian on the appmessage
 	// which differs from most everything else.
 	Port uint16
 }

app/appmessage/netaddress_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"net"

app/appmessage/protocol.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import (
 	"fmt"
@@ -10,10 +10,13 @@ import (
 	"strings"
 )
 
-// XXX pedro: we will probably need to bump this.
 const (
 	// ProtocolVersion is the latest protocol version this package supports.
 	ProtocolVersion uint32 = 1
+
+	// DefaultServices describes the default services that are supported by
+	// the server.
+	DefaultServices = SFNodeNetwork | SFNodeBloom | SFNodeCF
 )
 
 // ServiceFlag identifies services supported by a kaspa peer.
@@ -103,9 +106,6 @@ const (
 	// Testnet represents the test network.
 	Testnet KaspaNet = 0xddb8af8f
 
-	// Regtest represents the regression test network.
-	Regtest KaspaNet = 0xf396cdd6
-
 	// Simnet represents the simulation test network.
 	Simnet KaspaNet = 0x374dcf1c
 
@@ -118,7 +118,6 @@ const (
 var bnStrings = map[KaspaNet]string{
 	Mainnet: "Mainnet",
 	Testnet: "Testnet",
-	Regtest: "Regtest",
 	Simnet:  "Simnet",
 	Devnet:  "Devnet",
 }

app/appmessage/protocol_test.go

@@ -2,7 +2,7 @@
 // Use of this source code is governed by an ISC
 // license that can be found in the LICENSE file.
 
-package domainmessage
+package appmessage
 
 import "testing"
 
@@ -40,7 +40,6 @@ func TestKaspaNetStringer(t *testing.T) {
 		want string
 	}{
 		{Mainnet, "Mainnet"},
-		{Regtest, "Regtest"},
 		{Testnet, "Testnet"},
 		{Simnet, "Simnet"},
 		{0xffffffff, "Unknown KaspaNet (4294967295)"},

app/protocol/flowcontext/addresses.go

@@ -1,7 +1,7 @@
 package flowcontext
 
 import (
-	"github.com/kaspanet/kaspad/network/addressmanager"
+	"github.com/kaspanet/kaspad/infrastructure/network/addressmanager"
 )
 
 // AddressManager returns the address manager associated to the flow context.

app/protocol/flowcontext/blocks.go

@@ -3,9 +3,9 @@ package flowcontext
 import (
 	"sync/atomic"
 
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/flows/blockrelay"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
-	"github.com/kaspanet/kaspad/network/protocol/flows/blockrelay"
 	"github.com/kaspanet/kaspad/util"
 	"github.com/kaspanet/kaspad/util/daghash"
 )
@@ -39,16 +39,18 @@ func (f *FlowContext) broadcastTransactionsAfterBlockAdded(block *util.Block, tr
 	for i, tx := range transactionsAcceptedToMempool {
 		txIDsToBroadcast[i] = tx.ID()
 	}
-
+	offset := len(transactionsAcceptedToMempool)
-	copy(txIDsToBroadcast[len(transactionsAcceptedToMempool):], txIDsToBroadcast)
+	for i, txID := range txIDsToRebroadcast {
+		txIDsToBroadcast[offset+i] = txID
+	}
 
 	if len(txIDsToBroadcast) == 0 {
 		return nil
 	}
-	if len(txIDsToBroadcast) > domainmessage.MaxInvPerTxInvMsg {
+	if len(txIDsToBroadcast) > appmessage.MaxInvPerTxInvMsg {
-		txIDsToBroadcast = txIDsToBroadcast[:domainmessage.MaxInvPerTxInvMsg]
+		txIDsToBroadcast = txIDsToBroadcast[:appmessage.MaxInvPerTxInvMsg]
 	}
-	inv := domainmessage.NewMsgInvTransaction(txIDsToBroadcast)
+	inv := appmessage.NewMsgInvTransaction(txIDsToBroadcast)
 	return f.Broadcast(inv)
 }
 
@@ -64,5 +66,9 @@ func (f *FlowContext) AddBlock(block *util.Block, flags blockdag.BehaviorFlags)
 	if err != nil {
 		return err
 	}
-	return f.Broadcast(domainmessage.NewMsgInvBlock(block.Hash()))
+	err = f.OnNewBlock(block)
+	if err != nil {
+		return err
+	}
+	return f.Broadcast(appmessage.NewMsgInvBlock(block.Hash()))
 }

app/protocol/flowcontext/errors.go

@@ -0,0 +1,31 @@
+package flowcontext
+
+import (
+	"errors"
+	"sync/atomic"
+
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
+
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
+)
+
+// HandleError handles an error from a flow,
+// It sends the error to errChan if isStopping == 0 and increments isStopping
+//
+// If this is ErrRouteClosed - forward it to errChan
+// If this is ProtocolError - logs the error, and forward it to errChan
+// Otherwise - panics
+func (*FlowContext) HandleError(err error, flowName string, isStopping *uint32, errChan chan<- error) {
+	isErrRouteClosed := errors.Is(err, router.ErrRouteClosed)
+	if !isErrRouteClosed {
+		if protocolErr := &(protocolerrors.ProtocolError{}); !errors.As(err, &protocolErr) {
+			panic(err)
+		}
+
+		log.Errorf("error from %s: %s", flowName, err)
+	}
+
+	if atomic.AddUint32(isStopping, 1) == 1 {
+		errChan <- err
+	}
+}

app/protocol/flowcontext/flow_context.go

@@ -4,16 +4,16 @@ import (
 	"sync"
 	"time"
 
+	"github.com/kaspanet/kaspad/app/protocol/flows/blockrelay"
+	"github.com/kaspanet/kaspad/app/protocol/flows/relaytransactions"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
 	"github.com/kaspanet/kaspad/domain/blockdag"
 	"github.com/kaspanet/kaspad/domain/mempool"
 	"github.com/kaspanet/kaspad/infrastructure/config"
-	"github.com/kaspanet/kaspad/network/addressmanager"
+	"github.com/kaspanet/kaspad/infrastructure/network/addressmanager"
-	"github.com/kaspanet/kaspad/network/connmanager"
+	"github.com/kaspanet/kaspad/infrastructure/network/connmanager"
-	"github.com/kaspanet/kaspad/network/netadapter"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
-	"github.com/kaspanet/kaspad/network/netadapter/id"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/id"
-	"github.com/kaspanet/kaspad/network/protocol/flows/blockrelay"
-	"github.com/kaspanet/kaspad/network/protocol/flows/relaytransactions"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
 	"github.com/kaspanet/kaspad/util"
 	"github.com/kaspanet/kaspad/util/daghash"
 )
@@ -39,7 +39,7 @@ type FlowContext struct {
 	startIBDMutex sync.Mutex
 	ibdPeer       *peerpkg.Peer
 
-	peers      map[*id.ID]*peerpkg.Peer
+	peers      map[id.ID]*peerpkg.Peer
 	peersMutex sync.RWMutex
 }
 
@@ -57,7 +57,7 @@ func New(cfg *config.Config, dag *blockdag.BlockDAG, addressManager *addressmana
 		txPool:                      txPool,
 		sharedRequestedTransactions: relaytransactions.NewSharedRequestedTransactions(),
 		sharedRequestedBlocks:       blockrelay.NewSharedRequestedBlocks(),
-		peers:                       make(map[*id.ID]*peerpkg.Peer),
+		peers:                       make(map[id.ID]*peerpkg.Peer),
 		transactionsToRebroadcast:   make(map[daghash.TxID]*util.Tx),
 	}
 }

app/protocol/flowcontext/ibd.go

@@ -4,8 +4,8 @@ import (
 	"sync/atomic"
 	"time"
 
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
 )
 
 // StartIBDIfRequired selects a peer and starts IBD against it
@@ -37,6 +37,9 @@ func (f *FlowContext) IsInIBD() bool {
 // selectPeerForIBD returns the first peer whose selected tip
 // hash is not in our DAG
 func (f *FlowContext) selectPeerForIBD(dag *blockdag.BlockDAG) *peerpkg.Peer {
+	f.peersMutex.RLock()
+	defer f.peersMutex.RUnlock()
+
 	for _, peer := range f.peers {
 		peerSelectedTipHash := peer.SelectedTipHash()
 		if !dag.IsInDAG(peerSelectedTipHash) {
@@ -59,6 +62,9 @@ func (f *FlowContext) isDAGTimeCurrent() bool {
 }
 
 func (f *FlowContext) requestSelectedTips() {
+	f.peersMutex.RLock()
+	defer f.peersMutex.RUnlock()
+
 	for _, peer := range f.peers {
 		peer.RequestSelectedTipIfRequired()
 	}

app/protocol/flowcontext/network.go

@@ -1,11 +1,11 @@
 package flowcontext
 
 import (
-	"github.com/kaspanet/kaspad/network/connmanager"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/protocol/common"
-	"github.com/kaspanet/kaspad/network/netadapter"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
-	"github.com/kaspanet/kaspad/network/protocol/common"
+	"github.com/kaspanet/kaspad/infrastructure/network/connmanager"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
 	"github.com/pkg/errors"
 )
 
@@ -24,15 +24,23 @@ func (f *FlowContext) AddToPeers(peer *peerpkg.Peer) error {
 	f.peersMutex.Lock()
 	defer f.peersMutex.Unlock()
 
-	if _, ok := f.peers[peer.ID()]; ok {
+	if _, ok := f.peers[*peer.ID()]; ok {
 		return errors.Wrapf(common.ErrPeerWithSameIDExists, "peer with ID %s already exists", peer.ID())
 	}
 
-	f.peers[peer.ID()] = peer
+	f.peers[*peer.ID()] = peer
 
 	return nil
 }
 
+// RemoveFromPeers remove this peer from the peers list.
+func (f *FlowContext) RemoveFromPeers(peer *peerpkg.Peer) {
+	f.peersMutex.Lock()
+	defer f.peersMutex.Unlock()
+
+	delete(f.peers, *peer.ID())
+}
+
 // readyPeerConnections returns the NetConnections of all the ready peers.
 func (f *FlowContext) readyPeerConnections() []*netadapter.NetConnection {
 	f.peersMutex.RLock()
@@ -47,7 +55,7 @@ func (f *FlowContext) readyPeerConnections() []*netadapter.NetConnection {
 }
 
 // Broadcast broadcast the given message to all the ready peers.
-func (f *FlowContext) Broadcast(message domainmessage.Message) error {
+func (f *FlowContext) Broadcast(message appmessage.Message) error {
 	return f.netAdapter.Broadcast(f.readyPeerConnections(), message)
 }
 

app/protocol/flowcontext/transactions.go

@@ -1,9 +1,9 @@
 package flowcontext
 
 import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/flows/relaytransactions"
 	"github.com/kaspanet/kaspad/domain/mempool"
-	"github.com/kaspanet/kaspad/network/domainmessage"
-	"github.com/kaspanet/kaspad/network/protocol/flows/relaytransactions"
 	"github.com/kaspanet/kaspad/util"
 	"github.com/kaspanet/kaspad/util/daghash"
 	"github.com/pkg/errors"
@@ -25,7 +25,8 @@ func (f *FlowContext) AddTransaction(tx *util.Tx) error {
 	}
 
 	f.transactionsToRebroadcast[*tx.ID()] = tx
-	inv := domainmessage.NewMsgInvTransaction([]*daghash.TxID{tx.ID()})
+	inv := appmessage.NewMsgInvTransaction([]*daghash.TxID{tx.ID()})
+	log.Criticalf("~~~~~ FlowContext.AddTransaction() broadcasting %s", tx.ID())
 	return f.Broadcast(inv)
 }
 

app/protocol/flows/addressexchange/receiveaddresses.go

@@ -1,13 +1,13 @@
 package addressexchange
 
 import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/common"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/infrastructure/config"
-	"github.com/kaspanet/kaspad/network/addressmanager"
+	"github.com/kaspanet/kaspad/infrastructure/network/addressmanager"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/protocol/common"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
 )
 
 // ReceiveAddressesContext is the interface for the context needed for the ReceiveAddresses flow.
@@ -25,7 +25,7 @@ func ReceiveAddresses(context ReceiveAddressesContext, incomingRoute *router.Rou
 	}
 
 	subnetworkID := peer.SubnetworkID()
-	msgGetAddresses := domainmessage.NewMsgRequestAddresses(false, subnetworkID)
+	msgGetAddresses := appmessage.NewMsgRequestAddresses(false, subnetworkID)
 	err := outgoingRoute.Enqueue(msgGetAddresses)
 	if err != nil {
 		return err
@@ -36,9 +36,9 @@ func ReceiveAddresses(context ReceiveAddressesContext, incomingRoute *router.Rou
 		return err
 	}
 
-	msgAddresses := message.(*domainmessage.MsgAddresses)
+	msgAddresses := message.(*appmessage.MsgAddresses)
 	if len(msgAddresses.AddrList) > addressmanager.GetAddressesMax {
-		return protocolerrors.Errorf(true, "address count excceeded %d", addressmanager.GetAddressesMax)
+		return protocolerrors.Errorf(true, "address count exceeded %d", addressmanager.GetAddressesMax)
 	}
 
 	if msgAddresses.IncludeAllSubnetworks {

app/protocol/flows/addressexchange/sendaddresses.go

@@ -1,9 +1,9 @@
 package addressexchange
 
 import (
-	"github.com/kaspanet/kaspad/network/addressmanager"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/addressmanager"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 	"math/rand"
 )
 
@@ -14,16 +14,15 @@ type SendAddressesContext interface {
 
 // SendAddresses sends addresses to a peer that requests it.
 func SendAddresses(context SendAddressesContext, incomingRoute *router.Route, outgoingRoute *router.Route) error {
-
 	message, err := incomingRoute.Dequeue()
 	if err != nil {
 		return err
 	}
 
-	msgGetAddresses := message.(*domainmessage.MsgRequestAddresses)
+	msgGetAddresses := message.(*appmessage.MsgRequestAddresses)
 	addresses := context.AddressManager().AddressCache(msgGetAddresses.IncludeAllSubnetworks,
 		msgGetAddresses.SubnetworkID)
-	msgAddresses := domainmessage.NewMsgAddresses(msgGetAddresses.IncludeAllSubnetworks, msgGetAddresses.SubnetworkID)
+	msgAddresses := appmessage.NewMsgAddresses(msgGetAddresses.IncludeAllSubnetworks, msgGetAddresses.SubnetworkID)
 	err = msgAddresses.AddAddresses(shuffleAddresses(addresses)...)
 	if err != nil {
 		return err
@@ -33,14 +32,14 @@ func SendAddresses(context SendAddressesContext, incomingRoute *router.Route, ou
 }
 
 // shuffleAddresses randomizes the given addresses sent if there are more than the maximum allowed in one message.
-func shuffleAddresses(addresses []*domainmessage.NetAddress) []*domainmessage.NetAddress {
+func shuffleAddresses(addresses []*appmessage.NetAddress) []*appmessage.NetAddress {
 	addressCount := len(addresses)
 
-	if addressCount < domainmessage.MaxAddressesPerMsg {
+	if addressCount < appmessage.MaxAddressesPerMsg {
 		return addresses
 	}
 
-	shuffleAddresses := make([]*domainmessage.NetAddress, addressCount)
+	shuffleAddresses := make([]*appmessage.NetAddress, addressCount)
 	copy(shuffleAddresses, addresses)
 
 	rand.Shuffle(addressCount, func(i, j int) {
@@ -48,6 +47,6 @@ func shuffleAddresses(addresses []*domainmessage.NetAddress) []*domainmessage.Ne
 	})
 
 	// Truncate it to the maximum size.
-	shuffleAddresses = shuffleAddresses[:domainmessage.MaxAddressesPerMsg]
+	shuffleAddresses = shuffleAddresses[:appmessage.MaxAddressesPerMsg]
 	return shuffleAddresses
 }

app/protocol/flows/blockrelay/handle_relay_block_requests.go

@@ -1,11 +1,11 @@
 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/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
 	"github.com/pkg/errors"
 )
 
@@ -14,7 +14,7 @@ type RelayBlockRequestsContext interface {
 	DAG() *blockdag.BlockDAG
 }
 
-// HandleRelayBlockRequests listens to domainmessage.MsgRequestRelayBlocks messages and sends
+// HandleRelayBlockRequests listens to appmessage.MsgRequestRelayBlocks messages and sends
 // their corresponding blocks to the requesting peer.
 func HandleRelayBlockRequests(context RelayBlockRequestsContext, incomingRoute *router.Route,
 	outgoingRoute *router.Route, peer *peerpkg.Peer) error {
@@ -24,7 +24,7 @@ func HandleRelayBlockRequests(context RelayBlockRequestsContext, incomingRoute *
 		if err != nil {
 			return err
 		}
-		getRelayBlocksMessage := message.(*domainmessage.MsgRequestRelayBlocks)
+		getRelayBlocksMessage := message.(*appmessage.MsgRequestRelayBlocks)
 		for _, hash := range getRelayBlocksMessage.Hashes {
 			// Fetch the block from the database.
 			block, err := context.DAG().BlockByHash(hash)

app/protocol/flows/blockrelay/handle_relay_invs.go

@@ -1,14 +1,14 @@
 package blockrelay
 
 import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/blocklogger"
+	"github.com/kaspanet/kaspad/app/protocol/common"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
-	"github.com/kaspanet/kaspad/network/netadapter"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/protocol/blocklogger"
-	"github.com/kaspanet/kaspad/network/protocol/common"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/util"
 	"github.com/kaspanet/kaspad/util/daghash"
 	mathUtil "github.com/kaspanet/kaspad/util/math"
@@ -23,17 +23,17 @@ type RelayInvsContext interface {
 	SharedRequestedBlocks() *SharedRequestedBlocks
 	StartIBDIfRequired()
 	IsInIBD() bool
-	Broadcast(message domainmessage.Message) error
+	Broadcast(message appmessage.Message) error
 }
 
 type handleRelayInvsFlow struct {
 	RelayInvsContext
 	incomingRoute, outgoingRoute *router.Route
 	peer                         *peerpkg.Peer
-	invsQueue                    []*domainmessage.MsgInvRelayBlock
+	invsQueue                    []*appmessage.MsgInvRelayBlock
 }
 
-// HandleRelayInvs listens to domainmessage.MsgInvRelayBlock messages, requests their corresponding blocks if they
+// HandleRelayInvs listens to appmessage.MsgInvRelayBlock messages, requests their corresponding blocks if they
 // are missing, adds them to the DAG and propagates them to the rest of the network.
 func HandleRelayInvs(context RelayInvsContext, incomingRoute *router.Route, outgoingRoute *router.Route,
 	peer *peerpkg.Peer) error {
@@ -43,7 +43,7 @@ func HandleRelayInvs(context RelayInvsContext, incomingRoute *router.Route, outg
 		incomingRoute:    incomingRoute,
 		outgoingRoute:    outgoingRoute,
 		peer:             peer,
-		invsQueue:        make([]*domainmessage.MsgInvRelayBlock, 0),
+		invsQueue:        make([]*appmessage.MsgInvRelayBlock, 0),
 	}
 	return flow.start()
 }
@@ -55,6 +55,8 @@ func (flow *handleRelayInvsFlow) start() error {
 			return err
 		}
 
+		log.Debugf("Got relay inv for block %s", inv.Hash)
+
 		if flow.DAG().IsKnownBlock(inv.Hash) {
 			if flow.DAG().IsKnownInvalid(inv.Hash) {
 				return protocolerrors.Errorf(true, "sent inv of an invalid block %s",
@@ -81,10 +83,10 @@ func (flow *handleRelayInvsFlow) start() error {
 	}
 }
 
-func (flow *handleRelayInvsFlow) readInv() (*domainmessage.MsgInvRelayBlock, error) {
+func (flow *handleRelayInvsFlow) readInv() (*appmessage.MsgInvRelayBlock, error) {
 
 	if len(flow.invsQueue) > 0 {
-		var inv *domainmessage.MsgInvRelayBlock
+		var inv *appmessage.MsgInvRelayBlock
 		inv, flow.invsQueue = flow.invsQueue[0], flow.invsQueue[1:]
 		return inv, nil
 	}
@@ -94,7 +96,7 @@ func (flow *handleRelayInvsFlow) readInv() (*domainmessage.MsgInvRelayBlock, err
 		return nil, err
 	}
 
-	inv, ok := msg.(*domainmessage.MsgInvRelayBlock)
+	inv, ok := msg.(*appmessage.MsgInvRelayBlock)
 	if !ok {
 		return nil, protocolerrors.Errorf(true, "unexpected %s message in the block relay handleRelayInvsFlow while "+
 			"expecting an inv message", msg.Command())
@@ -103,7 +105,7 @@ func (flow *handleRelayInvsFlow) readInv() (*domainmessage.MsgInvRelayBlock, err
 }
 
 func (flow *handleRelayInvsFlow) requestBlocks(requestQueue *hashesQueueSet) error {
-	numHashesToRequest := mathUtil.MinInt(domainmessage.MsgRequestRelayBlocksHashes, requestQueue.len())
+	numHashesToRequest := mathUtil.MinInt(appmessage.MsgRequestRelayBlocksHashes, requestQueue.len())
 	hashesToRequest := requestQueue.dequeue(numHashesToRequest)
 
 	pendingBlocks := map[daghash.Hash]struct{}{}
@@ -114,6 +116,11 @@ func (flow *handleRelayInvsFlow) requestBlocks(requestQueue *hashesQueueSet) err
 			continue
 		}
 
+		// The block can become known from another peer in the process of orphan resolution
+		if flow.DAG().IsKnownBlock(hash) {
+			continue
+		}
+
 		pendingBlocks[*hash] = struct{}{}
 		filteredHashesToRequest = append(filteredHashesToRequest, hash)
 	}
@@ -127,7 +134,7 @@ func (flow *handleRelayInvsFlow) requestBlocks(requestQueue *hashesQueueSet) err
 	// clean from any pending blocks.
 	defer flow.SharedRequestedBlocks().removeSet(pendingBlocks)
 
-	getRelayBlocksMsg := domainmessage.NewMsgRequestRelayBlocks(filteredHashesToRequest)
+	getRelayBlocksMsg := appmessage.NewMsgRequestRelayBlocks(filteredHashesToRequest)
 	err := flow.outgoingRoute.Enqueue(getRelayBlocksMsg)
 	if err != nil {
 		return err
@@ -153,16 +160,15 @@ func (flow *handleRelayInvsFlow) requestBlocks(requestQueue *hashesQueueSet) err
 
 		delete(pendingBlocks, *blockHash)
 		flow.SharedRequestedBlocks().remove(blockHash)
-
 	}
 	return nil
 }
 
 // readMsgBlock returns the next msgBlock in msgChan, and populates invsQueue with any inv messages that meanwhile arrive.
 //
-// Note: this function assumes msgChan can contain only domainmessage.MsgInvRelayBlock and domainmessage.MsgBlock messages.
+// Note: this function assumes msgChan can contain only appmessage.MsgInvRelayBlock and appmessage.MsgBlock messages.
 func (flow *handleRelayInvsFlow) readMsgBlock() (
-	msgBlock *domainmessage.MsgBlock, err error) {
+	msgBlock *appmessage.MsgBlock, err error) {
 
 	for {
 		message, err := flow.incomingRoute.DequeueWithTimeout(common.DefaultTimeout)
@@ -171,9 +177,9 @@ func (flow *handleRelayInvsFlow) readMsgBlock() (
 		}
 
 		switch message := message.(type) {
-		case *domainmessage.MsgInvRelayBlock:
+		case *appmessage.MsgInvRelayBlock:
 			flow.invsQueue = append(flow.invsQueue, message)
-		case *domainmessage.MsgBlock:
+		case *appmessage.MsgBlock:
 			return message, nil
 		default:
 			return nil, errors.Errorf("unexpected message %s", message.Command())
@@ -190,7 +196,7 @@ func (flow *handleRelayInvsFlow) processAndRelayBlock(requestQueue *hashesQueueS
 		}
 		log.Infof("Rejected block %s from %s: %s", blockHash, flow.peer, err)
 
-		return protocolerrors.Wrapf(true, err, "got invalid block %s", blockHash)
+		return protocolerrors.Wrapf(true, err, "got invalid block %s from relay", blockHash)
 	}
 
 	if isDelayed {
@@ -224,7 +230,7 @@ func (flow *handleRelayInvsFlow) processAndRelayBlock(requestQueue *hashesQueueS
 	if err != nil {
 		return err
 	}
-	err = flow.Broadcast(domainmessage.NewMsgInvBlock(blockHash))
+	err = flow.Broadcast(appmessage.NewMsgInvBlock(blockHash))
 	if err != nil {
 		return err
 	}

app/protocol/flows/handshake/handshake.go

@@ -4,17 +4,17 @@ import (
 	"sync"
 	"sync/atomic"
 
-	"github.com/kaspanet/kaspad/network/addressmanager"
+	"github.com/kaspanet/kaspad/app/protocol/common"
-	"github.com/kaspanet/kaspad/network/protocol/common"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
+	"github.com/kaspanet/kaspad/infrastructure/network/addressmanager"
 
 	"github.com/kaspanet/kaspad/domain/blockdag"
 	"github.com/kaspanet/kaspad/infrastructure/config"
-	"github.com/kaspanet/kaspad/network/netadapter"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
 
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	routerpkg "github.com/kaspanet/kaspad/network/netadapter/router"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
+	routerpkg "github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 	"github.com/kaspanet/kaspad/util/locks"
 	"github.com/pkg/errors"
 )
@@ -34,7 +34,7 @@ type HandleHandshakeContext interface {
 // version message, as well as a verack for the sent version
 func HandleHandshake(context HandleHandshakeContext, netConnection *netadapter.NetConnection,
 	receiveVersionRoute *routerpkg.Route, sendVersionRoute *routerpkg.Route, outgoingRoute *routerpkg.Route,
-) (peer *peerpkg.Peer, err error) {
+) (*peerpkg.Peer, error) {
 
 	// For HandleHandshake to finish, we need to get from the other node
 	// a version and verack messages, so we increase the wait group by 2
@@ -45,26 +45,26 @@ func HandleHandshake(context HandleHandshakeContext, netConnection *netadapter.N
 	isStopping := uint32(0)
 	errChan := make(chan error)
 
-	peer = peerpkg.New(netConnection)
+	peer := peerpkg.New(netConnection)
 
-	var peerAddress *domainmessage.NetAddress
+	var peerAddress *appmessage.NetAddress
 	spawn("HandleHandshake-ReceiveVersion", func() {
-		defer wg.Done()
 		address, err := ReceiveVersion(context, receiveVersionRoute, outgoingRoute, peer)
 		if err != nil {
 			handleError(err, "ReceiveVersion", &isStopping, errChan)
 			return
 		}
 		peerAddress = address
+		wg.Done()
 	})
 
 	spawn("HandleHandshake-SendVersion", func() {
-		defer wg.Done()
+		err := SendVersion(context, sendVersionRoute, outgoingRoute, peer)
-		err := SendVersion(context, sendVersionRoute, outgoingRoute)
 		if err != nil {
 			handleError(err, "SendVersion", &isStopping, errChan)
 			return
 		}
+		wg.Done()
 	})
 
 	select {
@@ -76,7 +76,7 @@ func HandleHandshake(context HandleHandshakeContext, netConnection *netadapter.N
 	case <-locks.ReceiveFromChanWhenDone(func() { wg.Wait() }):
 	}
 
-	err = context.AddToPeers(peer)
+	err := context.AddToPeers(peer)
 	if err != nil {
 		if errors.As(err, &common.ErrPeerWithSameIDExists) {
 			return nil, protocolerrors.Wrap(false, err, "peer already exists")

app/protocol/flows/handshake/receiveversion.go

@@ -1,11 +1,11 @@
 package handshake
 
 import (
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
+	"github.com/kaspanet/kaspad/app/protocol/common"
-	"github.com/kaspanet/kaspad/network/protocol/common"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 )
 
 var (
@@ -16,7 +16,7 @@ var (
 
 	// minAcceptableProtocolVersion is the lowest protocol version that a
 	// connected peer may support.
-	minAcceptableProtocolVersion = domainmessage.ProtocolVersion
+	minAcceptableProtocolVersion = appmessage.ProtocolVersion
 )
 
 type receiveVersionFlow struct {
@@ -28,7 +28,7 @@ type receiveVersionFlow struct {
 // ReceiveVersion waits for the peer to send a version message, sends a
 // verack in response, and updates its info accordingly.
 func ReceiveVersion(context HandleHandshakeContext, incomingRoute *router.Route, outgoingRoute *router.Route,
-	peer *peerpkg.Peer) (*domainmessage.NetAddress, error) {
+	peer *peerpkg.Peer) (*appmessage.NetAddress, error) {
 
 	flow := &receiveVersionFlow{
 		HandleHandshakeContext: context,
@@ -40,13 +40,13 @@ func ReceiveVersion(context HandleHandshakeContext, incomingRoute *router.Route,
 	return flow.start()
 }
 
-func (flow *receiveVersionFlow) start() (*domainmessage.NetAddress, error) {
+func (flow *receiveVersionFlow) start() (*appmessage.NetAddress, error) {
 	message, err := flow.incomingRoute.DequeueWithTimeout(common.DefaultTimeout)
 	if err != nil {
 		return nil, err
 	}
 
-	msgVersion, ok := message.(*domainmessage.MsgVersion)
+	msgVersion, ok := message.(*appmessage.MsgVersion)
 	if !ok {
 		return nil, protocolerrors.New(true, "a version message must precede all others")
 	}
@@ -64,7 +64,7 @@ func (flow *receiveVersionFlow) start() (*domainmessage.NetAddress, error) {
 	// too old.
 	//
 	// NOTE: If minAcceptableProtocolVersion is raised to be higher than
-	// domainmessage.RejectVersion, this should send a reject packet before
+	// appmessage.RejectVersion, this should send a reject packet before
 	// disconnecting.
 	if msgVersion.ProtocolVersion < minAcceptableProtocolVersion {
 		return nil, protocolerrors.Errorf(false, "protocol version must be %d or greater",
@@ -90,7 +90,7 @@ func (flow *receiveVersionFlow) start() (*domainmessage.NetAddress, error) {
 	}
 
 	flow.peer.UpdateFieldsFromMsgVersion(msgVersion)
-	err = flow.outgoingRoute.Enqueue(domainmessage.NewMsgVerAck())
+	err = flow.outgoingRoute.Enqueue(appmessage.NewMsgVerAck())
 	if err != nil {
 		return nil, err
 	}

app/protocol/flows/handshake/sendversion.go

@@ -1,9 +1,10 @@
 package handshake
 
 import (
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
+	"github.com/kaspanet/kaspad/app/protocol/common"
-	"github.com/kaspanet/kaspad/network/protocol/common"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 	"github.com/kaspanet/kaspad/version"
 )
 
@@ -18,24 +19,28 @@ var (
 
 	// defaultServices describes the default services that are supported by
 	// the server.
-	defaultServices = domainmessage.SFNodeNetwork | domainmessage.SFNodeBloom | domainmessage.SFNodeCF
+	defaultServices = appmessage.DefaultServices
 
 	// defaultRequiredServices describes the default services that are
 	// required to be supported by outbound peers.
-	defaultRequiredServices = domainmessage.SFNodeNetwork
+	defaultRequiredServices = appmessage.SFNodeNetwork
 )
 
 type sendVersionFlow struct {
 	HandleHandshakeContext
 	incomingRoute, outgoingRoute *router.Route
+	peer                         *peerpkg.Peer
 }
 
 // SendVersion sends a version to a peer and waits for verack.
-func SendVersion(context HandleHandshakeContext, incomingRoute *router.Route, outgoingRoute *router.Route) error {
+func SendVersion(context HandleHandshakeContext, incomingRoute *router.Route,
+	outgoingRoute *router.Route, peer *peerpkg.Peer) error {
+
 	flow := &sendVersionFlow{
 		HandleHandshakeContext: context,
 		incomingRoute:          incomingRoute,
 		outgoingRoute:          outgoingRoute,
+		peer:                   peer,
 	}
 	return flow.start()
 }
@@ -45,11 +50,8 @@ func (flow *sendVersionFlow) start() error {
 	subnetworkID := flow.Config().SubnetworkID
 
 	// Version message.
-	localAddress, err := flow.NetAdapter().GetBestLocalAddress()
+	localAddress := flow.AddressManager().GetBestLocalAddress(flow.peer.Connection().NetAddress())
-	if err != nil {
+	msg := appmessage.NewMsgVersion(localAddress, flow.NetAdapter().ID(),
-		return err
-	}
-	msg := domainmessage.NewMsgVersion(localAddress, flow.NetAdapter().ID(),
 		flow.Config().ActiveNetParams.Name, selectedTipHash, subnetworkID)
 	msg.AddUserAgent(userAgentName, userAgentVersion, flow.Config().UserAgentComments...)
 
@@ -57,12 +59,12 @@ func (flow *sendVersionFlow) start() error {
 	msg.Services = defaultServices
 
 	// Advertise our max supported protocol version.
-	msg.ProtocolVersion = domainmessage.ProtocolVersion
+	msg.ProtocolVersion = appmessage.ProtocolVersion
 
 	// Advertise if inv messages for transactions are desired.
 	msg.DisableRelayTx = flow.Config().BlocksOnly
 
-	err = flow.outgoingRoute.Enqueue(msg)
+	err := flow.outgoingRoute.Enqueue(msg)
 	if err != nil {
 		return err
 	}

app/protocol/flows/ibd/handle_request_block_locator.go

@@ -1,10 +1,10 @@
 package ibd
 
 import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/util/daghash"
 )
 
@@ -57,13 +57,13 @@ func (flow *handleRequestBlockLocatorFlow) receiveGetBlockLocator() (lowHash *da
 	if err != nil {
 		return nil, nil, err
 	}
-	msgGetBlockLocator := message.(*domainmessage.MsgRequestBlockLocator)
+	msgGetBlockLocator := message.(*appmessage.MsgRequestBlockLocator)
 
 	return msgGetBlockLocator.LowHash, msgGetBlockLocator.HighHash, nil
 }
 
 func (flow *handleRequestBlockLocatorFlow) sendBlockLocator(locator blockdag.BlockLocator) error {
-	msgBlockLocator := domainmessage.NewMsgBlockLocator(locator)
+	msgBlockLocator := appmessage.NewMsgBlockLocator(locator)
 	err := flow.outgoingRoute.Enqueue(msgBlockLocator)
 	if err != nil {
 		return err

app/protocol/flows/ibd/handle_request_ibd_blocks.go

@@ -2,10 +2,10 @@ package ibd
 
 import (
 	"errors"
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/util/daghash"
 )
 
@@ -66,12 +66,12 @@ func (flow *handleRequestBlocksFlow) start() error {
 				return err
 			}
 
-			if _, ok := message.(*domainmessage.MsgRequestNextIBDBlocks); !ok {
+			if _, ok := message.(*appmessage.MsgRequestNextIBDBlocks); !ok {
 				return protocolerrors.Errorf(true, "received unexpected message type. "+
-					"expected: %s, got: %s", domainmessage.CmdRequestNextIBDBlocks, message.Command())
+					"expected: %s, got: %s", appmessage.CmdRequestNextIBDBlocks, message.Command())
 			}
 		}
-		err = flow.outgoingRoute.Enqueue(domainmessage.NewMsgDoneIBDBlocks())
+		err = flow.outgoingRoute.Enqueue(appmessage.NewMsgDoneIBDBlocks())
 		if err != nil {
 			return err
 		}
@@ -85,15 +85,15 @@ func receiveRequestIBDBlocks(incomingRoute *router.Route) (lowHash *daghash.Hash
 	if err != nil {
 		return nil, nil, err
 	}
-	msgRequestIBDBlocks := message.(*domainmessage.MsgRequestIBDBlocks)
+	msgRequestIBDBlocks := message.(*appmessage.MsgRequestIBDBlocks)
 
 	return msgRequestIBDBlocks.LowHash, msgRequestIBDBlocks.HighHash, nil
 }
 
 func (flow *handleRequestBlocksFlow) buildMsgIBDBlocks(lowHash *daghash.Hash,
-	highHash *daghash.Hash) ([]*domainmessage.MsgIBDBlock, error) {
+	highHash *daghash.Hash) ([]*appmessage.MsgIBDBlock, error) {
 
-	const maxHashesInMsgIBDBlocks = domainmessage.MaxInvPerMsg
+	const maxHashesInMsgIBDBlocks = appmessage.MaxInvPerMsg
 	blockHashes, err := flow.DAG().AntiPastHashesBetween(lowHash, highHash, maxHashesInMsgIBDBlocks)
 	if err != nil {
 		if errors.Is(err, blockdag.ErrInvalidParameter) {
@@ -103,19 +103,19 @@ func (flow *handleRequestBlocksFlow) buildMsgIBDBlocks(lowHash *daghash.Hash,
 		return nil, err
 	}
 
-	msgIBDBlocks := make([]*domainmessage.MsgIBDBlock, len(blockHashes))
+	msgIBDBlocks := make([]*appmessage.MsgIBDBlock, len(blockHashes))
 	for i, blockHash := range blockHashes {
 		block, err := flow.DAG().BlockByHash(blockHash)
 		if err != nil {
 			return nil, err
 		}
-		msgIBDBlocks[i] = domainmessage.NewMsgIBDBlock(block.MsgBlock())
+		msgIBDBlocks[i] = appmessage.NewMsgIBDBlock(block.MsgBlock())
 	}
 
 	return msgIBDBlocks, nil
 }
 
-func (flow *handleRequestBlocksFlow) sendMsgIBDBlocks(msgIBDBlocks []*domainmessage.MsgIBDBlock) error {
+func (flow *handleRequestBlocksFlow) sendMsgIBDBlocks(msgIBDBlocks []*appmessage.MsgIBDBlock) error {
 	for _, msgIBDBlock := range msgIBDBlocks {
 		err := flow.outgoingRoute.Enqueue(msgIBDBlock)
 		if err != nil {

app/protocol/flows/ibd/ibd.go

@@ -1,14 +1,16 @@
 package ibd
 
 import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/blocklogger"
+	"github.com/kaspanet/kaspad/app/protocol/common"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/protocol/common"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/util"
 	"github.com/kaspanet/kaspad/util/daghash"
+	"github.com/pkg/errors"
 )
 
 // HandleIBDContext is the interface for the context needed for the HandleIBD flow.
@@ -52,10 +54,13 @@ func (flow *handleIBDFlow) runIBD() error {
 	defer flow.FinishIBD()
 
 	peerSelectedTipHash := flow.peer.SelectedTipHash()
+	log.Debugf("Trying to find highest shared chain block with peer %s with selected tip %s", flow.peer, peerSelectedTipHash)
 	highestSharedBlockHash, err := flow.findHighestSharedBlockHash(peerSelectedTipHash)
 	if err != nil {
 		return err
 	}
+
+	log.Debugf("Found highest shared chain block %s with peer %s", highestSharedBlockHash, flow.peer)
 	if flow.DAG().IsKnownFinalizedBlock(highestSharedBlockHash) {
 		return protocolerrors.Errorf(false, "cannot initiate "+
 			"IBD with peer %s because the highest shared chain block (%s) is "+
@@ -96,7 +101,7 @@ func (flow *handleIBDFlow) findHighestSharedBlockHash(peerSelectedTipHash *dagha
 
 func (flow *handleIBDFlow) sendGetBlockLocator(lowHash *daghash.Hash, highHash *daghash.Hash) error {
 
-	msgGetBlockLocator := domainmessage.NewMsgRequestBlockLocator(highHash, lowHash)
+	msgGetBlockLocator := appmessage.NewMsgRequestBlockLocator(highHash, lowHash)
 	return flow.outgoingRoute.Enqueue(msgGetBlockLocator)
 }
 
@@ -105,11 +110,11 @@ func (flow *handleIBDFlow) receiveBlockLocator() (blockLocatorHashes []*daghash.
 	if err != nil {
 		return nil, err
 	}
-	msgBlockLocator, ok := message.(*domainmessage.MsgBlockLocator)
+	msgBlockLocator, ok := message.(*appmessage.MsgBlockLocator)
 	if !ok {
 		return nil,
 			protocolerrors.Errorf(true, "received unexpected message type. "+
-				"expected: %s, got: %s", domainmessage.CmdBlockLocator, message.Command())
+				"expected: %s, got: %s", appmessage.CmdBlockLocator, message.Command())
 	}
 	return msgBlockLocator.BlockLocatorHashes, nil
 }
@@ -140,7 +145,7 @@ func (flow *handleIBDFlow) downloadBlocks(highestSharedBlockHash *daghash.Hash,
 
 		blocksReceived++
 		if blocksReceived%ibdBatchSize == 0 {
-			err = flow.outgoingRoute.Enqueue(domainmessage.NewMsgRequestNextIBDBlocks())
+			err = flow.outgoingRoute.Enqueue(appmessage.NewMsgRequestNextIBDBlocks())
 			if err != nil {
 				return err
 			}
@@ -151,36 +156,41 @@ func (flow *handleIBDFlow) downloadBlocks(highestSharedBlockHash *daghash.Hash,
 func (flow *handleIBDFlow) sendGetBlocks(highestSharedBlockHash *daghash.Hash,
 	peerSelectedTipHash *daghash.Hash) error {
 
-	msgGetBlockInvs := domainmessage.NewMsgRequstIBDBlocks(highestSharedBlockHash, peerSelectedTipHash)
+	msgGetBlockInvs := appmessage.NewMsgRequstIBDBlocks(highestSharedBlockHash, peerSelectedTipHash)
 	return flow.outgoingRoute.Enqueue(msgGetBlockInvs)
 }
 
-func (flow *handleIBDFlow) receiveIBDBlock() (msgIBDBlock *domainmessage.MsgIBDBlock, doneIBD bool, err error) {
+func (flow *handleIBDFlow) receiveIBDBlock() (msgIBDBlock *appmessage.MsgIBDBlock, doneIBD bool, err error) {
 	message, err := flow.incomingRoute.DequeueWithTimeout(common.DefaultTimeout)
 	if err != nil {
 		return nil, false, err
 	}
 	switch message := message.(type) {
-	case *domainmessage.MsgIBDBlock:
+	case *appmessage.MsgIBDBlock:
 		return message, false, nil
-	case *domainmessage.MsgDoneIBDBlocks:
+	case *appmessage.MsgDoneIBDBlocks:
 		return nil, true, nil
 	default:
 		return nil, false,
 			protocolerrors.Errorf(true, "received unexpected message type. "+
-				"expected: %s, got: %s", domainmessage.CmdIBDBlock, message.Command())
+				"expected: %s, got: %s", appmessage.CmdIBDBlock, message.Command())
 	}
 }
 
-func (flow *handleIBDFlow) processIBDBlock(msgIBDBlock *domainmessage.MsgIBDBlock) error {
+func (flow *handleIBDFlow) processIBDBlock(msgIBDBlock *appmessage.MsgIBDBlock) error {
-
 	block := util.NewBlock(msgIBDBlock.MsgBlock)
 	if flow.DAG().IsInDAG(block.Hash()) {
+		log.Debugf("IBD block %s is already in the DAG. Skipping...", block.Hash())
 		return nil
 	}
 	isOrphan, isDelayed, err := flow.DAG().ProcessBlock(block, blockdag.BFNone)
 	if err != nil {
-		return err
+		if !errors.As(err, &blockdag.RuleError{}) {
+			return errors.Wrapf(err, "failed to process block %s during IBD", block.Hash())
+		}
+		log.Infof("Rejected block %s from %s during IBD: %s", block.Hash(), flow.peer, err)
+
+		return protocolerrors.Wrapf(true, err, "got invalid block %s during IBD", block.Hash())
 	}
 	if isOrphan {
 		return protocolerrors.Errorf(true, "received orphan block %s "+
@@ -194,5 +204,9 @@ func (flow *handleIBDFlow) processIBDBlock(msgIBDBlock *domainmessage.MsgIBDBloc
 	if err != nil {
 		return err
 	}
+	err = blocklogger.LogBlock(block)
+	if err != nil {
+		return err
+	}
 	return nil
 }

app/protocol/flows/ibd/selectedtip/handle_request_selected_tip.go

@@ -1,9 +1,9 @@
 package selectedtip
 
 import (
+	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
 	"github.com/pkg/errors"
 )
 
@@ -46,16 +46,16 @@ func (flow *handleRequestSelectedTipFlow) receiveGetSelectedTip() error {
 	if err != nil {
 		return err
 	}
-	_, ok := message.(*domainmessage.MsgRequestSelectedTip)
+	_, ok := message.(*appmessage.MsgRequestSelectedTip)
 	if !ok {
 		return errors.Errorf("received unexpected message type. "+
-			"expected: %s, got: %s", domainmessage.CmdRequestSelectedTip, message.Command())
+			"expected: %s, got: %s", appmessage.CmdRequestSelectedTip, message.Command())
 	}
 
 	return nil
 }
 
 func (flow *handleRequestSelectedTipFlow) sendSelectedTipHash() error {
-	msgSelectedTip := domainmessage.NewMsgSelectedTip(flow.DAG().SelectedTipHash())
+	msgSelectedTip := appmessage.NewMsgSelectedTip(flow.DAG().SelectedTipHash())
 	return flow.outgoingRoute.Enqueue(msgSelectedTip)
 }

app/protocol/flows/ibd/selectedtip/request_selected_tip.go

@@ -1,11 +1,11 @@
 package selectedtip
 
 import (
+	"github.com/kaspanet/kaspad/app/appmessage"
+	"github.com/kaspanet/kaspad/app/protocol/common"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/protocol/common"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
 	"github.com/kaspanet/kaspad/util/daghash"
 )
 
@@ -64,7 +64,7 @@ func (flow *requestSelectedTipFlow) runSelectedTipRequest() error {
 }
 
 func (flow *requestSelectedTipFlow) requestSelectedTip() error {
-	msgGetSelectedTip := domainmessage.NewMsgRequestSelectedTip()
+	msgGetSelectedTip := appmessage.NewMsgRequestSelectedTip()
 	return flow.outgoingRoute.Enqueue(msgGetSelectedTip)
 }
 
@@ -73,7 +73,7 @@ func (flow *requestSelectedTipFlow) receiveSelectedTip() (selectedTipHash *dagha
 	if err != nil {
 		return nil, err
 	}
-	msgSelectedTip := message.(*domainmessage.MsgSelectedTip)
+	msgSelectedTip := message.(*appmessage.MsgSelectedTip)
 
 	return msgSelectedTip.SelectedTipHash, nil
 }

app/protocol/flows/ping/receive.go

@@ -1,8 +1,8 @@
 package ping
 
 import (
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 )
 
 // ReceivePingsContext is the interface for the context needed for the ReceivePings flow.
@@ -31,9 +31,9 @@ func (flow *receivePingsFlow) start() error {
 		if err != nil {
 			return err
 		}
-		pingMessage := message.(*domainmessage.MsgPing)
+		pingMessage := message.(*appmessage.MsgPing)
 
-		pongMessage := domainmessage.NewMsgPong(pingMessage.Nonce)
+		pongMessage := appmessage.NewMsgPong(pingMessage.Nonce)
 		err = flow.outgoingRoute.Enqueue(pongMessage)
 		if err != nil {
 			return err

app/protocol/flows/ping/send.go

@@ -1,13 +1,13 @@
 package ping
 
 import (
+	"github.com/kaspanet/kaspad/app/protocol/common"
 	"time"
 
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
-	"github.com/kaspanet/kaspad/network/protocol/common"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/util/random"
 )
 
@@ -46,7 +46,7 @@ func (flow *sendPingsFlow) start() error {
 		}
 		flow.peer.SetPingPending(nonce)
 
-		pingMessage := domainmessage.NewMsgPing(nonce)
+		pingMessage := appmessage.NewMsgPing(nonce)
 		err = flow.outgoingRoute.Enqueue(pingMessage)
 		if err != nil {
 			return err
@@ -56,7 +56,7 @@ func (flow *sendPingsFlow) start() error {
 		if err != nil {
 			return err
 		}
-		pongMessage := message.(*domainmessage.MsgPong)
+		pongMessage := message.(*appmessage.MsgPong)
 		if pongMessage.Nonce != pingMessage.Nonce {
 			return protocolerrors.New(true, "nonce mismatch between ping and pong")
 		}

app/protocol/flows/rejects/handle_rejects.go

@@ -1,9 +1,9 @@
 package rejects
 
 import (
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 )
 
 // HandleRejectsContext is the interface for the context needed for the HandleRejects flow.
@@ -31,7 +31,7 @@ func (flow *handleRejectsFlow) start() error {
 	if err != nil {
 		return err
 	}
-	rejectMessage := message.(*domainmessage.MsgReject)
+	rejectMessage := message.(*appmessage.MsgReject)
 
 	const maxReasonLength = 255
 	if len(rejectMessage.Reason) > maxReasonLength {

app/protocol/flows/relaytransactions/handle_relayed_transactions.go

@@ -1,13 +1,13 @@
 package relaytransactions
 
 import (
+	"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/blockdag"
 	"github.com/kaspanet/kaspad/domain/mempool"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
-	"github.com/kaspanet/kaspad/network/netadapter"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
-	"github.com/kaspanet/kaspad/network/protocol/common"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
 	"github.com/kaspanet/kaspad/util"
 	"github.com/kaspanet/kaspad/util/daghash"
 	"github.com/pkg/errors"
@@ -20,23 +20,23 @@ type TransactionsRelayContext interface {
 	DAG() *blockdag.BlockDAG
 	SharedRequestedTransactions() *SharedRequestedTransactions
 	TxPool() *mempool.TxPool
-	Broadcast(message domainmessage.Message) error
+	Broadcast(message appmessage.Message) error
 }
 
 type handleRelayedTransactionsFlow struct {
 	TransactionsRelayContext
 	incomingRoute, outgoingRoute *router.Route
-	invsQueue                    []*domainmessage.MsgInvTransaction
+	invsQueue                    []*appmessage.MsgInvTransaction
 }
 
-// HandleRelayedTransactions listens to domainmessage.MsgInvTransaction messages, requests their corresponding transactions if they
+// HandleRelayedTransactions listens to appmessage.MsgInvTransaction messages, requests their corresponding transactions if they
 // are missing, adds them to the mempool and propagates them to the rest of the network.
 func HandleRelayedTransactions(context TransactionsRelayContext, incomingRoute *router.Route, outgoingRoute *router.Route) error {
 	flow := &handleRelayedTransactionsFlow{
 		TransactionsRelayContext: context,
 		incomingRoute:            incomingRoute,
 		outgoingRoute:            outgoingRoute,
-		invsQueue:                make([]*domainmessage.MsgInvTransaction, 0),
+		invsQueue:                make([]*appmessage.MsgInvTransaction, 0),
 	}
 	return flow.start()
 }
@@ -48,6 +48,10 @@ func (flow *handleRelayedTransactionsFlow) start() error {
 			return err
 		}
 
+		for _, txID := range inv.TxIDs {
+			log.Criticalf("~~~~~ handleRelayedTransactionsFlow.start() got %s", txID)
+		}
+
 		requestedIDs, err := flow.requestInvTransactions(inv)
 		if err != nil {
 			return err
@@ -61,7 +65,7 @@ func (flow *handleRelayedTransactionsFlow) start() error {
 }
 
 func (flow *handleRelayedTransactionsFlow) requestInvTransactions(
-	inv *domainmessage.MsgInvTransaction) (requestedIDs []*daghash.TxID, err error) {
+	inv *appmessage.MsgInvTransaction) (requestedIDs []*daghash.TxID, err error) {
 
 	idsToRequest := make([]*daghash.TxID, 0, len(inv.TxIDs))
 	for _, txID := range inv.TxIDs {
@@ -79,7 +83,7 @@ func (flow *handleRelayedTransactionsFlow) requestInvTransactions(
 		return idsToRequest, nil
 	}
 
-	msgGetTransactions := domainmessage.NewMsgRequestTransactions(idsToRequest)
+	msgGetTransactions := appmessage.NewMsgRequestTransactions(idsToRequest)
 	err = flow.outgoingRoute.Enqueue(msgGetTransactions)
 	if err != nil {
 		flow.SharedRequestedTransactions().removeMany(idsToRequest)
@@ -103,7 +107,7 @@ func (flow *handleRelayedTransactionsFlow) isKnownTransaction(txID *daghash.TxID
 	// checked because the vast majority of transactions consist of
 	// two outputs where one is some form of "pay-to-somebody-else"
 	// and the other is a change output.
-	prevOut := domainmessage.Outpoint{TxID: *txID}
+	prevOut := appmessage.Outpoint{TxID: *txID}
 	for i := uint32(0); i < 2; i++ {
 		prevOut.Index = i
 		_, ok := flow.DAG().GetUTXOEntry(prevOut)
@@ -114,9 +118,9 @@ func (flow *handleRelayedTransactionsFlow) isKnownTransaction(txID *daghash.TxID
 	return false
 }
 
-func (flow *handleRelayedTransactionsFlow) readInv() (*domainmessage.MsgInvTransaction, error) {
+func (flow *handleRelayedTransactionsFlow) readInv() (*appmessage.MsgInvTransaction, error) {
 	if len(flow.invsQueue) > 0 {
-		var inv *domainmessage.MsgInvTransaction
+		var inv *appmessage.MsgInvTransaction
 		inv, flow.invsQueue = flow.invsQueue[0], flow.invsQueue[1:]
 		return inv, nil
 	}
@@ -126,7 +130,7 @@ func (flow *handleRelayedTransactionsFlow) readInv() (*domainmessage.MsgInvTrans
 		return nil, err
 	}
 
-	inv, ok := msg.(*domainmessage.MsgInvTransaction)
+	inv, ok := msg.(*appmessage.MsgInvTransaction)
 	if !ok {
 		return nil, protocolerrors.Errorf(true, "unexpected %s message in the block relay flow while "+
 			"expecting an inv message", msg.Command())
@@ -137,9 +141,10 @@ func (flow *handleRelayedTransactionsFlow) readInv() (*domainmessage.MsgInvTrans
 func (flow *handleRelayedTransactionsFlow) broadcastAcceptedTransactions(acceptedTxs []*mempool.TxDesc) error {
 	idsToBroadcast := make([]*daghash.TxID, len(acceptedTxs))
 	for i, tx := range acceptedTxs {
+		log.Criticalf("~~~~~ broadcastAcceptedTransactions() broadcasting %s", tx.Tx.ID())
 		idsToBroadcast[i] = tx.Tx.ID()
 	}
-	inv := domainmessage.NewMsgInvTransaction(idsToBroadcast)
+	inv := appmessage.NewMsgInvTransaction(idsToBroadcast)
 	return flow.Broadcast(inv)
 }
 
@@ -148,7 +153,7 @@ func (flow *handleRelayedTransactionsFlow) broadcastAcceptedTransactions(accepte
 //
 // and populates invsQueue with any inv messages that meanwhile arrive.
 func (flow *handleRelayedTransactionsFlow) readMsgTxOrNotFound() (
-	msgTx *domainmessage.MsgTx, msgNotFound *domainmessage.MsgTransactionNotFound, err error) {
+	msgTx *appmessage.MsgTx, msgNotFound *appmessage.MsgTransactionNotFound, err error) {
 
 	for {
 		message, err := flow.incomingRoute.DequeueWithTimeout(common.DefaultTimeout)
@@ -157,11 +162,11 @@ func (flow *handleRelayedTransactionsFlow) readMsgTxOrNotFound() (
 		}
 
 		switch message := message.(type) {
-		case *domainmessage.MsgInvTransaction:
+		case *appmessage.MsgInvTransaction:
 			flow.invsQueue = append(flow.invsQueue, message)
-		case *domainmessage.MsgTx:
+		case *appmessage.MsgTx:
 			return message, nil, nil
-		case *domainmessage.MsgTransactionNotFound:
+		case *appmessage.MsgTransactionNotFound:
 			return nil, message, nil
 		default:
 			return nil, nil, errors.Errorf("unexpected message %s", message.Command())
@@ -187,6 +192,7 @@ func (flow *handleRelayedTransactionsFlow) receiveTransactions(requestedTransact
 			continue
 		}
 		tx := util.NewTx(msgTx)
+		log.Criticalf("~~~~~ receiveTransactions() got %s", tx.ID())
 		if !tx.ID().IsEqual(expectedID) {
 			return protocolerrors.Errorf(true, "expected transaction %s, but got %s",
 				expectedID, tx.ID())

app/protocol/flows/relaytransactions/handle_requested_transactions.go

@@ -1,8 +1,8 @@
 package relaytransactions
 
 import (
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/netadapter/router"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 )
 
 type handleRequestedTransactionsFlow struct {
@@ -10,7 +10,7 @@ type handleRequestedTransactionsFlow struct {
 	incomingRoute, outgoingRoute *router.Route
 }
 
-// HandleRequestedTransactions listens to domainmessage.MsgRequestTransactions messages, responding with the requested
+// HandleRequestedTransactions listens to appmessage.MsgRequestTransactions messages, responding with the requested
 // transactions if those are in the mempool.
 // Missing transactions would be ignored
 func HandleRequestedTransactions(context TransactionsRelayContext, incomingRoute *router.Route, outgoingRoute *router.Route) error {
@@ -30,10 +30,11 @@ func (flow *handleRequestedTransactionsFlow) start() error {
 		}
 
 		for _, transactionID := range msgRequestTransactions.IDs {
+			log.Criticalf("~~~~~ handleRequestedTransactionsFlow.start() tx %s was requested", transactionID)
 			tx, ok := flow.TxPool().FetchTransaction(transactionID)
 
 			if !ok {
-				msgTransactionNotFound := domainmessage.NewMsgTransactionNotFound(transactionID)
+				msgTransactionNotFound := appmessage.NewMsgTransactionNotFound(transactionID)
 				err := flow.outgoingRoute.Enqueue(msgTransactionNotFound)
 				if err != nil {
 					return err
@@ -49,11 +50,11 @@ func (flow *handleRequestedTransactionsFlow) start() error {
 	}
 }
 
-func (flow *handleRequestedTransactionsFlow) readRequestTransactions() (*domainmessage.MsgRequestTransactions, error) {
+func (flow *handleRequestedTransactionsFlow) readRequestTransactions() (*appmessage.MsgRequestTransactions, error) {
 	msg, err := flow.incomingRoute.Dequeue()
 	if err != nil {
 		return nil, err
 	}
 
-	return msg.(*domainmessage.MsgRequestTransactions), nil
+	return msg.(*appmessage.MsgRequestTransactions), nil
 }

app/protocol/flows/relaytransactions/log.go

@@ -0,0 +1,9 @@
+package relaytransactions
+
+import (
+	"github.com/kaspanet/kaspad/infrastructure/logger"
+	"github.com/kaspanet/kaspad/util/panics"
+)
+
+var log, _ = logger.Get(logger.SubsystemTags.PROT)
+var spawn = panics.GoroutineWrapperFunc(log)

app/protocol/manager.go

@@ -3,14 +3,14 @@ package protocol
 import (
 	"fmt"
 
+	"github.com/kaspanet/kaspad/app/protocol/flowcontext"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
 	"github.com/kaspanet/kaspad/domain/blockdag"
 	"github.com/kaspanet/kaspad/domain/mempool"
 	"github.com/kaspanet/kaspad/infrastructure/config"
-	"github.com/kaspanet/kaspad/network/addressmanager"
+	"github.com/kaspanet/kaspad/infrastructure/network/addressmanager"
-	"github.com/kaspanet/kaspad/network/connmanager"
+	"github.com/kaspanet/kaspad/infrastructure/network/connmanager"
-	"github.com/kaspanet/kaspad/network/netadapter"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
-	"github.com/kaspanet/kaspad/network/protocol/flowcontext"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
 	"github.com/kaspanet/kaspad/util"
 )
 

app/protocol/peer/peer.go

@@ -1,13 +1,13 @@
 package peer
 
 import (
-	"github.com/kaspanet/kaspad/network/netadapter"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
 	"sync"
 	"sync/atomic"
 	"time"
 
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/netadapter/id"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter/id"
 	"github.com/kaspanet/kaspad/util/daghash"
 	mathUtil "github.com/kaspanet/kaspad/util/math"
 	"github.com/kaspanet/kaspad/util/mstime"
@@ -22,7 +22,7 @@ type Peer struct {
 	selectedTipHash    *daghash.Hash
 
 	userAgent                string
-	services                 domainmessage.ServiceFlag
+	services                 appmessage.ServiceFlag
 	advertisedProtocolVerion uint32 // protocol version advertised by remote
 	protocolVersion          uint32 // negotiated protocol version
 	disableRelayTx           bool
@@ -109,7 +109,7 @@ func (p *Peer) IsOutbound() bool {
 }
 
 // UpdateFieldsFromMsgVersion updates the peer with the data from the version message.
-func (p *Peer) UpdateFieldsFromMsgVersion(msg *domainmessage.MsgVersion) {
+func (p *Peer) UpdateFieldsFromMsgVersion(msg *appmessage.MsgVersion) {
 	// Negotiate the protocol version.
 	p.advertisedProtocolVerion = msg.ProtocolVersion
 	p.protocolVersion = mathUtil.MinUint32(p.protocolVersion, p.advertisedProtocolVerion)

app/protocol/protocol.go

@@ -1,22 +1,22 @@
 package protocol
 
 import (
-	"github.com/kaspanet/kaspad/network/protocol/flows/rejects"
+	"github.com/kaspanet/kaspad/app/protocol/flows/rejects"
 	"sync/atomic"
 
-	"github.com/kaspanet/kaspad/network/addressmanager"
+	"github.com/kaspanet/kaspad/app/appmessage"
-	"github.com/kaspanet/kaspad/network/domainmessage"
+	"github.com/kaspanet/kaspad/app/protocol/flows/addressexchange"
-	"github.com/kaspanet/kaspad/network/netadapter"
+	"github.com/kaspanet/kaspad/app/protocol/flows/blockrelay"
-	routerpkg "github.com/kaspanet/kaspad/network/netadapter/router"
+	"github.com/kaspanet/kaspad/app/protocol/flows/handshake"
-	"github.com/kaspanet/kaspad/network/protocol/flows/addressexchange"
+	"github.com/kaspanet/kaspad/app/protocol/flows/ibd"
-	"github.com/kaspanet/kaspad/network/protocol/flows/blockrelay"
+	"github.com/kaspanet/kaspad/app/protocol/flows/ibd/selectedtip"
-	"github.com/kaspanet/kaspad/network/protocol/flows/handshake"
+	"github.com/kaspanet/kaspad/app/protocol/flows/ping"
-	"github.com/kaspanet/kaspad/network/protocol/flows/ibd"
+	"github.com/kaspanet/kaspad/app/protocol/flows/relaytransactions"
-	"github.com/kaspanet/kaspad/network/protocol/flows/ibd/selectedtip"
+	peerpkg "github.com/kaspanet/kaspad/app/protocol/peer"
-	"github.com/kaspanet/kaspad/network/protocol/flows/ping"
+	"github.com/kaspanet/kaspad/app/protocol/protocolerrors"
-	"github.com/kaspanet/kaspad/network/protocol/flows/relaytransactions"
+	"github.com/kaspanet/kaspad/infrastructure/network/addressmanager"
-	peerpkg "github.com/kaspanet/kaspad/network/protocol/peer"
+	"github.com/kaspanet/kaspad/infrastructure/network/netadapter"
-	"github.com/kaspanet/kaspad/network/protocol/protocolerrors"
+	routerpkg "github.com/kaspanet/kaspad/infrastructure/network/netadapter/router"
 	"github.com/pkg/errors"
 )
 
@@ -68,6 +68,7 @@ func (m *Manager) routerInitializer(router *routerpkg.Router, netConnection *net
 			m.handleError(err, netConnection, router.OutgoingRoute())
 			return
 		}
+		defer m.context.RemoveFromPeers(peer)
 
 		removeHandshakeRoutes(router)
 
@@ -89,7 +90,7 @@ func (m *Manager) handleError(err error, netConnection *netadapter.NetConnection
 				panic(err)
 			}
 
-			err = outgoingRoute.Enqueue(domainmessage.NewMsgReject(protocolErr.Error()))
+			err = outgoingRoute.Enqueue(appmessage.NewMsgReject(protocolErr.Error()))
 			if err != nil && !errors.Is(err, routerpkg.ErrRouteClosed) {
 				panic(err)
 			}
@@ -123,13 +124,13 @@ func (m *Manager) registerAddressFlows(router *routerpkg.Router, isStopping *uin
 	outgoingRoute := router.OutgoingRoute()
 
 	return []*flow{
-		m.registerOneTimeFlow("SendAddresses", router, []domainmessage.MessageCommand{domainmessage.CmdRequestAddresses}, isStopping, errChan,
+		m.registerOneTimeFlow("SendAddresses", router, []appmessage.MessageCommand{appmessage.CmdRequestAddresses}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return addressexchange.SendAddresses(m.context, incomingRoute, outgoingRoute)
 			},
 		),
 
-		m.registerOneTimeFlow("ReceiveAddresses", router, []domainmessage.MessageCommand{domainmessage.CmdAddresses}, isStopping, errChan,
+		m.registerOneTimeFlow("ReceiveAddresses", router, []appmessage.MessageCommand{appmessage.CmdAddresses}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return addressexchange.ReceiveAddresses(m.context, incomingRoute, outgoingRoute, peer)
 			},
@@ -141,14 +142,14 @@ func (m *Manager) registerBlockRelayFlows(router *routerpkg.Router, isStopping *
 	outgoingRoute := router.OutgoingRoute()
 
 	return []*flow{
-		m.registerFlow("HandleRelayInvs", router, []domainmessage.MessageCommand{domainmessage.CmdInvRelayBlock, domainmessage.CmdBlock}, isStopping, errChan,
+		m.registerFlow("HandleRelayInvs", router, []appmessage.MessageCommand{appmessage.CmdInvRelayBlock, appmessage.CmdBlock}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return blockrelay.HandleRelayInvs(m.context, incomingRoute,
 					outgoingRoute, peer)
 			},
 		),
 
-		m.registerFlow("HandleRelayBlockRequests", router, []domainmessage.MessageCommand{domainmessage.CmdRequestRelayBlocks}, isStopping, errChan,
+		m.registerFlow("HandleRelayBlockRequests", router, []appmessage.MessageCommand{appmessage.CmdRequestRelayBlocks}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return blockrelay.HandleRelayBlockRequests(m.context, incomingRoute, outgoingRoute, peer)
 			},
@@ -160,13 +161,13 @@ func (m *Manager) registerPingFlows(router *routerpkg.Router, isStopping *uint32
 	outgoingRoute := router.OutgoingRoute()
 
 	return []*flow{
-		m.registerFlow("ReceivePings", router, []domainmessage.MessageCommand{domainmessage.CmdPing}, isStopping, errChan,
+		m.registerFlow("ReceivePings", router, []appmessage.MessageCommand{appmessage.CmdPing}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return ping.ReceivePings(m.context, incomingRoute, outgoingRoute)
 			},
 		),
 
-		m.registerFlow("SendPings", router, []domainmessage.MessageCommand{domainmessage.CmdPong}, isStopping, errChan,
+		m.registerFlow("SendPings", router, []appmessage.MessageCommand{appmessage.CmdPong}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return ping.SendPings(m.context, incomingRoute, outgoingRoute, peer)
 			},
@@ -178,32 +179,32 @@ func (m *Manager) registerIBDFlows(router *routerpkg.Router, isStopping *uint32,
 	outgoingRoute := router.OutgoingRoute()
 
 	return []*flow{
-		m.registerFlow("HandleIBD", router, []domainmessage.MessageCommand{domainmessage.CmdBlockLocator, domainmessage.CmdIBDBlock,
+		m.registerFlow("HandleIBD", router, []appmessage.MessageCommand{appmessage.CmdBlockLocator, appmessage.CmdIBDBlock,
-			domainmessage.CmdDoneIBDBlocks}, isStopping, errChan,
+			appmessage.CmdDoneIBDBlocks}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return ibd.HandleIBD(m.context, incomingRoute, outgoingRoute, peer)
 			},
 		),
 
-		m.registerFlow("RequestSelectedTip", router, []domainmessage.MessageCommand{domainmessage.CmdSelectedTip}, isStopping, errChan,
+		m.registerFlow("RequestSelectedTip", router, []appmessage.MessageCommand{appmessage.CmdSelectedTip}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return selectedtip.RequestSelectedTip(m.context, incomingRoute, outgoingRoute, peer)
 			},
 		),
 
-		m.registerFlow("HandleRequestSelectedTip", router, []domainmessage.MessageCommand{domainmessage.CmdRequestSelectedTip}, isStopping, errChan,
+		m.registerFlow("HandleRequestSelectedTip", router, []appmessage.MessageCommand{appmessage.CmdRequestSelectedTip}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return selectedtip.HandleRequestSelectedTip(m.context, incomingRoute, outgoingRoute)
 			},
 		),
 
-		m.registerFlow("HandleRequestBlockLocator", router, []domainmessage.MessageCommand{domainmessage.CmdRequestBlockLocator}, isStopping, errChan,
+		m.registerFlow("HandleRequestBlockLocator", router, []appmessage.MessageCommand{appmessage.CmdRequestBlockLocator}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return ibd.HandleRequestBlockLocator(m.context, incomingRoute, outgoingRoute)
 			},
 		),
 
-		m.registerFlow("HandleRequestIBDBlocks", router, []domainmessage.MessageCommand{domainmessage.CmdRequestIBDBlocks, domainmessage.CmdRequestNextIBDBlocks}, isStopping, errChan,
+		m.registerFlow("HandleRequestIBDBlocks", router, []appmessage.MessageCommand{appmessage.CmdRequestIBDBlocks, appmessage.CmdRequestNextIBDBlocks}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return ibd.HandleRequestIBDBlocks(m.context, incomingRoute, outgoingRoute)
 			},
@@ -216,13 +217,13 @@ func (m *Manager) registerTransactionRelayFlow(router *routerpkg.Router, isStopp
 
 	return []*flow{
 		m.registerFlow("HandleRelayedTransactions", router,
-			[]domainmessage.MessageCommand{domainmessage.CmdInvTransaction, domainmessage.CmdTx, domainmessage.CmdTransactionNotFound}, isStopping, errChan,
+			[]appmessage.MessageCommand{appmessage.CmdInvTransaction, appmessage.CmdTx, appmessage.CmdTransactionNotFound}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return relaytransactions.HandleRelayedTransactions(m.context, incomingRoute, outgoingRoute)
 			},
 		),
 		m.registerFlow("HandleRequestTransactions", router,
-			[]domainmessage.MessageCommand{domainmessage.CmdRequestTransactions}, isStopping, errChan,
+			[]appmessage.MessageCommand{appmessage.CmdRequestTransactions}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return relaytransactions.HandleRequestedTransactions(m.context, incomingRoute, outgoingRoute)
 			},
@@ -235,7 +236,7 @@ func (m *Manager) registerRejectsFlow(router *routerpkg.Router, isStopping *uint
 
 	return []*flow{
 		m.registerFlow("HandleRejects", router,
-			[]domainmessage.MessageCommand{domainmessage.CmdReject}, isStopping, errChan,
+			[]appmessage.MessageCommand{appmessage.CmdReject}, isStopping, errChan,
 			func(incomingRoute *routerpkg.Route, peer *peerpkg.Peer) error {
 				return rejects.HandleRejects(m.context, incomingRoute, outgoingRoute)
 			},
@@ -243,7 +244,7 @@ func (m *Manager) registerRejectsFlow(router *routerpkg.Router, isStopping *uint
 	}
 }
 
-func (m *Manager) registerFlow(name string, router *routerpkg.Router, messageTypes []domainmessage.MessageCommand, isStopping *uint32,
+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)
@@ -263,7 +264,7 @@ func (m *Manager) registerFlow(name string, router *routerpkg.Router, messageTyp
 	}
 }
 
-func (m *Manager) registerOneTimeFlow(name string, router *routerpkg.Router, messageTypes []domainmessage.MessageCommand,
+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)
@@ -292,12 +293,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([]domainmessage.MessageCommand{domainmessage.CmdVersion})
+	receiveVersionRoute, err := router.AddIncomingRoute([]appmessage.MessageCommand{appmessage.CmdVersion})
 	if err != nil {
 		panic(err)
 	}
 
-	sendVersionRoute, err = router.AddIncomingRoute([]domainmessage.MessageCommand{domainmessage.CmdVerAck})
+	sendVersionRoute, err = router.AddIncomingRoute([]appmessage.MessageCommand{appmessage.CmdVerAck})
 	if err != nil {
 		panic(err)
 	}
@@ -306,7 +307,7 @@ func registerHandshakeRoutes(router *routerpkg.Router) (
 }
 
 func removeHandshakeRoutes(router *routerpkg.Router) {
-	err := router.RemoveRoute([]domainmessage.MessageCommand{domainmessage.CmdVersion, domainmessage.CmdVerAck})
+	err := router.RemoveRoute([]appmessage.MessageCommand{appmessage.CmdVersion, appmessage.CmdVerAck})
 	if err != nil {
 		panic(err)
 	}

cmd/addblock/addblock.go

@@ -5,11 +5,11 @@
 package main
 
 import (
+	"github.com/kaspanet/kaspad/infrastructure/logger"
 	"os"
 	"runtime"
 
-	"github.com/kaspanet/kaspad/infrastructure/limits"
+	"github.com/kaspanet/kaspad/infrastructure/os/limits"
-	"github.com/kaspanet/kaspad/infrastructure/logs"
 	"github.com/kaspanet/kaspad/util/panics"
 )
 
@@ -20,7 +20,7 @@ const (
 
 var (
 	cfg   *ConfigFlags
-	log   *logs.Logger
+	log   *logger.Logger
 	spawn func(string, func())
 )
 
@@ -35,7 +35,7 @@ func realMain() error {
 	cfg = tcfg
 
 	// Setup logging.
-	backendLogger := logs.NewBackend()
+	backendLogger := logger.NewBackend()
 	defer os.Stdout.Sync()
 	log = backendLogger.Logger("MAIN")
 	spawn = panics.GoroutineWrapperFunc(log)

cmd/addblock/import.go

@@ -13,8 +13,8 @@ import (
 	"sync"
 	"time"
 
+	"github.com/kaspanet/kaspad/app/appmessage"
 	"github.com/kaspanet/kaspad/domain/blockdag"
-	"github.com/kaspanet/kaspad/network/domainmessage"
 	"github.com/kaspanet/kaspad/util"
 )
 
@@ -68,10 +68,10 @@ func (bi *blockImporter) readBlock() ([]byte, error) {
 	if err := binary.Read(bi.r, binary.LittleEndian, &blockLen); err != nil {
 		return nil, err
 	}
-	if blockLen > domainmessage.MaxMessagePayload {
+	if blockLen > appmessage.MaxMessagePayload {
 		return nil, errors.Errorf("block payload of %d bytes is larger "+
 			"than the max allowed %d bytes", blockLen,
-			domainmessage.MaxMessagePayload)
+			appmessage.MaxMessagePayload)
 	}
 
 	serializedBlock := make([]byte, blockLen)