diff --git a/packaging/build-inputs.json b/packaging/build-inputs.json index 00a9419c8..45332c00b 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.15.0", "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": { @@ -39,7 +39,7 @@ "openwrt_sdk": { "image": "openwrt/sdk", "go_per_release": { - "_comment": "Official Go toolchain of each OpenWrt release line, as shipped by that line's openwrt/packages feed (branch openwrt-). scripts/sdk-go-version.sh check|update audits these against the live feed; the pinned .go.version must match the entry of the pinned .release's series. In-SDK Go builds on 23.05/24.10 additionally require the tree's language minimum (generated into packaging/build-contract.json, go.minimum — 1.26.0 today) to be <= these versions, so only 25.x qualifies.", + "_comment": "Official Go toolchain of each OpenWrt release line, as shipped by that line's openwrt/packages feed (branch openwrt-). scripts/sdk-go-version.sh check|update audits these against the live feed; the pinned .go.version must match the entry of the pinned .release's series. In-SDK Go builds on 23.05/24.10 additionally require the tree's language minimum (generated into packaging/build-contract.json, go.minimum \u2014 1.26.0 today) to be <= these versions, so only 25.x qualifies.", "23.05": "1.21.13", "24.10": "1.23.12", "25.12": "1.26.10" diff --git a/scripts/token-recovery/go.mod b/scripts/token-recovery/go.mod index 4cf682927..b07f9dcf5 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.15.0 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..ad030a95f 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.15.0 h1:ghczSK/qOd0bOj5YBFiPCYw38sRgx09sufWPeb1IGrk= +github.com/OpenTollGate/gonuts-tollgate v0.15.0/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..a904027f9 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.15.0 // 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..885324d1d 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.15.0 h1:ghczSK/qOd0bOj5YBFiPCYw38sRgx09sufWPeb1IGrk= +github.com/OpenTollGate/gonuts-tollgate v0.15.0/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/cmd/tollgate-ndsctl/tollgate-ndsctl b/src/cmd/tollgate-ndsctl/tollgate-ndsctl new file mode 100755 index 000000000..1c94152fe Binary files /dev/null and b/src/cmd/tollgate-ndsctl/tollgate-ndsctl differ diff --git a/src/go.mod b/src/go.mod index 64ec4339c..115fd0c8b 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.15.0 // 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..49894c9ba 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.15.0 h1:ghczSK/qOd0bOj5YBFiPCYw38sRgx09sufWPeb1IGrk= +github.com/OpenTollGate/gonuts-tollgate v0.15.0/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..de360c550 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.15.0 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..885324d1d 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.15.0 h1:ghczSK/qOd0bOj5YBFiPCYw38sRgx09sufWPeb1IGrk= +github.com/OpenTollGate/gonuts-tollgate v0.15.0/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.mod b/src/tollwallet/go.mod index efd34fac6..d865399d8 100644 --- a/src/tollwallet/go.mod +++ b/src/tollwallet/go.mod @@ -3,7 +3,7 @@ module github.com/OpenTollGate/tollgate-module-basic-go/src/tollwallet go 1.26.0 require ( - github.com/OpenTollGate/gonuts-tollgate v0.14.1 + github.com/OpenTollGate/gonuts-tollgate v0.15.0 github.com/OpenTollGate/tollgate-module-basic-go/src/lightning v0.0.0-00010101000000-000000000000 github.com/stretchr/testify v1.12.1 ) diff --git a/src/tollwallet/go.sum b/src/tollwallet/go.sum index 592032160..85b84116e 100644 --- a/src/tollwallet/go.sum +++ b/src/tollwallet/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.15.0 h1:ghczSK/qOd0bOj5YBFiPCYw38sRgx09sufWPeb1IGrk= +github.com/OpenTollGate/gonuts-tollgate v0.15.0/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=