From a9ec1f9ec1f1fbf8f196771d9ad88ec298464699 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <evgeny@poberezkin.com>
Date: Fri, 30 Aug 2024 13:39:35 +0100
Subject: [PATCH] core: 6.0.4.0 (simplexmq 6.0.3.0)

---
 cabal.project             | 2 +-
 package.yaml              | 2 +-
 scripts/nix/sha256map.nix | 2 +-
 simplex-chat.cabal        | 2 +-
 src/Simplex/Chat.hs       | 2 +-
 tests/ChatClient.hs       | 1 +
 tests/ProtocolTests.hs    | 4 ++--
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/cabal.project b/cabal.project
index 9bf39c2841..d7f6b67eb1 100644
--- a/cabal.project
+++ b/cabal.project
@@ -12,7 +12,7 @@ constraints: zip +disable-bzip2 +disable-zstd
 source-repository-package
     type: git
     location: https://github.com/simplex-chat/simplexmq.git
-    tag: 56986f82c89b04beae84a61208db8b55eb0098e3
+    tag: d559a66145cf7b4cd367c09974ed1ce8393940b2
 
 source-repository-package
     type: git
diff --git a/package.yaml b/package.yaml
index 090933594d..947589acd0 100644
--- a/package.yaml
+++ b/package.yaml
@@ -1,5 +1,5 @@
 name: simplex-chat
-version: 6.0.3.0
+version: 6.0.4.0
 #synopsis:
 #description:
 homepage: https://github.com/simplex-chat/simplex-chat#readme
diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix
index 0569199515..0f6592086f 100644
--- a/scripts/nix/sha256map.nix
+++ b/scripts/nix/sha256map.nix
@@ -1,5 +1,5 @@
 {
-  "https://github.com/simplex-chat/simplexmq.git"."56986f82c89b04beae84a61208db8b55eb0098e3" = "0vqvdnm560xrfq7kjsghdbpk67vn4hcdpp58dfqgh9l2c9f79bin";
+  "https://github.com/simplex-chat/simplexmq.git"."d559a66145cf7b4cd367c09974ed1ce8393940b2" = "1jav7jmriims6vlkxg8gmal03f9mbgrwc8v6g0rp95ivkx8gfjyw";
   "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38";
   "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d";
   "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl";
diff --git a/simplex-chat.cabal b/simplex-chat.cabal
index 877bec0af6..b3cde5ae9f 100644
--- a/simplex-chat.cabal
+++ b/simplex-chat.cabal
@@ -5,7 +5,7 @@ cabal-version: 1.12
 -- see: https://github.com/sol/hpack
 
 name:           simplex-chat
-version:        6.0.3.0
+version:        6.0.4.0
 category:       Web, System, Services, Cryptography
 homepage:       https://github.com/simplex-chat/simplex-chat#readme
 author:         simplex.chat
diff --git a/src/Simplex/Chat.hs b/src/Simplex/Chat.hs
index ac1d0ac601..cfc9f0dc97 100644
--- a/src/Simplex/Chat.hs
+++ b/src/Simplex/Chat.hs
@@ -3522,7 +3522,7 @@ agentSubscriber = do
       toView' $ CRChatError Nothing $ ChatErrorAgent (CRITICAL True $ "Message reception stopped: " <> show e) Nothing
       E.throwIO e
   where
-    process :: (ACorrId, EntityId, AEvt) -> CM' ()
+    process :: (ACorrId, AEntityId, AEvt) -> CM' ()
     process (corrId, entId, AEvt e msg) = run $ case e of
       SAENone -> processAgentMessageNoConn msg
       SAEConn -> processAgentMessage corrId entId msg
diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs
index e3d557166b..42c12f1c6e 100644
--- a/tests/ChatClient.hs
+++ b/tests/ChatClient.hs
@@ -442,6 +442,7 @@ smpServerCfg =
       logStatsStartTime = 0,
       serverStatsLogFile = "tests/smp-server-stats.daily.log",
       serverStatsBackupFile = Nothing,
+      pendingENDInterval = 500000,
       smpServerVRange = supportedServerSMPRelayVRange,
       transportConfig = defaultTransportServerConfig {alpn = Just supportedSMPHandshakes},
       smpHandshakeTimeout = 1000000,
diff --git a/tests/ProtocolTests.hs b/tests/ProtocolTests.hs
index d9552452cd..f64efe108f 100644
--- a/tests/ProtocolTests.hs
+++ b/tests/ProtocolTests.hs
@@ -16,7 +16,7 @@ import Simplex.Chat.Types.Shared
 import Simplex.Messaging.Agent.Protocol
 import qualified Simplex.Messaging.Crypto as C
 import Simplex.Messaging.Crypto.Ratchet
-import Simplex.Messaging.Protocol (supportedSMPClientVRange)
+import Simplex.Messaging.Protocol (EntityId (..), supportedSMPClientVRange)
 import Simplex.Messaging.ServiceScheme
 import Simplex.Messaging.Version
 import Test.Hspec
@@ -33,7 +33,7 @@ queue =
     supportedSMPClientVRange
     SMPQueueAddress
       { smpServer = srv,
-        senderId = "\223\142z\251",
+        senderId = EntityId "\223\142z\251",
         dhPublicKey = "MCowBQYDK2VuAyEAjiswwI3O/NlS8Fk3HJUW870EY2bAwmttMBsvRB9eV3o=",
         sndSecure = False
       }