From 7073012ccade555d460f71885b5e347487e9819f Mon Sep 17 00:00:00 2001 From: felixfelix-bot Date: Mon, 2 Nov 2026 23:46:39 +0100 Subject: [PATCH 1/2] =?UTF-8?q?fix(deps):=20one=20gonuts=20pin,=20every=20?= =?UTF-8?q?carrier=20=E2=80=94=20the=20EOF=20fix=20reaches=20them=20all?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #1142 moved only src/tollwallet/go.mod to the ae77396240a2 integration pseudo-version (the gonuts-tollgate#45 isNetworkError(EOF) fix) and left packaging/build-inputs.json at v0.14.1. That is the #791 drift shape, and it is not cosmetic: * tests/contract/check-gonuts-pin.py refuses (1 of 5 carriers); * tests/contract/check-deps-sync.py reports gonuts in 2 versions; * `cd src && go build ./...` fails on main's root module with "updates to go.mod needed" — the module graph no longer resolves, because tollwallet requires the new pseudo-version while the root module still asks for v0.14.1. Bump the manifest and all five carriers to the same pseudo-version and tidy each module's sums, which also drops two stale go.sum fragments: the v0.14.1 pair (superseded) and v0.15.1-0.20261030003228-d6b9e39c686a, a version no go.mod in the tree names. Pseudo-version, not v0.15.0: the fork's newest tag does not carry the fix (isNetworkError in v0.15.0 still has no io.EOF arm), and gonuts-tollgate#45 is still open. This is the AGENTS.md branch pin that must be retired once #45 lands and tags. Verified: check-gonuts-pin.py -> 0 (5 carriers, one pin) gonuts-pin_test.sh -> 7 cases, 0 failed check-deps-sync.py -> gonuts drift gone; the 8 residual entries are byte-identical to the parent commit's pre-existing set cd src && go build ./... -> 0 (was 1 before this commit) go vet ./... -> 0 tollwallet suite, same harness, parent vs this commit: parent 83 pass / 4 fail / 3 skip head 84 pass / 4 fail / 3 skip failure set byte-identical (TestV2Keyset_* pre-existing) --- packaging/build-inputs.json | 2 +- scripts/token-recovery/go.mod | 2 +- scripts/token-recovery/go.sum | 4 ++-- src/cli/go.mod | 2 +- src/cli/go.sum | 4 ++-- src/go.mod | 2 +- src/go.sum | 4 ++-- src/merchant/go.mod | 2 +- src/merchant/go.sum | 4 ++-- src/tollwallet/go.sum | 4 ---- 10 files changed, 13 insertions(+), 17 deletions(-) diff --git a/packaging/build-inputs.json b/packaging/build-inputs.json index 00a9419c8..3d1b1c0dd 100644 --- a/packaging/build-inputs.json +++ b/packaging/build-inputs.json @@ -11,7 +11,7 @@ }, "gonuts": { "repo": "https://github.com/OpenTollGate/gonuts-tollgate", - "version": "v0.14.1", + "version": "v0.14.2-0.20261030003712-ae77396240a2", "comment": "The wallet fork every Go module pins IDENTICALLY. tests/contract/check-gonuts-pin.py enumerates carriers by glob (never a hand list) and fails on any disagreement with this value; scripts/bump-gonuts.sh rewrites manifest and every carrier together. Before a release is cut, release-check verifies this is the fork's latest stable tag. Pseudo-version integration pins are for branches only and must not outlive their tag on main." }, "node": { diff --git a/scripts/token-recovery/go.mod b/scripts/token-recovery/go.mod index 4cf682927..6949c7ff9 100644 --- a/scripts/token-recovery/go.mod +++ b/scripts/token-recovery/go.mod @@ -2,7 +2,7 @@ module token-recovery go 1.26.0 -require github.com/OpenTollGate/gonuts-tollgate v0.14.1 +require github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 require ( github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da // indirect diff --git a/scripts/token-recovery/go.sum b/scripts/token-recovery/go.sum index 23db11288..426d29951 100644 --- a/scripts/token-recovery/go.sum +++ b/scripts/token-recovery/go.sum @@ -6,8 +6,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= -github.com/OpenTollGate/gonuts-tollgate v0.14.1 h1:hLJkL81dMQcz+ZUQkHgbP2MvzxvIVESxTAVSvXiFY08= -github.com/OpenTollGate/gonuts-tollgate v0.14.1/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= +github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 h1:CiaGeFQw97eTMpMa5SyozejJVoBn6ZRSJ5WS7h6LE/o= +github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= diff --git a/src/cli/go.mod b/src/cli/go.mod index 0a8850a83..0cd0e20bc 100644 --- a/src/cli/go.mod +++ b/src/cli/go.mod @@ -13,7 +13,7 @@ require ( require ( github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3 // indirect - github.com/OpenTollGate/gonuts-tollgate v0.14.1 // indirect + github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 // indirect github.com/OpenTollGate/tollgate-module-basic-go/src/lightning v0.0.0-00010101000000-000000000000 // indirect github.com/OpenTollGate/tollgate-module-basic-go/src/tollwallet v0.0.0 // indirect github.com/OpenTollGate/tollgate-module-basic-go/src/utils v0.0.0 // indirect diff --git a/src/cli/go.sum b/src/cli/go.sum index 6c4b2bf1a..0ac6d8f29 100644 --- a/src/cli/go.sum +++ b/src/cli/go.sum @@ -8,8 +8,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= -github.com/OpenTollGate/gonuts-tollgate v0.14.1 h1:hLJkL81dMQcz+ZUQkHgbP2MvzxvIVESxTAVSvXiFY08= -github.com/OpenTollGate/gonuts-tollgate v0.14.1/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= +github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 h1:CiaGeFQw97eTMpMa5SyozejJVoBn6ZRSJ5WS7h6LE/o= +github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= diff --git a/src/go.mod b/src/go.mod index 64ec4339c..027c9d54d 100644 --- a/src/go.mod +++ b/src/go.mod @@ -41,7 +41,7 @@ require ( github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect github.com/ImVexed/fasturl v0.0.0-20230304231329-4e41488060f3 // indirect - github.com/OpenTollGate/gonuts-tollgate v0.14.1 // indirect + github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 // indirect github.com/OpenTollGate/tollgate-module-basic-go/src/lightning v0.0.0-00010101000000-000000000000 // indirect github.com/OpenTollGate/tollgate-module-basic-go/src/tollgate_protocol v0.0.0 // indirect github.com/OpenTollGate/tollgate-module-basic-go/src/tollwallet v0.0.0 // indirect diff --git a/src/go.sum b/src/go.sum index 0d3d00cae..66bbfa633 100644 --- a/src/go.sum +++ b/src/go.sum @@ -12,8 +12,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= -github.com/OpenTollGate/gonuts-tollgate v0.14.1 h1:hLJkL81dMQcz+ZUQkHgbP2MvzxvIVESxTAVSvXiFY08= -github.com/OpenTollGate/gonuts-tollgate v0.14.1/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= +github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 h1:CiaGeFQw97eTMpMa5SyozejJVoBn6ZRSJ5WS7h6LE/o= +github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= diff --git a/src/merchant/go.mod b/src/merchant/go.mod index 5f7c2d9a8..020d6b91a 100644 --- a/src/merchant/go.mod +++ b/src/merchant/go.mod @@ -3,7 +3,7 @@ module github.com/OpenTollGate/tollgate-module-basic-go/src/merchant go 1.26.0 require ( - github.com/OpenTollGate/gonuts-tollgate v0.14.1 + github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 github.com/OpenTollGate/tollgate-module-basic-go/src/config_manager v0.0.0 github.com/OpenTollGate/tollgate-module-basic-go/src/tollwallet v0.0.0 github.com/OpenTollGate/tollgate-module-basic-go/src/utils v0.0.0 diff --git a/src/merchant/go.sum b/src/merchant/go.sum index 6c4b2bf1a..0ac6d8f29 100644 --- a/src/merchant/go.sum +++ b/src/merchant/go.sum @@ -8,8 +8,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= -github.com/OpenTollGate/gonuts-tollgate v0.14.1 h1:hLJkL81dMQcz+ZUQkHgbP2MvzxvIVESxTAVSvXiFY08= -github.com/OpenTollGate/gonuts-tollgate v0.14.1/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= +github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 h1:CiaGeFQw97eTMpMa5SyozejJVoBn6ZRSJ5WS7h6LE/o= +github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= diff --git a/src/tollwallet/go.sum b/src/tollwallet/go.sum index 8126edcad..5ab02992c 100644 --- a/src/tollwallet/go.sum +++ b/src/tollwallet/go.sum @@ -6,12 +6,8 @@ github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERo github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5 h1:TngWCqHvy9oXAN6lEVMRuU21PR1EtLVZJmdB18Gu3Rw= github.com/Nvveen/Gotty v0.0.0-20120604004816-cd527374f1e5/go.mod h1:lmUJ/7eu/Q8D7ML55dXQrVaamCz2vxCfdQBasLZfHKk= -github.com/OpenTollGate/gonuts-tollgate v0.14.1 h1:hLJkL81dMQcz+ZUQkHgbP2MvzxvIVESxTAVSvXiFY08= -github.com/OpenTollGate/gonuts-tollgate v0.14.1/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2 h1:CiaGeFQw97eTMpMa5SyozejJVoBn6ZRSJ5WS7h6LE/o= github.com/OpenTollGate/gonuts-tollgate v0.14.2-0.20261030003712-ae77396240a2/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= -github.com/OpenTollGate/gonuts-tollgate v0.15.1-0.20261030003228-d6b9e39c686a h1:1Bgw2j61hbpCnoTneEEr0B/sdC60b2QxHJ2l9M/uH30= -github.com/OpenTollGate/gonuts-tollgate v0.15.1-0.20261030003228-d6b9e39c686a/go.mod h1:4er8keqQ4yg3Zuz0w1BuXclKSeKOk3SGqsEl4b0oI7M= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da h1:KjTM2ks9d14ZYCvmHS9iAKVt9AyzRSqNU1qabPih5BY= github.com/aead/chacha20 v0.0.0-20180709150244-8b13a72661da/go.mod h1:eHEWzANqSiWQsof+nXEI9bUVUyV6F53Fp89EuCh2EAA= github.com/aead/siphash v1.0.1 h1:FwHfE/T45KPKYuuSAKyyvE+oPWcaQ+CUmFW0bPlM+kg= From d1bff42a96d884f60ef3e71be0e04d3856bb278b Mon Sep 17 00:00:00 2001 From: felixfelix-bot Date: Tue, 3 Nov 2026 06:50:17 +0100 Subject: [PATCH 2/2] docs(changelog): fragment for the gonuts pin alignment A dependency-pin bump is a contract-governed fact change and the repo asks for a fragment whenever it changes operator-visible build inputs (#1175 does the same for its bump). Without one, the change would land with no changelog record of why the pin moved. --- changelog.d/1182-gonuts-pin-all-carriers.fixed.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/1182-gonuts-pin-all-carriers.fixed.md diff --git a/changelog.d/1182-gonuts-pin-all-carriers.fixed.md b/changelog.d/1182-gonuts-pin-all-carriers.fixed.md new file mode 100644 index 000000000..619b338e1 --- /dev/null +++ b/changelog.d/1182-gonuts-pin-all-carriers.fixed.md @@ -0,0 +1 @@ +- **gonuts-tollgate pin aligned across every carrier** — `src/tollwallet` moved the wallet fork to the `io.EOF`-tolerant integration pin while `packaging/build-inputs.json` and the other carriers stayed on `v0.14.1`, so the root module could no longer resolve its own module graph (`cd src && go build ./...` failed with `go: updates to go.mod needed`) and the gonuts pin fence refused the tree. One commit moves the manifest and every carrier together and tidies each module's sums ([#1182](https://github.com/OpenTollGate/tollgate-module-basic-go/pull/1182))