diff --git a/go.mod b/go.mod index 4e81b64..9e585a0 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,13 @@ go 1.22 require ( git.gammaspectra.live/P2Pool/edwards25519 v0.0.0-20240405085108-e2f706cb5c00 + git.gammaspectra.live/P2Pool/go-json v0.99.0 git.gammaspectra.live/P2Pool/go-randomx/v2 v2.1.0 git.gammaspectra.live/P2Pool/monero-base58 v1.0.0 git.gammaspectra.live/P2Pool/randomx-go-bindings v1.0.0 git.gammaspectra.live/P2Pool/sha3 v0.17.0 + git.gammaspectra.live/P2Pool/zmq4 v0.99.0 github.com/dolthub/swiss v0.2.2-0.20240312182618-f4b2babd2bc1 - github.com/go-zeromq/zmq4 v0.16.1-0.20240124085909-e75c615ba1b3 - github.com/goccy/go-json v0.10.2 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc golang.org/x/sync v0.7.0 @@ -22,7 +22,3 @@ require ( github.com/dolthub/maphash v0.1.0 // indirect golang.org/x/crypto v0.22.0 // indirect ) - -replace github.com/goccy/go-json => github.com/WeebDataHoarder/go-json v0.0.0-20230730135821-d8f6463bb887 - -replace github.com/go-zeromq/zmq4 => git.gammaspectra.live/P2Pool/zmq4 v0.16.1-0.20240412221749-a35fa84ca9f4 diff --git a/go.sum b/go.sum index 97e0c8f..4dc2e1e 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,7 @@ git.gammaspectra.live/P2Pool/edwards25519 v0.0.0-20240405085108-e2f706cb5c00 h1:mDQY337iKB+kle5RYWL5CoAz+3DmnkAh/B2XD8B+PFk= git.gammaspectra.live/P2Pool/edwards25519 v0.0.0-20240405085108-e2f706cb5c00/go.mod h1:FZsrMWGucMP3SZamzrd7m562geIs5zp1O/9MGoiAKH0= +git.gammaspectra.live/P2Pool/go-json v0.99.0 h1:TbFOEWbbDLFzm1fM/2+WPUhhzSwJ501+otfrQ8jCP84= +git.gammaspectra.live/P2Pool/go-json v0.99.0/go.mod h1:X9PvT0fmWrU1I+BiDUjMypUWdsWFm24QCW1sWxbzT8w= git.gammaspectra.live/P2Pool/go-randomx/v2 v2.1.0 h1:L1fV2XBYFmpFU+JKP/7fsgDm2Lfh9yFlS+800v+3OsM= git.gammaspectra.live/P2Pool/go-randomx/v2 v2.1.0/go.mod h1:vNmHlEIRAcU/bA85mxbUKEiBYtrtS4MVwozf29KmoHM= git.gammaspectra.live/P2Pool/monero-base58 v1.0.0 h1:s8LZxVNc93YEs2NCCNWZ7CKr8RbEb031y6Wkvhn+TS4= @@ -8,10 +10,8 @@ git.gammaspectra.live/P2Pool/randomx-go-bindings v1.0.0 h1:tajr4QFSPrb8NtHmU14Ja git.gammaspectra.live/P2Pool/randomx-go-bindings v1.0.0/go.mod h1:S17NNidG5hxqaVLsSykKqDBg/hTPSzP0KcSwXfH8WIA= git.gammaspectra.live/P2Pool/sha3 v0.17.0 h1:CZpB466LPbNVQrUNjQTtQScGDc30xSMkZ6Bmw0W9VuM= git.gammaspectra.live/P2Pool/sha3 v0.17.0/go.mod h1:HmrrYa97BZTKklUk2n/wAY+wrY0gHhoSGRd2+lIqXq8= -git.gammaspectra.live/P2Pool/zmq4 v0.16.1-0.20240412221749-a35fa84ca9f4 h1:K34kPogf+BpaLkUYQJSM1icWU69TL2ISrmx9u977zvw= -git.gammaspectra.live/P2Pool/zmq4 v0.16.1-0.20240412221749-a35fa84ca9f4/go.mod h1:G/caphb5HAHcnNIIDDgOqJ3HN6r4rnTP14Q621H4rK4= -github.com/WeebDataHoarder/go-json v0.0.0-20230730135821-d8f6463bb887 h1:P01nqSM+0b6zlPasOFYsqnQSP2dTRVZkanAnY9q/Bcc= -github.com/WeebDataHoarder/go-json v0.0.0-20230730135821-d8f6463bb887/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +git.gammaspectra.live/P2Pool/zmq4 v0.99.0 h1:DYjOTqZKurPLn+/OvC8wFE0+cMnw9bp6CQnzwqAbrXA= +git.gammaspectra.live/P2Pool/zmq4 v0.99.0/go.mod h1:VZEQMCQTRVzrvGZl1E225PPKHl9UQ47CEBvrYkqWKZs= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dolthub/maphash v0.1.0 h1:bsQ7JsF4FkkWyrP3oCnFJgrCUAFbFf3kOl4L/QxPDyQ= diff --git a/monero/client/zmq/zmq.go b/monero/client/zmq/zmq.go index 992b905..837847b 100644 --- a/monero/client/zmq/zmq.go +++ b/monero/client/zmq/zmq.go @@ -9,7 +9,7 @@ import ( "slices" "strings" - "github.com/go-zeromq/zmq4" + "git.gammaspectra.live/P2Pool/zmq4" ) type Client struct { diff --git a/p2pool/stratum/stratum.go b/p2pool/stratum/stratum.go index 299a45d..7f8da96 100644 --- a/p2pool/stratum/stratum.go +++ b/p2pool/stratum/stratum.go @@ -14,8 +14,8 @@ import ( p2pooltypes "git.gammaspectra.live/P2Pool/consensus/v3/p2pool/types" "git.gammaspectra.live/P2Pool/consensus/v3/types" "git.gammaspectra.live/P2Pool/consensus/v3/utils" + gojson "git.gammaspectra.live/P2Pool/go-json" "github.com/dolthub/swiss" - gojson "github.com/goccy/go-json" fasthex "github.com/tmthrgd/go-hex" "math" unsafeRandom "math/rand/v2" diff --git a/p2pool/types/protocol.go b/p2pool/types/protocol.go index 5b6d1df..a9698c4 100644 --- a/p2pool/types/protocol.go +++ b/p2pool/types/protocol.go @@ -108,7 +108,7 @@ func (v SoftwareVersion) String() string { const SupportedProtocolVersion = ProtocolVersion_1_2 const CurrentSoftwareVersionMajor = 3 & 0xFFFF -const CurrentSoftwareVersionMinor = 6 & 0xFFFF +const CurrentSoftwareVersionMinor = 7 & 0xFFFF const CurrentSoftwareVersion SoftwareVersion = (CurrentSoftwareVersionMajor << 16) | CurrentSoftwareVersionMinor const CurrentSoftwareId = SoftwareIdGoObserver diff --git a/utils/json.go b/utils/json.go index 47aa9c2..b9d7c74 100644 --- a/utils/json.go +++ b/utils/json.go @@ -1,7 +1,7 @@ package utils import ( - gojson "github.com/goccy/go-json" + gojson "git.gammaspectra.live/P2Pool/go-json" "io" )