Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make ready for v1.3.25 #1863

Merged
merged 5 commits into from
Aug 26, 2024
+31 −62
Merged

make ready for v1.3.25 #1863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc9e62d
update dmsg and skywire-utilites at v1.3.25
mrpalide Aug 25, 2024
ec74a3c
fix and update dmsghttp-config values
mrpalide Aug 26, 2024
845e06d
update service-config.json values
mrpalide Aug 26, 2024
8822b2d
update v1.3.25 release version on windows installer
mrpalide Aug 26, 2024
2f9fb49
merge develop into
mrpalide Aug 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 13 additions & 19 deletions dmsghttp-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,6 @@
},
"prod": {
"dmsg_servers": [
{
"static": "02a2d4c346dabd165fd555dfdba4a7f4d18786fe7e055e562397cd5102bdd7f8dd",
"server": {
"address": "139.144.183.24:30082"
}
},
{
"static": "02a49bc0aa1b5b78f638e9189be4ed095bac5d6839c828465a8350f80ac07629c0",
"server": {
"address": "139.144.183.24:30081"
}
},
{
"static": "03717576ada5b1744e395c66c2bb11cea73b0e23d0dcd54422139b1a7f12e962c4",
"server": {
"address": "139.144.183.24:30083"
}
},
{
"static": "0371ab4bcff7b121f4b91f6856d6740c6f9dc1fe716977850aeb5d84378b300a13",
"server": {
Expand All @@ -70,9 +52,21 @@
"server": {
"address": "139.162.160.227:30086"
}
},
{
"static": "03d5b55d1133b26485c664cf8b95cff6746d1e321c34e48c9fed293eff0d6d49e5",
"server": {
"address": "170.187.228.44:30083"
}
},
{
"static": "0228af3fd99c8d86a882495c8e0202bdd4da78c69e013065d8634286dd4a0ac098",
"server": {
"address": "170.187.228.178:30084"
}
}
],
"dmsg_discovery": "dmsg://024a7b9b7db1626d46777e5c665333afa57f48934b57652305fc7a2b19dc4c65d4:80",
"dmsg_discovery": "dmsg://022e607e0914d6e7ccda7587f95790c09e126bbd506cc476a1eda852325aadd1aa:80",
"transport_discovery": "dmsg://02b307aee5c8ce1666c63891f8af25ad2f0a47a243914c963942b3ba35b9d095ae:80",
"address_resolver": "dmsg://03234b2ee4128d1f78c180d06911102906c80795dfe41bd6253f2619c8b6252a02:80",
"route_finder": "dmsg://039d89c5eedfda4a28b0c58b0b643eff949f08e4f68c8357278081d26f5a592d74:80",
Expand Down
6 changes: 3 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module github.com/skycoin/skywire

go 1.21

toolchain go1.21.5
toolchain go1.21.12

require (
github.com/AudriusButkevicius/pfilter v0.0.11
Expand Down Expand Up @@ -30,11 +30,11 @@ require (
github.com/pterm/pterm v0.12.66
github.com/robert-nix/ansihtml v1.0.1
github.com/sirupsen/logrus v1.9.3
github.com/skycoin/dmsg v1.3.24
github.com/skycoin/dmsg v1.3.25
github.com/skycoin/skycoin v0.27.1
github.com/skycoin/skycoin-service-discovery v0.0.0-20240627171358-7f59a951fa29
github.com/skycoin/skywire-services v0.0.0-20240627171623-87edf49d9025
github.com/skycoin/skywire-utilities v1.3.18-0.20240825131426-201fde7a3d30
github.com/skycoin/skywire-utilities v1.3.25
github.com/skycoin/systray v1.10.0
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
github.com/spf13/cobra v1.7.0
Expand Down
10 changes: 4 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,8 +682,8 @@ github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrf
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
github.com/skycoin/dmsg v1.3.24 h1:aDa36UucXcWQCnHri1q5UKAVydomGDg28osBWlpUoOI=
github.com/skycoin/dmsg v1.3.24/go.mod h1:72MC0HFDxKYqMLZ2RWGY/ZDNFq6965SP1PIrKlYqaiQ=
github.com/skycoin/dmsg v1.3.25 h1:Gs4aRhLq/ZCo5I0vN3nTv/N5/MC6sunWCuS50Tct6qI=
github.com/skycoin/dmsg v1.3.25/go.mod h1:3pyc9MmDJQYP0spTAWKLMctz4+ZKjMZgXtdMmXpYolw=
github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 h1:1Nc5EBY6pjfw1kwW0duwyG+7WliWz5u9kgk1h5MnLuA=
github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:UXghlricA7J3aRD/k7p/zBObQfmBawwCxIVPVjz2Q3o=
github.com/skycoin/skycoin v0.27.1 h1:HatxsRwVSPaV4qxH6290xPBmkH/HgiuAoY2qC+e8C9I=
Expand All @@ -692,10 +692,8 @@ github.com/skycoin/skycoin-service-discovery v0.0.0-20240627171358-7f59a951fa29
github.com/skycoin/skycoin-service-discovery v0.0.0-20240627171358-7f59a951fa29/go.mod h1:v2r2hqtBsF9rb1wBoJWn21YCiGm0EmGgnhrwD4c54yY=
github.com/skycoin/skywire-services v0.0.0-20240627171623-87edf49d9025 h1:48nukMj8f8VsUlNuGfJP/49wqfzqfJshoKXkjKf4Qyc=
github.com/skycoin/skywire-services v0.0.0-20240627171623-87edf49d9025/go.mod h1:007npHSDcpTeQiG7e3h36W5IMl2+YT8N6nUB0pwtSYs=
github.com/skycoin/skywire-utilities v1.3.18-0.20240624172427-aeaf6f14fbdc h1:VCsz6iF8Eah3D+wHuSWT+Veb8C4XsYMQx+e0WtS6AAY=
github.com/skycoin/skywire-utilities v1.3.18-0.20240624172427-aeaf6f14fbdc/go.mod h1:yFKWpL1bDRPKU3uK+cTF4PnYUMe+eyIj5N2bk4sF5Cw=
github.com/skycoin/skywire-utilities v1.3.18-0.20240825131426-201fde7a3d30 h1:f9/vhzEY05L1wnBC1+5VY32AgkQFVpZWB/GxyCQk4lU=
github.com/skycoin/skywire-utilities v1.3.18-0.20240825131426-201fde7a3d30/go.mod h1:yFKWpL1bDRPKU3uK+cTF4PnYUMe+eyIj5N2bk4sF5Cw=
github.com/skycoin/skywire-utilities v1.3.25 h1:mk8dUonFdhVopFF3d9wbOyXXoiuAO+mN1y+ve6SzgX4=
github.com/skycoin/skywire-utilities v1.3.25/go.mod h1:yFKWpL1bDRPKU3uK+cTF4PnYUMe+eyIj5N2bk4sF5Cw=
github.com/skycoin/systray v1.10.0 h1:fQZJHMylpVvfmOOTLvUssfyHVDoC8Idx6Ba2BlLEuGg=
github.com/skycoin/systray v1.10.0/go.mod h1:/i17Eni5GxFiboIZceeamY5LktDSFFRCvd3fBMerQ+4=
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8 h1:TG/diQgUe0pntT/2D9tmUCz4VNwm9MfrtPr0SU2qSX8=
Expand Down
2 changes: 1 addition & 1 deletion scripts/win_installer/Product.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" UpgradeCode="cd7955bc-304e-470f-9c24-eb9f429a8085"
Name="Skywire"
Version="1.3.24"
Version="1.3.25"
Manufacturer="Skycoin"
Language="1033">

Expand Down
14 changes: 7 additions & 7 deletions services-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
]
},
"prod": {
"dmsg_discovery": "http://dmsgd.skywire.dev",
"dmsg_discovery": "http://dmsgd.skywire.skycoin.com",
"transport_discovery": "http://tpd.skywire.skycoin.com",
"address_resolver": "http://ar.skywire.skycoin.com",
"route_finder": "http://rf.skywire.skycoin.com",
Expand All @@ -67,14 +67,14 @@
"uptime_tracker": "http://ut.skywire.skycoin.com",
"service_discovery": "http://sd.skycoin.com",
"stun_servers": [
"192.53.117.238:3478",
"139.162.30.112:3478",
"192.53.118.31:3478",
"192.53.118.61:3478",
"170.187.228.44:3478",
"192.53.117.237:3478",
"192.53.117.146:3478",
"192.53.117.60:3478",
"192.53.117.124:3478",
"170.187.228.178:3478",
"170.187.225.246:3478"
"139.162.30.129:3478",
"192.53.118.134:3478",
"192.53.118.209:3478"
],
"dns_server": "1.1.1.1",
"survey_whitelist": [
Expand Down
3 changes: 0 additions & 3 deletions vendor/github.com/skycoin/dmsg/cmd/dmsg-server/commands/start/root.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 1 addition & 20 deletions vendor/github.com/skycoin/dmsg/pkg/dmsg/server.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion vendor/github.com/skycoin/dmsg/pkg/dmsgtest/env.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,7 @@ github.com/rs/cors
## explicit; go 1.13
github.com/sirupsen/logrus
github.com/sirupsen/logrus/hooks/syslog
# github.com/skycoin/dmsg v1.3.24
# github.com/skycoin/dmsg v1.3.25
## explicit; go 1.21
github.com/skycoin/dmsg/cmd/dmsg-discovery/commands
github.com/skycoin/dmsg/cmd/dmsg-server/commands
Expand Down Expand Up @@ -576,7 +576,7 @@ github.com/skycoin/skywire-services/pkg/transport-discovery/store
github.com/skycoin/skywire-services/pkg/transport-setup/api
github.com/skycoin/skywire-services/pkg/transport-setup/config
github.com/skycoin/skywire-services/pkg/vpn-monitor/api
# github.com/skycoin/skywire-utilities v1.3.18-0.20240825131426-201fde7a3d30
# github.com/skycoin/skywire-utilities v1.3.25
## explicit; go 1.21
github.com/skycoin/skywire-utilities/pkg/buildinfo
github.com/skycoin/skywire-utilities/pkg/cipher
Expand Down
Loading