Merge branch 'main' into kaspa_12.6

go.mod

@@ -3,13 +3,8 @@ module github.com/onemorebsmith/kaspastratum
 go 1.18
 
 require (
-<<<<<<< HEAD
 	github.com/google/go-cmp v0.5.5
 	github.com/kaspanet/kaspad v0.12.6
-=======
-	github.com/google/go-cmp v0.5.6
-	github.com/kaspanet/kaspad v0.12.5
->>>>>>> 9eccc0b67f7eba18a069c9edfab69b9df5bd3cc0
 	github.com/pkg/errors v0.9.1
 	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
 	gopkg.in/yaml.v2 v2.4.0
@@ -23,7 +18,6 @@ require (
 	github.com/golang/snappy v0.0.1 // indirect
 	github.com/jessevdk/go-flags v1.4.0 // indirect
 	github.com/jrick/logrotate v1.0.0 // indirect
-<<<<<<< HEAD
 	github.com/kaspanet/go-muhash v0.0.4 // indirect
 	github.com/kaspanet/go-secp256k1 v0.0.7 // indirect
 	github.com/syndtr/goleveldb v1.0.1-0.20190923125748-758128399b1d // indirect
@@ -32,12 +26,10 @@ require (
 	golang.org/x/text v0.3.5 // indirect
 	google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect
 	google.golang.org/grpc v1.38.0 // indirect
-=======
 	golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
 	golang.org/x/sys v0.0.0-20220906165534-d0df966e6959 // indirect
 	golang.org/x/text v0.3.7 // indirect
 	google.golang.org/genproto v0.0.0-20220902135211-223410557253 // indirect
 	google.golang.org/grpc v1.49.0 // indirect
->>>>>>> 9eccc0b67f7eba18a069c9edfab69b9df5bd3cc0
 	google.golang.org/protobuf v1.28.1 // indirect
 )

go.sum

@@ -52,16 +52,11 @@ github.com/kaspanet/go-secp256k1 v0.0.7 h1:WHnrwopKB6ZeHSbdAwwxNhTqflm56XT1mM6LF
 github.com/kaspanet/go-secp256k1 v0.0.7/go.mod h1:cFbxhxKkxqHX5eIwUGKARkph19PehipDPJejWB+H0jM=
 github.com/kaspanet/kaspad v0.12.4 h1:cczqSWYbgrLmhrZDBK2lOaW4olfc/y4B7n6ScBJRCAc=
 github.com/kaspanet/kaspad v0.12.4/go.mod h1:xmf5rXCh1DNxiUPg2BRVmZiarpP3mH4WzVbJ1LprH6I=
-<<<<<<< HEAD
 github.com/kaspanet/kaspad v0.12.6 h1:sA0kW9+k9cdhwf9yw/GZax/l4DEJonorc9LiphdX6mQ=
 github.com/kaspanet/kaspad v0.12.6/go.mod h1:5fH29a2ZIeET3GDkBqAN9Yk7tOl9mYteNkOlw3F9kMA=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-=======
-github.com/kaspanet/kaspad v0.12.5 h1:9LYbvhF71guz0QH0pkwzlvY2J/fRHslS+FmaYLlHJmU=
-github.com/kaspanet/kaspad v0.12.5/go.mod h1:xmf5rXCh1DNxiUPg2BRVmZiarpP3mH4WzVbJ1LprH6I=
->>>>>>> 9eccc0b67f7eba18a069c9edfab69b9df5bd3cc0
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=