More changes yay

Renamed a bunch of stuff to the right Github. Hope it works.

CONTRIBUTING.md

@@ -4,7 +4,11 @@ Any contribution to Zoomyd is very welcome.
 
 ## Getting started
 
+<<<<<<< Updated upstream
 If you want to start contributing to Zoomyd and don't know where to start, you can pick an issue from
+=======
+If you want to start contributing to Kaspad and don't know where to start, you can pick an issue from
+>>>>>>> Stashed changes
 the [list](https://github.com/zoomy-network/zoomyd/issues).
 
 If you want to make a big change it's better to discuss it first by opening an issue or talk about it in

app/appmessage/domainconverters.go

@@ -2,13 +2,21 @@ package appmessage
 
 import (
 	"encoding/hex"
-	"github.com/pkg/errors"
 	"math/big"
 
+<<<<<<< Updated upstream
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
+
+=======
+	"github.com/pkg/errors"
+
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
 
+>>>>>>> Stashed changes
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionid"

app/appmessage/p2p_msgblock_test.go

@@ -5,14 +5,25 @@
 package appmessage
 
 import (
+<<<<<<< Updated upstream
 	"github.com/davecgh/go-spew/spew"
 	"github.com/zoomy-network/zoomyd/util/mstime"
+=======
+>>>>>>> Stashed changes
 	"math"
 	"reflect"
 	"testing"
 
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks"
 
+=======
+	"github.com/davecgh/go-spew/spew"
+	"github.com/zoomy-network/zoomyd/util/mstime"
+
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks"
+
+>>>>>>> Stashed changes
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 )
 

app/appmessage/p2p_msgblockwithtrusteddata.go

@@ -1,8 +1,13 @@
 package appmessage
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+=======
+>>>>>>> Stashed changes
 	"math/big"
+
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 )
 
 // MsgBlockWithTrustedData represents a kaspa BlockWithTrustedData message

app/protocol/common/common.go

@@ -1,10 +1,16 @@
 package common
 
 import (
+<<<<<<< Updated upstream
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"time"
 
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+
 	"github.com/pkg/errors"
 )
 

app/protocol/flowcontext/blocks.go

@@ -3,12 +3,20 @@ package flowcontext
 import (
 	"time"
 
+<<<<<<< Updated upstream
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
 
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 )

app/protocol/flowcontext/network.go

@@ -1,12 +1,20 @@
 package flowcontext
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/connmanager"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/connmanager"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
 )
 
 // NetAdapter returns the net adapter that is associated to the flow context.

app/protocol/flowcontext/orphans.go

@@ -1,12 +1,20 @@
 package flowcontext
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset"
 	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset"
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
 )
 
 // maxOrphans is the maximum amount of orphans allowed in the

app/protocol/flows/handshake/handshake.go

