Kowabonga it is

Gotta get it into Linux I think.

CONTRIBUTING.md

@@ -4,11 +4,7 @@ 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/protocol/flows/v5/blockrelay/ibd.go

@@ -2,21 +2,6 @@ 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"
-	"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"
-	"github.com/pkg/errors"
-=======
->>>>>>> Stashed changes
 	"time"
 
 	"github.com/pkg/errors"

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

@@ -2,16 +2,6 @@ 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"
-	"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/pkg/errors"
-=======
->>>>>>> Stashed changes
 	"time"
 
 	"github.com/pkg/errors"

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

@@ -1,20 +1,12 @@
 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,10 +4,6 @@ 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"
 )

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

@@ -1,18 +1,11 @@
 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,19 +1,6 @@
 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"
-	"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"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol/common"

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

@@ -2,22 +2,6 @@ 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"
-	"testing"
-
-	"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"
-
-=======
 	"strings"
 	"testing"
 
@@ -33,7 +17,6 @@ import (
 	"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,29 +1,11 @@
 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"
-
-	"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"
-=======
 	"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"

app/protocol/protocol.go

@@ -1,22 +1,6 @@
 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"
-	"sync"
-	"sync/atomic"
-
-	"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"
-=======
 	"sync"
 	"sync/atomic"
 
@@ -24,7 +8,6 @@ import (
 	"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"

app/protocol/protocolerrors/protocolerrors.go

@@ -1,10 +1,6 @@
 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"
 )

app/rpc/manager.go

@@ -1,20 +1,6 @@
 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"
-	"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"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/app/appmessage"
 	"github.com/zoomy-network/zoomyd/app/protocol"

app/rpc/rpc.go

@@ -1,14 +1,6 @@
 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"

app/rpc/rpccontext/notificationmanager.go

@@ -8,12 +8,6 @@ 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"

app/rpc/rpccontext/utxos_by_addresses.go

@@ -2,18 +2,11 @@ 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,10 +5,6 @@ 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"
 

app/rpc/rpchandlers/ban.go

@@ -1,12 +1,6 @@
 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"

app/rpc/rpchandlers/get_balance_by_address.go

@@ -1,14 +1,6 @@
 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"

app/rpc/rpchandlers/get_balances_by_addresses.go

@@ -1,12 +1,6 @@
 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"

app/rpc/rpchandlers/get_block.go

@@ -1,13 +1,6 @@
 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"

app/rpc/rpchandlers/submit_block.go

@@ -2,16 +2,6 @@ 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"

app/rpc/rpchandlers/submit_transaction.go

@@ -1,14 +1,6 @@
 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"

app/rpc/rpchandlers/unban.go

@@ -1,12 +1,6 @@
 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"

cmd/genkeypair/main.go

@@ -2,10 +2,6 @@ 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,10 +8,6 @@ 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"
 )

cmd/zoomyctl/config.go

@@ -2,10 +2,6 @@ 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"
 )

cmd/zoomyctl/docker/Dockerfile

@@ -14,11 +14,7 @@ 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 .
 
@@ -28,11 +24,7 @@ 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,18 +2,11 @@ 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,13 +1,6 @@
 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"

cmd/zoomyminer/config.go

@@ -9,10 +9,6 @@ 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"
 

cmd/zoomyminer/docker/Dockerfile

@@ -14,13 +14,8 @@ 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
@@ -28,11 +23,7 @@ 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,11 +2,6 @@ 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"

cmd/zoomyminer/mineloop.go

@@ -2,26 +2,12 @@ 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"
-	"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"
-=======
 	"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"

cmd/zoomyminer/templatemanager/templatemanager.go

@@ -1,12 +1,6 @@
 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"

cmd/zoomywallet/broadcast.go

@@ -6,11 +6,6 @@ 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"

cmd/zoomywallet/config.go

@@ -3,10 +3,6 @@ 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"
 

