From da4f31032049df8d6802b0380f7910335b7c6f4e Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Sun, 12 Jan 2025 20:47:08 +0000 Subject: [PATCH] smp server: update versions --- src/Simplex/Messaging/Server/Main.hs | 4 ++-- src/Simplex/Messaging/Transport.hs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Simplex/Messaging/Server/Main.hs b/src/Simplex/Messaging/Server/Main.hs index 89b032661..0ecc5cf94 100644 --- a/src/Simplex/Messaging/Server/Main.hs +++ b/src/Simplex/Messaging/Server/Main.hs @@ -47,7 +47,7 @@ import Simplex.Messaging.Server.Information import Simplex.Messaging.Server.MsgStore.Journal (JournalStoreConfig (..)) import Simplex.Messaging.Server.MsgStore.Types (AMSType (..), SMSType (..), newMsgStore) import Simplex.Messaging.Server.QueueStore.STM (readQueueStore) -import Simplex.Messaging.Transport (batchCmdsSMPVersion, sendingProxySMPVersion, simplexMQVersion, supportedServerSMPRelayVRange) +import Simplex.Messaging.Transport (batchCmdsSMPVersion, currentServerSMPRelayVersion, simplexMQVersion, supportedServerSMPRelayVRange) import Simplex.Messaging.Transport.Client (SocksProxy, TransportHost (..), defaultSocksProxy) import Simplex.Messaging.Transport.Server (ServerCredentials (..), TransportServerConfig (..), defaultTransportServerConfig) import Simplex.Messaging.Util (eitherToMaybe, ifM, safeDecodeUtf8, tshow) @@ -447,7 +447,7 @@ smpServerCLI_ generateSite serveStaticFiles attachStaticFiles cfgPath logPath = defaultSMPClientAgentConfig { smpCfg = (smpCfg defaultSMPClientAgentConfig) - { serverVRange = mkVersionRange batchCmdsSMPVersion sendingProxySMPVersion, + { serverVRange = mkVersionRange batchCmdsSMPVersion currentServerSMPRelayVersion, agreeSecret = True, networkConfig = defaultNetworkConfig diff --git a/src/Simplex/Messaging/Transport.hs b/src/Simplex/Messaging/Transport.hs index 1bb4cff58..d4601d569 100644 --- a/src/Simplex/Messaging/Transport.hs +++ b/src/Simplex/Messaging/Transport.hs @@ -198,7 +198,7 @@ currentServerSMPRelayVersion = VersionSMP 12 -- to prevent client version fingerprinting by the -- destination relays when clients upgrade at different times. proxiedSMPRelayVersion :: VersionSMP -proxiedSMPRelayVersion = VersionSMP 11 +proxiedSMPRelayVersion = VersionSMP 12 -- minimal supported protocol version is 4 -- TODO remove code that supports sending commands without batching