@@ -12,10 +12,16 @@ import (
 	"github.com/zoomy-network/zoomyd/infrastructure/config"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
 
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleHandshakeContext is the interface for the context needed for the HandleHandshake flow.

app/protocol/flows/handshake/receiveversion.go

@@ -1,13 +1,22 @@
 package handshake
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
 	"github.com/zoomy-network/zoomyd/infrastructure/logger"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 var (

app/protocol/flows/handshake/sendversion.go

@@ -1,13 +1,22 @@
 package handshake
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/infrastructure/logger"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 	"github.com/zoomy-network/zoomyd/version"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+	"github.com/zoomy-network/zoomyd/version"
 )
 
 var (

app/protocol/flows/ready/ready.go

@@ -1,6 +1,7 @@
 package ready
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	"sync/atomic"
@@ -8,7 +9,17 @@ import (
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
 	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+	"sync/atomic"
+
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleReady notify the other peer that peer is ready for messages, and wait for the other peer

app/protocol/flows/v5/blockrelay/batch_size_test.go

@@ -1,8 +1,13 @@
 package blockrelay
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"testing"
+
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 func TestIBDBatchSizeLessThanRouteCapacity(t *testing.T) {

app/protocol/flows/v5/blockrelay/handle_ibd_block_requests.go

@@ -1,11 +1,18 @@
 package blockrelay
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
 	"github.com/zoomy-network/zoomyd/domain"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleIBDBlockRequestsContext is the interface for the context needed for the HandleIBDBlockRequests flow.

app/protocol/flows/v5/blockrelay/handle_ibd_request_chain_block_locator.go

@@ -1,13 +1,22 @@
 package blockrelay
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
 	"github.com/zoomy-network/zoomyd/domain"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // RequestIBDChainBlockLocatorContext is the interface for the context needed for the HandleRequestBlockLocator flow.

app/protocol/flows/v5/blockrelay/handle_pruning_point_and_its_anticone_requests.go

@@ -1,6 +1,7 @@
 package blockrelay
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
@@ -8,7 +9,17 @@ import (
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/infrastructure/config"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"sync/atomic"
+
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/infrastructure/config"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // PruningPointAndItsAnticoneRequestsContext is the interface for the context needed for the HandlePruningPointAndItsAnticoneRequests flow.

app/protocol/flows/v5/blockrelay/handle_relay_block_requests.go

@@ -1,12 +1,20 @@
 package blockrelay
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
 	"github.com/zoomy-network/zoomyd/domain"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // RelayBlockRequestsContext is the interface for the context needed for the HandleRelayBlockRequests flow.

app/protocol/flows/v5/blockrelay/handle_relay_invs.go

@@ -1,6 +1,7 @@
 package blockrelay
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
@@ -14,7 +15,22 @@ import (
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset"
 	"github.com/zoomy-network/zoomyd/infrastructure/config"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/hashset"
+	"github.com/zoomy-network/zoomyd/infrastructure/config"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // orphanResolutionRange is the maximum amount of blockLocator hashes

app/protocol/flows/v5/blockrelay/handle_request_anticone.go

@@ -1,6 +1,7 @@
 package blockrelay
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
@@ -8,7 +9,17 @@ import (
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/infrastructure/config"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"sort"
+
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/infrastructure/config"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // RequestAnticoneContext is the interface for the context needed for the HandleRequestHeaders flow.

app/protocol/flows/v5/blockrelay/handle_request_pruning_point_utxo_set.go

@@ -2,6 +2,10 @@ package blockrelay
 
 import (
 	"errors"
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"

app/protocol/flows/v5/blockrelay/ibd.go

@@ -2,6 +2,7 @@ package blockrelay
 
 import (
 	"fmt"
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
@@ -14,7 +15,22 @@ import (
 	"github.com/zoomy-network/zoomyd/infrastructure/logger"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 	"github.com/pkg/errors"
+=======
+>>>>>>> Stashed changes
 	"time"
+
+	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
+	"github.com/zoomy-network/zoomyd/infrastructure/config"
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // IBDContext is the interface for the context needed for the HandleIBD flow.

app/protocol/flows/v5/blockrelay/ibd_with_headers_proof.go

@@ -2,6 +2,7 @@ package blockrelay
 
 import (
 	"fmt"
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
@@ -9,7 +10,17 @@ import (
 	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
 	"github.com/pkg/errors"
+=======
+>>>>>>> Stashed changes
 	"time"
+
+	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
 )
 
 func (flow *handleIBDFlow) ibdWithHeadersProof(

app/protocol/flows/v5/ping/send.go

@@ -1,11 +1,20 @@
 package ping
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
 	"github.com/pkg/errors"
 	"time"
 
+=======
+	"time"
+
+	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
+
+>>>>>>> Stashed changes
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"

app/protocol/flows/v5/testing/common_test.go

@@ -4,8 +4,12 @@ import (
 	"strings"
 	"testing"
 
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
 )
 
 func checkFlowError(t *testing.T, err error, isProtocolError bool, shouldBan bool, contains string) {

app/protocol/flows/v5/testing/receiveaddresses_test.go

@@ -1,10 +1,18 @@
 package testing
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/protocol/flows/v5/addressexchange"
 	"testing"
 	"time"
 
+=======
+	"testing"
+	"time"
+
+	"github.com/zoomy-network/zoomyd/app/protocol/flows/v5/addressexchange"
+
+>>>>>>> Stashed changes
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
 	"github.com/zoomy-network/zoomyd/domain/consensus"

app/protocol/flows/v5/transactionrelay/handle_relayed_transactions.go

@@ -1,6 +1,7 @@
 package transactionrelay
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
@@ -11,7 +12,19 @@ import (
 	"github.com/zoomy-network/zoomyd/domain/miningmanager/mempool"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
+	"github.com/zoomy-network/zoomyd/domain/miningmanager/mempool"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // TransactionsRelayContext is the interface for the context needed for the

app/protocol/flows/v5/transactionrelay/handle_relayed_transactions_test.go

@@ -2,6 +2,7 @@ package transactionrelay_test
 
 import (
 	"errors"
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
 	"github.com/zoomy-network/zoomyd/app/protocol/flows/v5/transactionrelay"
 	"strings"
@@ -16,6 +17,23 @@ import (
 	"github.com/zoomy-network/zoomyd/infrastructure/logger"
 	"github.com/zoomy-network/zoomyd/util/panics"
 
+=======
+	"strings"
+	"testing"
+
+	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
+	"github.com/zoomy-network/zoomyd/app/protocol/flows/v5/transactionrelay"
+
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils"
+	"github.com/zoomy-network/zoomyd/domain/miningmanager/mempool"
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+	"github.com/zoomy-network/zoomyd/util/panics"
+
+>>>>>>> Stashed changes
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/infrastructure/config"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"

app/protocol/flows/v5/transactionrelay/handle_requested_transactions_test.go

@@ -1,6 +1,7 @@
 package transactionrelay_test
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
 	"github.com/zoomy-network/zoomyd/app/protocol/flows/v5/transactionrelay"
 	"testing"
@@ -16,7 +17,25 @@ import (
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 	"github.com/zoomy-network/zoomyd/util/panics"
+=======
+	"testing"
+
+	"github.com/zoomy-network/zoomyd/app/protocol/flowcontext"
+	"github.com/zoomy-network/zoomyd/app/protocol/flows/v5/transactionrelay"
+
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils"
+	"github.com/zoomy-network/zoomyd/domain/miningmanager/mempool"
+	"github.com/zoomy-network/zoomyd/infrastructure/config"
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+	"github.com/zoomy-network/zoomyd/util/panics"
 )
 
 // TestHandleRequestedTransactionsNotFound tests the flow of  HandleRequestedTransactions

app/protocol/protocol.go

@@ -1,6 +1,7 @@
 package protocol
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/protocol/common"
 	"github.com/zoomy-network/zoomyd/app/protocol/flows/ready"
 	"github.com/zoomy-network/zoomyd/app/protocol/flows/v5"
@@ -15,7 +16,24 @@ import (
 	"github.com/zoomy-network/zoomyd/infrastructure/network/connmanager"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
 	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+	"sync"
+	"sync/atomic"
+
+	"github.com/zoomy-network/zoomyd/app/protocol/common"
+	"github.com/zoomy-network/zoomyd/app/protocol/flows/ready"
+	v5 "github.com/zoomy-network/zoomyd/app/protocol/flows/v5"
+
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/flows/handshake"
+	peerpkg "github.com/zoomy-network/zoomyd/app/protocol/peer"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/addressmanager"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/connmanager"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
+	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 func (m *Manager) routerInitializer(router *routerpkg.Router, netConnection *netadapter.NetConnection) {

app/protocol/protocolerrors/protocolerrors.go

@@ -1,8 +1,12 @@
 package protocolerrors
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
 )
 
 // ProtocolError is an error that signifies a violation

app/rpc/manager.go

@@ -1,6 +1,7 @@
 package rpc
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
@@ -12,7 +13,20 @@ import (
 	"github.com/zoomy-network/zoomyd/infrastructure/network/addressmanager"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/connmanager"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/domain"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/utxoindex"
+	"github.com/zoomy-network/zoomyd/infrastructure/config"
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/addressmanager"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/connmanager"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
 )
 
 // Manager is an RPC manager

app/rpc/rpc.go

@@ -1,12 +1,20 @@
 package rpc
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpchandlers"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpchandlers"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 type handler func(context *rpccontext.Context, router *router.Router, request appmessage.Message) (appmessage.Message, error)

app/rpc/rpccontext/notificationmanager.go

@@ -8,10 +8,16 @@ import (
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
 
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/domain/utxoindex"
 	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/domain/utxoindex"
+	routerpkg "github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // NotificationManager manages notifications for the RPC

app/rpc/rpccontext/utxos_by_addresses.go

@@ -2,10 +2,18 @@ package rpccontext
 
 import (
 	"encoding/hex"
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
 	"github.com/zoomy-network/zoomyd/util"
 	"github.com/pkg/errors"
 
+=======
+
+	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
+	"github.com/zoomy-network/zoomyd/util"
+
+>>>>>>> Stashed changes
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/domain/utxoindex"
 )

app/rpc/rpccontext/verbosedata.go

@@ -5,8 +5,12 @@ import (
 	"math"
 	"math/big"
 
+<<<<<<< Updated upstream
 	difficultyPackage "github.com/zoomy-network/zoomyd/util/difficulty"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	difficultyPackage "github.com/zoomy-network/zoomyd/util/difficulty"
 
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/hashes"
 

app/rpc/rpchandlers/ban.go

@@ -1,10 +1,17 @@
 package rpchandlers
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"net"
+
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleBan handles the respectively named RPC command

app/rpc/rpchandlers/get_balance_by_address.go

@@ -1,12 +1,20 @@
 package rpchandlers
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 	"github.com/zoomy-network/zoomyd/util"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+	"github.com/zoomy-network/zoomyd/util"
 )
 
 // HandleGetBalanceByAddress handles the respectively named RPC command

app/rpc/rpchandlers/get_balances_by_addresses.go

@@ -1,10 +1,16 @@
 package rpchandlers
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleGetBalancesByAddresses handles the respectively named RPC command

app/rpc/rpchandlers/get_block.go

@@ -1,11 +1,18 @@
 package rpchandlers
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleGetBlock handles the respectively named RPC command

app/rpc/rpchandlers/submit_block.go

@@ -2,13 +2,23 @@ package rpchandlers
 
 import (
 	"encoding/json"
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
 	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/protocol/protocolerrors"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleSubmitBlock handles the respectively named RPC command

app/rpc/rpchandlers/submit_transaction.go

@@ -1,12 +1,20 @@
 package rpchandlers
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
 	"github.com/zoomy-network/zoomyd/domain/miningmanager/mempool"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
+	"github.com/zoomy-network/zoomyd/domain/miningmanager/mempool"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleSubmitTransaction handles the respectively named RPC command

app/rpc/rpchandlers/unban.go

@@ -1,10 +1,17 @@
 package rpchandlers
 
 import (
+<<<<<<< Updated upstream
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+=======
+>>>>>>> Stashed changes
 	"net"
+
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/app/rpc/rpccontext"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 )
 
 // HandleUnban handles the respectively named RPC command

cmd/genkeypair/main.go

@@ -2,6 +2,10 @@ package main
 
 import (
 	"fmt"
+<<<<<<< Updated upstream
+=======
+
+>>>>>>> Stashed changes
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
 	"github.com/zoomy-network/zoomyd/util"
 )

cmd/zoomyctl/command_parser.go

@@ -8,8 +8,12 @@ import (
 	"google.golang.org/protobuf/encoding/protojson"
 	"google.golang.org/protobuf/proto"
 
+<<<<<<< Updated upstream:cmd/kaspactl/command_parser.go
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire"
+=======
+>>>>>>> Stashed changes:cmd/zoomyctl/command_parser.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire"
 )
 
 func parseCommand(args []string, commandDescs []*commandDescription) (*protowire.ZoomydMessage, error) {

cmd/zoomyctl/config.go

@@ -2,8 +2,12 @@ package main
 
 import (
 	"github.com/jessevdk/go-flags"
+<<<<<<< Updated upstream:cmd/kaspactl/config.go
 	"github.com/zoomy-network/zoomyd/infrastructure/config"
+=======
+>>>>>>> Stashed changes:cmd/zoomyctl/config.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/infrastructure/config"
 )
 
 var (

cmd/zoomyctl/docker/Dockerfile

@@ -14,7 +14,11 @@ RUN go mod download
 
 COPY . .
 
+<<<<<<< Updated upstream:cmd/kaspactl/docker/Dockerfile
 WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/zoomyctl
+=======
+WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/kaspactl
+>>>>>>> Stashed changes:cmd/zoomyctl/docker/Dockerfile
 
 RUN GOOS=linux go build -a -installsuffix cgo -o zoomyctl .
 
@@ -24,7 +28,11 @@ WORKDIR /app
 
 RUN apk add --no-cache ca-certificates tini
 
+<<<<<<< Updated upstream:cmd/kaspactl/docker/Dockerfile
 COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/zoomyctl/zoomyctl /app/
+=======
+COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/kaspactl/kaspactl /app/
+>>>>>>> Stashed changes:cmd/zoomyctl/docker/Dockerfile
 
 USER nobody
 ENTRYPOINT [ "/sbin/tini", "--" ]

cmd/zoomyctl/main.go

@@ -2,10 +2,18 @@ package main
 
 import (
 	"fmt"
+<<<<<<< Updated upstream:cmd/kaspactl/main.go
 	"github.com/zoomy-network/zoomyd/version"
 	"os"
 	"time"
 
+=======
+	"os"
+	"time"
+
+	"github.com/zoomy-network/zoomyd/version"
+
+>>>>>>> Stashed changes:cmd/zoomyctl/main.go
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/server/grpcserver/protowire"
 
 	"github.com/pkg/errors"

cmd/zoomyminer/client.go

@@ -1,11 +1,19 @@
 package main
 
 import (
+<<<<<<< Updated upstream:cmd/kaspaminer/client.go
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/infrastructure/logger"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient"
 	"github.com/pkg/errors"
+=======
+>>>>>>> Stashed changes:cmd/zoomyminer/client.go
 	"time"
+
+	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient"
 )
 
 const minerTimeout = 10 * time.Second

cmd/zoomyminer/config.go

@@ -9,8 +9,12 @@ import (
 
 	"github.com/zoomy-network/zoomyd/infrastructure/config"
 
+<<<<<<< Updated upstream:cmd/kaspaminer/config.go
 	"github.com/zoomy-network/zoomyd/util"
+=======
+>>>>>>> Stashed changes:cmd/zoomyminer/config.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/util"
 
 	"github.com/jessevdk/go-flags"
 	"github.com/zoomy-network/zoomyd/version"

cmd/zoomyminer/docker/Dockerfile

@@ -14,8 +14,13 @@ RUN go mod download
 
 COPY . .
 
+<<<<<<< Updated upstream:cmd/kaspaminer/docker/Dockerfile
 WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/zoomyminer
 RUN GOOS=linux go build -a -installsuffix cgo -o zoomyminer .
+=======
+WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/kaspaminer
+RUN GOOS=linux go build -a -installsuffix cgo -o kaspaminer .
+>>>>>>> Stashed changes:cmd/zoomyminer/docker/Dockerfile
 
 # --- multistage docker build: stage #2: runtime image
 FROM alpine
@@ -23,7 +28,11 @@ WORKDIR /app
 
 RUN apk add --no-cache ca-certificates tini
 
+<<<<<<< Updated upstream:cmd/kaspaminer/docker/Dockerfile
 COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/zoomyminer/zoomyminer /app/
+=======
+COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/kaspaminer/kaspaminer /app/
+>>>>>>> Stashed changes:cmd/zoomyminer/docker/Dockerfile
 
 USER nobody
 ENTRYPOINT [ "/sbin/tini", "--" ]

cmd/zoomyminer/log.go

@@ -2,9 +2,15 @@ package main
 
 import (
 	"fmt"
+<<<<<<< Updated upstream:cmd/kaspaminer/log.go
 	"github.com/zoomy-network/zoomyd/infrastructure/logger"
 	"github.com/zoomy-network/zoomyd/util/panics"
+=======
+>>>>>>> Stashed changes:cmd/zoomyminer/log.go
 	"os"
+
+	"github.com/zoomy-network/zoomyd/infrastructure/logger"
+	"github.com/zoomy-network/zoomyd/util/panics"
 )
 
 var (

cmd/zoomyminer/mineloop.go

@@ -2,11 +2,15 @@ package main
 
 import (
 	nativeerrors "errors"
+<<<<<<< Updated upstream:cmd/kaspaminer/mineloop.go
 	"github.com/zoomy-network/zoomyd/version"
+=======
+>>>>>>> Stashed changes:cmd/zoomyminer/mineloop.go
 	"math/rand"
 	"sync/atomic"
 	"time"
 
+<<<<<<< Updated upstream:cmd/kaspaminer/mineloop.go
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/cmd/zoomyminer/templatemanager"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
@@ -14,7 +18,18 @@ import (
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/pow"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
 	"github.com/zoomy-network/zoomyd/util"
+=======
+	"github.com/zoomy-network/zoomyd/version"
+
+>>>>>>> Stashed changes:cmd/zoomyminer/mineloop.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/cmd/zoomyminer/templatemanager"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/pow"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/netadapter/router"
+	"github.com/zoomy-network/zoomyd/util"
 )
 
 var hashesTried uint64

cmd/zoomyminer/templatemanager/templatemanager.go

@@ -1,10 +1,17 @@
 package templatemanager
 
 import (
+<<<<<<< Updated upstream:cmd/kaspaminer/templatemanager/templatemanager.go
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/pow"
+=======
+>>>>>>> Stashed changes:cmd/zoomyminer/templatemanager/templatemanager.go
 	"sync"
+
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/pow"
 )
 
 var currentTemplate *externalapi.DomainBlock

cmd/zoomywallet/broadcast.go

@@ -6,9 +6,14 @@ import (
 	"io/ioutil"
 	"strings"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/broadcast.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/broadcast.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
 )
 
 func broadcast(conf *broadcastConfig) error {

cmd/zoomywallet/config.go

@@ -3,8 +3,12 @@ package main
 import (
 	"os"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/config.go
 	"github.com/zoomy-network/zoomyd/infrastructure/config"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/config.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/infrastructure/config"
 
 	"github.com/jessevdk/go-flags"
 )

cmd/zoomywallet/create.go

@@ -5,10 +5,16 @@ import (
 	"fmt"
 	"os"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/create.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/create.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils"
 
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys"
 )

cmd/zoomywallet/daemon/client/client.go

@@ -2,9 +2,14 @@ package client
 
 import (
 	"context"
+<<<<<<< Updated upstream:cmd/kaspawallet/daemon/client/client.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/server"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/daemon/client/client.go
 	"time"
 
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/server"
+
 	"github.com/pkg/errors"
 
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"

cmd/zoomywallet/daemon/pb/kaspawalletd.proto

@@ -1,7 +1,11 @@
 syntax = "proto3";
 
 option go_package = "github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb";
+<<<<<<< Updated upstream:cmd/kaspawallet/daemon/pb/kaspawalletd.proto
 package zoomywalletd;
+=======
+package kaspawalletd;
+>>>>>>> Stashed changes:cmd/zoomywallet/daemon/pb/kaspawalletd.proto
 
 service zoomywalletd {
   rpc GetBalance (GetBalanceRequest) returns (GetBalanceResponse) {}

cmd/zoomywallet/daemon/server/address.go

@@ -4,10 +4,16 @@ import (
 	"context"
 	"fmt"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/address.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
 	"github.com/zoomy-network/zoomyd/util"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/address.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
+	"github.com/zoomy-network/zoomyd/util"
 )
 
 func (s *server) changeAddress(useExisting bool, fromAddresses []*walletAddress) (util.Address, *walletAddress, error) {

cmd/zoomywallet/daemon/server/broadcast.go

@@ -2,6 +2,7 @@ package server
 
 import (
 	"context"
+<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/broadcast.go
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
@@ -9,7 +10,17 @@ import (
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient"
 	"github.com/pkg/errors"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/broadcast.go
 	"time"
+
+	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization"
+	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient"
 )
 
 func (s *server) Broadcast(_ context.Context, request *pb.BroadcastRequest) (*pb.BroadcastResponse, error) {

cmd/zoomywallet/daemon/server/create_unsigned_transaction.go

@@ -5,11 +5,18 @@ import (
 	"fmt"
 	"time"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/create_unsigned_transaction.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
 	"github.com/zoomy-network/zoomyd/util"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/create_unsigned_transaction.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
+	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
+	"github.com/zoomy-network/zoomyd/util"
 	"golang.org/x/exp/slices"
 )
 

cmd/zoomywallet/daemon/server/server.go

@@ -13,13 +13,22 @@ import (
 
 	"github.com/zoomy-network/zoomyd/util/profiling"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/server.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys"
 	"github.com/zoomy-network/zoomyd/domain/dagconfig"
 	"github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient"
 	"github.com/zoomy-network/zoomyd/infrastructure/os/signal"
 	"github.com/zoomy-network/zoomyd/util/panics"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/server.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys"
+	"github.com/zoomy-network/zoomyd/domain/dagconfig"
+	"github.com/zoomy-network/zoomyd/infrastructure/network/rpcclient"
+	"github.com/zoomy-network/zoomyd/infrastructure/os/signal"
+	"github.com/zoomy-network/zoomyd/util/panics"
 
 	"google.golang.org/grpc"
 )

cmd/zoomywallet/daemon/server/shutdown.go

@@ -2,6 +2,10 @@ package server
 
 import (
 	"context"
+<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/shutdown.go
+=======
+
+>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/shutdown.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
 )
 

cmd/zoomywallet/daemon/server/sync.go

@@ -7,8 +7,12 @@ import (
 
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/daemon/server/sync.go
 	"github.com/zoomy-network/zoomyd/app/appmessage"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/sync.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/app/appmessage"
 )
 
 var keyChains = []uint8{libkaspawallet.ExternalKeychain, libkaspawallet.InternalKeychain}

cmd/zoomywallet/docker/Dockerfile

@@ -14,8 +14,13 @@ RUN go mod download
 
 COPY . .
 
+<<<<<<< Updated upstream:cmd/kaspawallet/docker/Dockerfile
 WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/zoomywallet
 RUN GOOS=linux go build -a -installsuffix cgo -o zoomywallet .
+=======
+WORKDIR /go/src/github.com/zoomy-network/zoomyd/cmd/kaspawallet
+RUN GOOS=linux go build -a -installsuffix cgo -o kaspawallet .
+>>>>>>> Stashed changes:cmd/zoomywallet/docker/Dockerfile
 
 # --- multistage docker build: stage #2: runtime image
 FROM alpine
@@ -23,7 +28,11 @@ WORKDIR /app
 
 RUN apk add --no-cache ca-certificates tini
 
+<<<<<<< Updated upstream:cmd/kaspawallet/docker/Dockerfile
 COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/zoomywallet/zoomywallet /app/
+=======
+COPY --from=build /go/src/github.com/zoomy-network/zoomyd/cmd/kaspawallet/kaspawallet /app/
+>>>>>>> Stashed changes:cmd/zoomywallet/docker/Dockerfile
 
 USER nobody
 ENTRYPOINT [ "/sbin/tini", "--" ]

cmd/zoomywallet/keys/create.go

@@ -7,11 +7,17 @@ import (
 	"fmt"
 	"os"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/keys/create.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils"
 	"github.com/zoomy-network/zoomyd/domain/dagconfig"
+=======
+>>>>>>> Stashed changes:cmd/zoomywallet/keys/create.go
 	"github.com/pkg/errors"
 	"github.com/tyler-smith/go-bip39"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils"
+	"github.com/zoomy-network/zoomyd/domain/dagconfig"
 )
 
 // CreateMnemonics generates `numKeys` number of mnemonics.

cmd/zoomywallet/keys/keys.go

@@ -6,17 +6,25 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"github.com/gofrs/flock"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 
+<<<<<<< Updated upstream:cmd/kaspawallet/keys/keys.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils"
 
 	"github.com/zoomy-network/zoomyd/domain/dagconfig"
 	"github.com/zoomy-network/zoomyd/util"
+=======
+	"github.com/gofrs/flock"
+
+	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/utils"
+
+>>>>>>> Stashed changes:cmd/zoomywallet/keys/keys.go
 	"github.com/pkg/errors"
+	"github.com/zoomy-network/zoomyd/domain/dagconfig"
+	"github.com/zoomy-network/zoomyd/util"
 	"golang.org/x/crypto/argon2"
 	"golang.org/x/crypto/chacha20poly1305"
 )