cmd/zoomywallet/create.go

@@ -5,12 +5,6 @@ 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"

cmd/zoomywallet/daemon/client/client.go

@@ -2,10 +2,6 @@ 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"

cmd/zoomywallet/daemon/pb/kaspawalletd.proto

@@ -1,11 +1,7 @@
 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,12 +4,6 @@ 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"

cmd/zoomywallet/daemon/server/broadcast.go

@@ -2,16 +2,6 @@ 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"
-	"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"
-	"github.com/pkg/errors"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/daemon/server/broadcast.go
 	"time"
 
 	"github.com/pkg/errors"

cmd/zoomywallet/daemon/server/create_unsigned_transaction.go

@@ -5,13 +5,6 @@ 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"

cmd/zoomywallet/daemon/server/server.go

@@ -13,15 +13,6 @@ 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"

cmd/zoomywallet/daemon/server/shutdown.go

@@ -2,10 +2,6 @@ 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,10 +7,6 @@ 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"
 )

cmd/zoomywallet/docker/Dockerfile

@@ -14,13 +14,8 @@ 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
@@ -28,11 +23,7 @@ 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,12 +7,6 @@ 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"

cmd/zoomywallet/keys/keys.go

@@ -11,17 +11,10 @@ import (
 	"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"

cmd/zoomywallet/libkaspawallet/bip32/serialization.go

@@ -4,10 +4,6 @@ import (
 	"encoding/binary"
 
 	"github.com/kaspanet/go-secp256k1"
-<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/bip32/serialization.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32/base58"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/bip32/serialization.go
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32/base58"
 )

cmd/zoomywallet/libkaspawallet/bip39.go

@@ -3,11 +3,6 @@ package libkaspawallet
 import (
 	"fmt"
 
-<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/bip39.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
-	"github.com/zoomy-network/zoomyd/domain/dagconfig"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/bip39.go
 	"github.com/pkg/errors"
 	"github.com/tyler-smith/go-bip39"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"

cmd/zoomywallet/libkaspawallet/keypair.go

@@ -6,12 +6,6 @@ import (
 	"strings"
 
 	"github.com/kaspanet/go-secp256k1"
-<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/keypair.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
-	"github.com/zoomy-network/zoomyd/domain/dagconfig"
-	"github.com/zoomy-network/zoomyd/util"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/keypair.go
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
 	"github.com/zoomy-network/zoomyd/domain/dagconfig"

cmd/zoomywallet/libkaspawallet/serialization/serialization.go

@@ -3,12 +3,6 @@ package serialization
 import (
 	"math"
 
-<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/serialization/serialization.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization/protoserialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/serialization/serialization.go
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization/protoserialization"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

cmd/zoomywallet/libkaspawallet/sign.go

@@ -1,16 +1,6 @@
 package libkaspawallet
 
 import (
-<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/sign.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization"
-	"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/txscript"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
-	"github.com/zoomy-network/zoomyd/domain/dagconfig"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/sign.go
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization"

cmd/zoomywallet/libkaspawallet/transaction.go

@@ -1,16 +1,6 @@
 package libkaspawallet
 
 import (
-<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/transaction.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
-	"github.com/zoomy-network/zoomyd/util"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/transaction.go
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/bip32"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization"

cmd/zoomywallet/libkaspawallet/transaction_test.go

@@ -2,18 +2,11 @@ package libkaspawallet_test
 
 import (
 	"fmt"
-<<<<<<< Updated upstream:cmd/kaspawallet/libkaspawallet/transaction_test.go
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
-	"strings"
-	"testing"
-
-=======
 	"strings"
 	"testing"
 
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
 
->>>>>>> Stashed changes:cmd/zoomywallet/libkaspawallet/transaction_test.go
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
 	"github.com/zoomy-network/zoomyd/domain/consensus"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

cmd/zoomywallet/new_address.go

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

cmd/zoomywallet/parse.go

@@ -3,14 +3,6 @@ package main
 import (
 	"encoding/hex"
 	"fmt"
-<<<<<<< Updated upstream:cmd/kaspawallet/parse.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet/serialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
-	"github.com/pkg/errors"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/parse.go
 	"io/ioutil"
 	"strings"
 

cmd/zoomywallet/send.go

@@ -6,14 +6,6 @@ import (
 	"os"
 	"strings"
 
-<<<<<<< Updated upstream:cmd/kaspawallet/send.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client"
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys"
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/send.go
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"

cmd/zoomywallet/show_addresses.go

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

cmd/zoomywallet/sign.go

@@ -6,11 +6,6 @@ import (
 	"os"
 	"strings"
 
-<<<<<<< Updated upstream:cmd/kaspawallet/sign.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys"
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/sign.go
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/keys"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/libkaspawallet"

cmd/zoomywallet/sweep.go

@@ -6,24 +6,6 @@ import (
 	"fmt"
 
 	"github.com/kaspanet/go-secp256k1"
-<<<<<<< Updated upstream:cmd/kaspawallet/sweep.go
-	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client"
-	"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/cmd/zoomywallet/utils"
-	"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/constants"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
-	"github.com/zoomy-network/zoomyd/domain/dagconfig"
-	"github.com/zoomy-network/zoomyd/domain/miningmanager/mempool"
-	"github.com/zoomy-network/zoomyd/util"
-	"github.com/zoomy-network/zoomyd/util/txmass"
-=======
->>>>>>> Stashed changes:cmd/zoomywallet/sweep.go
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/client"
 	"github.com/zoomy-network/zoomyd/cmd/zoomywallet/daemon/pb"

docker/Dockerfile

@@ -24,13 +24,8 @@ WORKDIR /app
 
 RUN apk add --no-cache ca-certificates tini
 
-<<<<<<< Updated upstream
-COPY --from=build /go/src/github.com/zoomy-network/zoomyd/zoomyd /app/
-COPY --from=build /go/src/github.com/zoomy-network/zoomyd/infrastructure/config/sample-zoomyd.conf /app/
-=======
 COPY --from=build /go/src/github.com/zoomy-network/zoomyd/kaspad /app/
 COPY --from=build /go/src/github.com/zoomy-network/zoomyd/infrastructure/config/sample-kaspad.conf /app/
->>>>>>> Stashed changes
 
 USER nobody
 ENTRYPOINT [ "/sbin/tini", "--" ]

domain/consensus/consensus.go

@@ -6,15 +6,6 @@ import (
 
 	"github.com/zoomy-network/zoomyd/util/mstime"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/database"
-	"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/infrastructure/logger"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/consensus_test.go

@@ -3,14 +3,6 @@ package consensus_test
 import (
 	"testing"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus"
-	"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/testutils"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/database/binaryserialization/hash.go

@@ -1,10 +1,6 @@
 package binaryserialization
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 )

domain/consensus/database/cursor.go

@@ -1,11 +1,6 @@
 package database
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/infrastructure/db/database"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/infrastructure/db/database"

domain/consensus/database/serialization/block_ghostdag_data.go

@@ -1,10 +1,6 @@
 package serialization
 
 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"

domain/consensus/database/serialization/blockheader.go

@@ -1,12 +1,6 @@
 package serialization
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader"
-	"github.com/pkg/errors"
-=======
->>>>>>> Stashed changes
 	"math"
 	"math/big"
 

domain/consensus/database/serialization/blues_anticone_sizes.go

@@ -1,10 +1,6 @@
 package serialization
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 )

domain/consensus/database/serialization/blues_anticone_sizes_test.go

@@ -1,10 +1,6 @@
 package serialization
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-=======
->>>>>>> Stashed changes
 	"testing"
 
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/database/serialization/transaction.go

@@ -3,10 +3,6 @@ package serialization
 import (
 	"math"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
 )

domain/consensus/database/serialization/utxo_entry.go

@@ -1,12 +1,6 @@
 package serialization
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
-	"github.com/pkg/errors"
-=======
->>>>>>> Stashed changes
 	"math"
 
 	"github.com/pkg/errors"

domain/consensus/datastructures/blockstore/block_store.go

@@ -2,14 +2,6 @@ package blockstore
 
 import (
 	"github.com/golang/protobuf/proto"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/datastructures/blockwindowheapslicestore/block_window_heap_slice_store.go

@@ -1,14 +1,6 @@
 package blockwindowheapslicestore
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucachehashandwindowsizetoblockghostdagdatahashpairs"
-	"github.com/zoomy-network/zoomyd/infrastructure/db/database"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/datastructures/consensusstatestore/utxo.go

@@ -1,12 +1,6 @@
 package consensusstatestore
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/datastructures/consensusstatestore/virtual_utxo_set.go

@@ -1,11 +1,6 @@
 package consensusstatestore
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/datastructures/daawindowstore/daa_window_store.go

@@ -4,15 +4,6 @@ import (
 	"encoding/binary"
 
 	"github.com/golang/protobuf/proto"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucachehashpairtoblockghostdagdatahashpair"
-	"github.com/zoomy-network/zoomyd/infrastructure/db/database"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/datastructures/headersselectedchainstore/headers_selected_chain_store.go

@@ -2,20 +2,9 @@ package headersselectedchainstore
 
 import (
 	"encoding/binary"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/util/staging"
-
-	"github.com/zoomy-network/zoomyd/domain/consensus/database"
-	"github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucacheuint64tohash"
-=======
 
 	"github.com/zoomy-network/zoomyd/util/staging"
 
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization"

domain/consensus/datastructures/pruningstore/imported_pruning_point.go

@@ -2,12 +2,6 @@ package pruningstore
 
 import (
 	"github.com/golang/protobuf/proto"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/datastructures/pruningstore/pruning_store.go

@@ -4,16 +4,6 @@ import (
 	"encoding/binary"
 
 	"github.com/golang/protobuf/proto"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/database"
-	"github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucacheuint64tohash"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database/binaryserialization"

domain/consensus/datastructures/reachabilitydatastore/reachability_data_store.go

@@ -2,15 +2,6 @@ package reachabilitydatastore
 
 import (
 	"github.com/golang/protobuf/proto"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache"
-	"github.com/zoomy-network/zoomyd/infrastructure/db/database"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/datastructures/utxodiffstore/utxo_diff_store.go

@@ -2,14 +2,6 @@ package utxodiffstore
 
 import (
 	"github.com/golang/protobuf/proto"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/lrucache"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/database/serialization"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/factory.go

@@ -5,17 +5,6 @@ import (
 	"os"
 	"sync"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/datastructures/blockwindowheapslicestore"
-	"github.com/zoomy-network/zoomyd/domain/consensus/datastructures/daawindowstore"
-	"github.com/zoomy-network/zoomyd/domain/consensus/datastructures/mergedepthrootstore"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/processes/blockparentbuilder"
-	parentssanager "github.com/zoomy-network/zoomyd/domain/consensus/processes/parentsmanager"
-	"github.com/zoomy-network/zoomyd/domain/consensus/processes/pruningproofmanager"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/datastructures/blockwindowheapslicestore"
 	"github.com/zoomy-network/zoomyd/domain/consensus/datastructures/daawindowstore"

domain/consensus/finality_test.go

@@ -2,16 +2,6 @@ package consensus_test
 
 import (
 	"fmt"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/testapi"
-	"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/testutils"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/processes/blockbuilder/block_builder.go

@@ -4,11 +4,6 @@ import (
 	"math/big"
 	"sort"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader"

domain/consensus/processes/blockbuilder/test_block_builder.go

@@ -2,17 +2,6 @@ package blockbuilder
 
 import (
 	"encoding/binary"
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/testapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/txscript"
-	"github.com/zoomy-network/zoomyd/infrastructure/logger"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockparentbuilder/blockparentbuilder.go

@@ -1,13 +1,6 @@
 package blockparentbuilder
 
 import (
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"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/hashset"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockprocessor/validate_and_insert_block.go

@@ -4,19 +4,6 @@ import (
 	// we need to embed the utxoset of mainnet genesis here
 	_ "embed"
 	"fmt"
-<<<<<<< Updated upstream
-	"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/multiset"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
-	"github.com/zoomy-network/zoomyd/infrastructure/db/database"
-	"github.com/zoomy-network/zoomyd/infrastructure/logger"
-	"github.com/zoomy-network/zoomyd/util/difficulty"
-	"github.com/zoomy-network/zoomyd/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go

@@ -4,18 +4,6 @@ import (
 	"strings"
 	"testing"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus"
-	"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/blockheader"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point.go

@@ -1,12 +1,6 @@
 package blockprocessor
 
 import (
-<<<<<<< Updated upstream
-	"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"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockprocessor/validate_and_insert_imported_pruning_point_test.go

@@ -9,16 +9,6 @@ import (
 	"testing"
 	"time"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/testapi"
-	"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/testutils"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockprocessor/validate_block.go

@@ -1,14 +1,6 @@
 package blockprocessor
 
 import (
-<<<<<<< Updated upstream
-	"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/util/staging"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockvalidator/block_body_in_context.go

@@ -1,15 +1,6 @@
 package blockvalidator
 
 import (
-<<<<<<< Updated upstream
-	"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/transactionhelper"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/virtual"
-	"github.com/zoomy-network/zoomyd/infrastructure/logger"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockvalidator/block_body_in_context_test.go

@@ -5,15 +5,6 @@ import (
 
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus"
-	"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/constants"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockvalidator/block_body_in_isolation.go

@@ -1,17 +1,6 @@
 package blockvalidator
 
 import (
-<<<<<<< Updated upstream
-	"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/merkle"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/transactionhelper"
-	"github.com/zoomy-network/zoomyd/infrastructure/logger"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go

@@ -8,21 +8,6 @@ import (
 	"runtime"
 	"testing"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/model/testapi"
-	"github.com/zoomy-network/zoomyd/domain/consensus/ruleerrors"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/blockheader"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/consensushashing"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/merkle"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/subnetworks"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/utxo"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"

domain/consensus/processes/blockvalidator/block_header_in_context.go

@@ -2,14 +2,6 @@ package blockvalidator
 
 import (
 	"fmt"
-<<<<<<< Updated upstream
-	"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/infrastructure/logger"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockvalidator/block_header_in_isolation.go

@@ -1,16 +1,6 @@
 package blockvalidator
 
 import (
-<<<<<<< Updated upstream
-	"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/constants"
-	"github.com/zoomy-network/zoomyd/infrastructure/logger"
-	"github.com/zoomy-network/zoomyd/util/mstime"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockvalidator/block_header_in_isolation_test.go

@@ -6,16 +6,6 @@ import (
 	"runtime"
 	"testing"
 
-<<<<<<< Updated upstream
-	"github.com/zoomy-network/zoomyd/domain/consensus"
-	"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/blockheader"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/constants"
-	"github.com/zoomy-network/zoomyd/domain/consensus/utils/testutils"
-	"github.com/zoomy-network/zoomyd/util/mstime"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"

domain/consensus/processes/blockvalidator/header_pruning_point.go

@@ -1,12 +1,6 @@
 package blockvalidator
 
 import (
-<<<<<<< Updated upstream
-	"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"
-=======
->>>>>>> Stashed changes
 	"github.com/pkg/errors"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model"
 	"github.com/zoomy-network/zoomyd/domain/consensus/model/externalapi"