Merge branch 'master' into master-ghc8107

fix for ghc 8.10.7
2026-08-31 20:28:22 +00:00 · 2023-11-29 13:00:20 +00:00 · 2023-11-21 20:51:27 +00:00 · 2023-11-20 12:29:11 +00:00 · 2023-11-20 12:19:09 +00:00 · 2023-11-16 17:57:05 +00:00
56 changed files with 445 additions and 641 deletions
@@ -28,10 +28,10 @@ jobs:
            ghc: "9.6.3"
    steps:
      - name: Clone project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v2

      - name: Setup Haskell
-        uses: haskell-actions/setup@v2
+        uses: haskell/actions/setup@v1
        with:
          ghc-version: ${{ matrix.ghc }}
          cabal-version: "3.10.1.0"
@@ -5,11 +5,11 @@ FROM ubuntu:${TAG} AS build
 ### Build stage

 # Install curl and git and simplexmq dependencies
-RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev llvm-12 llvm-12-dev libnuma-dev libssl-dev
+RUN apt-get update && apt-get install -y curl git build-essential libgmp3-dev zlib1g-dev llvm-12 llvm-12-dev libnuma-dev

 # Specify bootstrap Haskell versions
-ENV BOOTSTRAP_HASKELL_GHC_VERSION=9.6.3
-ENV BOOTSTRAP_HASKELL_CABAL_VERSION=3.10.1.0
+ENV BOOTSTRAP_HASKELL_GHC_VERSION=8.10.7
+ENV BOOTSTRAP_HASKELL_CABAL_VERSION=3.6.2.0

 # Install ghcup
 RUN curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_NONINTERACTIVE=1 sh
@@ -19,7 +19,7 @@ ENV PATH="/root/.cabal/bin:/root/.ghcup/bin:$PATH"

 # Set both as default
 RUN ghcup set ghc "${BOOTSTRAP_HASKELL_GHC_VERSION}" && \
-    ghcup set cabal "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
+    ghcup set cabal

 COPY . /project
 WORKDIR /project
@@ -5,7 +5,6 @@
 module Main where

 import Control.Logger.Simple
-import Data.ByteArray (ScrubbedBytes)
 import qualified Data.List.NonEmpty as L
 import qualified Data.Map.Strict as M
 import Simplex.Messaging.Agent.Env.SQLite
@@ -20,7 +19,7 @@ cfg = defaultAgentConfig
 agentDbFile :: String
 agentDbFile = "smp-agent.db"

-agentDbKey :: ScrubbedBytes
+agentDbKey :: String
 agentDbKey = ""

 servers :: InitialAgentServers
@@ -39,5 +38,5 @@ main :: IO ()
 main = do
  putStrLn $ "SMP agent listening on port " ++ tcpPort (cfg :: AgentConfig)
  setLogLevel LogInfo -- LogError
-  Right st <- createAgentStore agentDbFile agentDbKey False MCConsole
+  Right st <- createAgentStore agentDbFile agentDbKey MCConsole
  withGlobalLogging logCfg $ runSMPAgent (transport @TLS) cfg servers st
@@ -4,10 +4,7 @@ packages: .
 -- packages: . ../http2
 -- packages: . ../network-transport

-index-state: 2023-12-12T00:00:00Z
-
-package cryptostore
-    flags: +use_crypton
+with-compiler: ghc-8.10.7

 source-repository-package
    type: git
@@ -19,12 +16,17 @@ source-repository-package
    location: https://github.com/simplex-chat/hs-socks.git
    tag: a30cc7a79a08d8108316094f8f2f82a0c5e1ac51

+source-repository-package
+    type: git
+    location: https://github.com/kazu-yamamoto/http2.git
+    tag: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb
+
 source-repository-package
    type: git
    location: https://github.com/simplex-chat/direct-sqlcipher.git
-    tag: f814ee68b16a9447fbb467ccc8f29bdd3546bfd9
+    tag: 34309410eb2069b029b8fc1872deb1e0db123294

 source-repository-package
    type: git
    location: https://github.com/simplex-chat/sqlcipher-simple.git
-    tag: a46bd361a19376c5211f1058908fc0ae6bf42446
+    tag: 5e154a2aeccc33ead6c243ec07195ab673137221
@@ -32,15 +32,13 @@ dependencies:
  - attoparsec == 0.14.*
  - base >= 4.14 && < 5
  - base64-bytestring >= 1.0 && < 1.3
+  - bytestring == 0.10.*
  - case-insensitive == 1.2.*
  - composition == 1.0.*
  - constraints >= 0.12 && < 0.14
  - containers == 0.6.*
-  - crypton == 0.34.*
-  - crypton-x509 == 1.7.*
-  - crypton-x509-store == 1.6.*
-  - crypton-x509-validation == 1.6.*
-  - cryptostore == 0.3.*
+  - cryptonite >= 0.27 && < 0.30
+  - cryptostore == 0.2.*
  - data-default == 0.7.*
  - direct-sqlcipher == 2.3.*
  - directory == 1.3.*
@@ -51,11 +49,11 @@ dependencies:
  - ini == 0.4.1
  - iproute == 1.7.*
  - iso8601-time == 0.1.*
-  - memory == 0.18.*
-  - mtl >= 2.3.1 && < 3.0
+  - memory == 0.15.*
+  - mtl == 2.2.*
  - network >= 3.1.2.7 && < 3.2
  - network-info >= 0.2 && < 0.3
-  - network-transport == 0.5.6
+  - network-transport == 0.5.4
  - network-udp >= 0.0 && < 0.1
  - optparse-applicative >= 0.15 && < 0.17
  - process == 1.6.*
@@ -64,14 +62,20 @@ dependencies:
  - socks == 0.6.*
  - sqlcipher-simple == 0.4.*
  - stm == 2.5.*
+  - template-haskell >= 2.16 && < 2.21
  - temporary == 1.3.*
-  - time == 1.12.*
+  - text == 1.2.*
+  - time == 1.9.*
+  - time-compat == 1.9.*
  - time-manager == 0.0.*
-  - tls >= 1.7.0 && < 1.8
-  - transformers == 0.6.*
+  - tls >= 1.6.0 && < 1.7
+  - transformers == 0.5.*
  - unliftio == 0.2.*
  - unliftio-core == 0.2.*
  - websockets == 0.12.*
+  - x509 == 1.7.*
+  - x509-store == 1.6.*
+  - x509-validation == 1.6.*
  - yaml == 0.11.*

 flags:
@@ -79,25 +83,11 @@ flags:
    description: Enable swift JSON format
    manual: True
    default: False
-  use_crypton:
-    description: Use crypton etc. in cryptostore
-    manual: True
-    default: True

 when:
  - condition: flag(swift)
    cpp-options:
      - -DswiftJSON
-  - condition: impl(ghc >= 9.6.2)
-    dependencies:
-      - bytestring == 0.11.*
-      - template-haskell == 2.20.*
-      - text >= 2.0.1 && < 2.2
-  - condition: impl(ghc < 9.6.2)
-    dependencies:
-      - bytestring == 0.10.*
-      - template-haskell == 2.16.*
-      - text >= 1.2.3.0 && < 1.3

 library:
  source-dirs: src
@@ -115,7 +105,6 @@ executables:
      - simplexmq
    ghc-options:
      - -threaded
-      - -rtsopts

  ntf-server:
    source-dirs: apps/ntf-server
@@ -124,7 +113,6 @@ executables:
      - simplexmq
    ghc-options:
      - -threaded
-      - -rtsopts

  xftp-server:
    source-dirs: apps/xftp-server
@@ -133,7 +121,6 @@ executables:
      - simplexmq
    ghc-options:
      - -threaded
-      - -rtsopts

  smp-agent:
    source-dirs: apps/smp-agent
@@ -142,7 +129,6 @@ executables:
      - simplexmq
    ghc-options:
      - -threaded
-      - -rtsopts

  xftp:
    source-dirs: apps/xftp
@@ -151,7 +137,6 @@ executables:
      - simplexmq
    ghc-options:
      - -threaded
-      - -rtsopts

 tests:
  simplexmq-test:
@@ -160,9 +145,9 @@ tests:
    dependencies:
      - simplexmq
      - deepseq == 1.4.*
-      - generic-random == 1.5.*
-      - hspec == 2.11.*
-      - hspec-core == 2.11.*
+      - generic-random >= 1.3 && < 1.5
+      - hspec == 2.7.*
+      - hspec-core == 2.7.*
      - HUnit == 1.6.*
      - QuickCheck == 2.14.*
      - silently == 1.2.*
@@ -1,6 +1,6 @@
 cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.35.0.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack

@@ -34,11 +34,6 @@ flag swift
  manual: True
  default: False

-flag use_crypton
-  description: Use crypton etc. in cryptostore
-  manual: True
-  default: True
-
 library
  exposed-modules:
      Simplex.FileTransfer.Agent
@@ -179,15 +174,13 @@ library
    , attoparsec ==0.14.*
    , base >=4.14 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
-    , crypton ==0.34.*
-    , crypton-x509 ==1.7.*
-    , crypton-x509-store ==1.6.*
-    , crypton-x509-validation ==1.6.*
-    , cryptostore ==0.3.*
+    , cryptonite >=0.27 && <0.30
+    , cryptostore ==0.2.*
    , data-default ==0.7.*
    , direct-sqlcipher ==2.3.*
    , directory ==1.3.*
@@ -198,11 +191,11 @@ library
    , ini ==0.4.1
    , iproute ==1.7.*
    , iso8601-time ==0.1.*
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory ==0.15.*
+    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
    , network-info ==0.2.*
-    , network-transport ==0.5.6
+    , network-transport ==0.5.4
    , network-udp ==0.0.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
@@ -211,28 +204,24 @@ library
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , temporary ==1.3.*
-    , time ==1.12.*
+    , text ==1.2.*
+    , time ==1.9.*
+    , time-compat ==1.9.*
    , time-manager ==0.0.*
-    , tls >=1.7.0 && <1.8
-    , transformers ==0.6.*
+    , tls >=1.6.0 && <1.7
+    , transformers ==0.5.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
+    , x509 ==1.7.*
+    , x509-store ==1.6.*
+    , x509-validation ==1.6.*
    , yaml ==0.11.*
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable ntf-server
  main-is: Main.hs
@@ -240,7 +229,7 @@ executable ntf-server
      Paths_simplexmq
  hs-source-dirs:
      apps/ntf-server
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded -rtsopts
+  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
  build-depends:
      aeson ==2.2.*
    , ansi-terminal >=0.10 && <0.12
@@ -250,15 +239,13 @@ executable ntf-server
    , attoparsec ==0.14.*
    , base >=4.14 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
-    , crypton ==0.34.*
-    , crypton-x509 ==1.7.*
-    , crypton-x509-store ==1.6.*
-    , crypton-x509-validation ==1.6.*
-    , cryptostore ==0.3.*
+    , cryptonite >=0.27 && <0.30
+    , cryptostore ==0.2.*
    , data-default ==0.7.*
    , direct-sqlcipher ==2.3.*
    , directory ==1.3.*
@@ -269,11 +256,11 @@ executable ntf-server
    , ini ==0.4.1
    , iproute ==1.7.*
    , iso8601-time ==0.1.*
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory ==0.15.*
+    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
    , network-info ==0.2.*
-    , network-transport ==0.5.6
+    , network-transport ==0.5.4
    , network-udp ==0.0.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
@@ -283,28 +270,24 @@ executable ntf-server
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , temporary ==1.3.*
-    , time ==1.12.*
+    , text ==1.2.*
+    , time ==1.9.*
+    , time-compat ==1.9.*
    , time-manager ==0.0.*
-    , tls >=1.7.0 && <1.8
-    , transformers ==0.6.*
+    , tls >=1.6.0 && <1.7
+    , transformers ==0.5.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
+    , x509 ==1.7.*
+    , x509-store ==1.6.*
+    , x509-validation ==1.6.*
    , yaml ==0.11.*
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable smp-agent
  main-is: Main.hs
@@ -312,7 +295,7 @@ executable smp-agent
      Paths_simplexmq
  hs-source-dirs:
      apps/smp-agent
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded -rtsopts
+  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
  build-depends:
      aeson ==2.2.*
    , ansi-terminal >=0.10 && <0.12
@@ -322,15 +305,13 @@ executable smp-agent
    , attoparsec ==0.14.*
    , base >=4.14 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
-    , crypton ==0.34.*
-    , crypton-x509 ==1.7.*
-    , crypton-x509-store ==1.6.*
-    , crypton-x509-validation ==1.6.*
-    , cryptostore ==0.3.*
+    , cryptonite >=0.27 && <0.30
+    , cryptostore ==0.2.*
    , data-default ==0.7.*
    , direct-sqlcipher ==2.3.*
    , directory ==1.3.*
@@ -341,11 +322,11 @@ executable smp-agent
    , ini ==0.4.1
    , iproute ==1.7.*
    , iso8601-time ==0.1.*
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory ==0.15.*
+    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
    , network-info ==0.2.*
-    , network-transport ==0.5.6
+    , network-transport ==0.5.4
    , network-udp ==0.0.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
@@ -355,28 +336,24 @@ executable smp-agent
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , temporary ==1.3.*
-    , time ==1.12.*
+    , text ==1.2.*
+    , time ==1.9.*
+    , time-compat ==1.9.*
    , time-manager ==0.0.*
-    , tls >=1.7.0 && <1.8
-    , transformers ==0.6.*
+    , tls >=1.6.0 && <1.7
+    , transformers ==0.5.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
+    , x509 ==1.7.*
+    , x509-store ==1.6.*
+    , x509-validation ==1.6.*
    , yaml ==0.11.*
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable smp-server
  main-is: Main.hs
@@ -384,7 +361,7 @@ executable smp-server
      Paths_simplexmq
  hs-source-dirs:
      apps/smp-server
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded -rtsopts
+  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
  build-depends:
      aeson ==2.2.*
    , ansi-terminal >=0.10 && <0.12
@@ -394,15 +371,13 @@ executable smp-server
    , attoparsec ==0.14.*
    , base >=4.14 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
-    , crypton ==0.34.*
-    , crypton-x509 ==1.7.*
-    , crypton-x509-store ==1.6.*
-    , crypton-x509-validation ==1.6.*
-    , cryptostore ==0.3.*
+    , cryptonite >=0.27 && <0.30
+    , cryptostore ==0.2.*
    , data-default ==0.7.*
    , direct-sqlcipher ==2.3.*
    , directory ==1.3.*
@@ -413,11 +388,11 @@ executable smp-server
    , ini ==0.4.1
    , iproute ==1.7.*
    , iso8601-time ==0.1.*
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory ==0.15.*
+    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
    , network-info ==0.2.*
-    , network-transport ==0.5.6
+    , network-transport ==0.5.4
    , network-udp ==0.0.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
@@ -427,28 +402,24 @@ executable smp-server
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , temporary ==1.3.*
-    , time ==1.12.*
+    , text ==1.2.*
+    , time ==1.9.*
+    , time-compat ==1.9.*
    , time-manager ==0.0.*
-    , tls >=1.7.0 && <1.8
-    , transformers ==0.6.*
+    , tls >=1.6.0 && <1.7
+    , transformers ==0.5.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
+    , x509 ==1.7.*
+    , x509-store ==1.6.*
+    , x509-validation ==1.6.*
    , yaml ==0.11.*
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable xftp
  main-is: Main.hs
@@ -456,7 +427,7 @@ executable xftp
      Paths_simplexmq
  hs-source-dirs:
      apps/xftp
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded -rtsopts
+  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
  build-depends:
      aeson ==2.2.*
    , ansi-terminal >=0.10 && <0.12
@@ -466,15 +437,13 @@ executable xftp
    , attoparsec ==0.14.*
    , base >=4.14 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
-    , crypton ==0.34.*
-    , crypton-x509 ==1.7.*
-    , crypton-x509-store ==1.6.*
-    , crypton-x509-validation ==1.6.*
-    , cryptostore ==0.3.*
+    , cryptonite >=0.27 && <0.30
+    , cryptostore ==0.2.*
    , data-default ==0.7.*
    , direct-sqlcipher ==2.3.*
    , directory ==1.3.*
@@ -485,11 +454,11 @@ executable xftp
    , ini ==0.4.1
    , iproute ==1.7.*
    , iso8601-time ==0.1.*
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory ==0.15.*
+    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
    , network-info ==0.2.*
-    , network-transport ==0.5.6
+    , network-transport ==0.5.4
    , network-udp ==0.0.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
@@ -499,28 +468,24 @@ executable xftp
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , temporary ==1.3.*
-    , time ==1.12.*
+    , text ==1.2.*
+    , time ==1.9.*
+    , time-compat ==1.9.*
    , time-manager ==0.0.*
-    , tls >=1.7.0 && <1.8
-    , transformers ==0.6.*
+    , tls >=1.6.0 && <1.7
+    , transformers ==0.5.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
+    , x509 ==1.7.*
+    , x509-store ==1.6.*
+    , x509-validation ==1.6.*
    , yaml ==0.11.*
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 executable xftp-server
  main-is: Main.hs
@@ -528,7 +493,7 @@ executable xftp-server
      Paths_simplexmq
  hs-source-dirs:
      apps/xftp-server
-  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded -rtsopts
+  ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded
  build-depends:
      aeson ==2.2.*
    , ansi-terminal >=0.10 && <0.12
@@ -538,15 +503,13 @@ executable xftp-server
    , attoparsec ==0.14.*
    , base >=4.14 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
-    , crypton ==0.34.*
-    , crypton-x509 ==1.7.*
-    , crypton-x509-store ==1.6.*
-    , crypton-x509-validation ==1.6.*
-    , cryptostore ==0.3.*
+    , cryptonite >=0.27 && <0.30
+    , cryptostore ==0.2.*
    , data-default ==0.7.*
    , direct-sqlcipher ==2.3.*
    , directory ==1.3.*
@@ -557,11 +520,11 @@ executable xftp-server
    , ini ==0.4.1
    , iproute ==1.7.*
    , iso8601-time ==0.1.*
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory ==0.15.*
+    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
    , network-info ==0.2.*
-    , network-transport ==0.5.6
+    , network-transport ==0.5.4
    , network-udp ==0.0.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
@@ -571,28 +534,24 @@ executable xftp-server
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , temporary ==1.3.*
-    , time ==1.12.*
+    , text ==1.2.*
+    , time ==1.9.*
+    , time-compat ==1.9.*
    , time-manager ==0.0.*
-    , tls >=1.7.0 && <1.8
-    , transformers ==0.6.*
+    , tls >=1.6.0 && <1.7
+    , transformers ==0.5.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
+    , x509 ==1.7.*
+    , x509-store ==1.6.*
+    , x509-validation ==1.6.*
    , yaml ==0.11.*
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3

 test-suite simplexmq-test
  type: exitcode-stdio-1.0
@@ -641,35 +600,33 @@ test-suite simplexmq-test
    , attoparsec ==0.14.*
    , base >=4.14 && <5
    , base64-bytestring >=1.0 && <1.3
+    , bytestring ==0.10.*
    , case-insensitive ==1.2.*
    , composition ==1.0.*
    , constraints >=0.12 && <0.14
    , containers ==0.6.*
-    , crypton ==0.34.*
-    , crypton-x509 ==1.7.*
-    , crypton-x509-store ==1.6.*
-    , crypton-x509-validation ==1.6.*
-    , cryptostore ==0.3.*
+    , cryptonite >=0.27 && <0.30
+    , cryptostore ==0.2.*
    , data-default ==0.7.*
    , deepseq ==1.4.*
    , direct-sqlcipher ==2.3.*
    , directory ==1.3.*
    , filepath ==1.4.*
-    , generic-random ==1.5.*
+    , generic-random >=1.3 && <1.5
    , hourglass ==0.2.*
-    , hspec ==2.11.*
-    , hspec-core ==2.11.*
+    , hspec ==2.7.*
+    , hspec-core ==2.7.*
    , http-types ==0.12.*
    , http2 >=4.2.2 && <4.3
    , ini ==0.4.1
    , iproute ==1.7.*
    , iso8601-time ==0.1.*
    , main-tester ==0.2.*
-    , memory ==0.18.*
-    , mtl >=2.3.1 && <3.0
+    , memory ==0.15.*
+    , mtl ==2.2.*
    , network >=3.1.2.7 && <3.2
    , network-info ==0.2.*
-    , network-transport ==0.5.6
+    , network-transport ==0.5.4
    , network-udp ==0.0.*
    , optparse-applicative >=0.15 && <0.17
    , process ==1.6.*
@@ -680,26 +637,22 @@ test-suite simplexmq-test
    , socks ==0.6.*
    , sqlcipher-simple ==0.4.*
    , stm ==2.5.*
+    , template-haskell >=2.16 && <2.21
    , temporary ==1.3.*
-    , time ==1.12.*
+    , text ==1.2.*
+    , time ==1.9.*
+    , time-compat ==1.9.*
    , time-manager ==0.0.*
    , timeit ==2.0.*
-    , tls >=1.7.0 && <1.8
-    , transformers ==0.6.*
+    , tls >=1.6.0 && <1.7
+    , transformers ==0.5.*
    , unliftio ==0.2.*
    , unliftio-core ==0.2.*
    , websockets ==0.12.*
+    , x509 ==1.7.*
+    , x509-store ==1.6.*
+    , x509-validation ==1.6.*
    , yaml ==0.11.*
  default-language: Haskell2010
  if flag(swift)
    cpp-options: -DswiftJSON
-  if impl(ghc >= 9.6.2)
-    build-depends:
-        bytestring ==0.11.*
-      , template-haskell ==2.20.*
-      , text >=2.0.1 && <2.2
-  if impl(ghc < 9.6.2)
-    build-depends:
-        bytestring ==0.10.*
-      , template-haskell ==2.16.*
-      , text >=1.2.3.0 && <1.3
@@ -9,7 +9,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}

 module Simplex.FileTransfer.Agent
  ( startXFTPWorkers,
@@ -9,7 +9,6 @@

 module Simplex.FileTransfer.Client where

-import Control.Monad
 import Control.Monad.Except
 import Data.Bifunctor (first)
 import Data.ByteString.Builder (Builder, byteString)
@@ -8,7 +8,6 @@
 module Simplex.FileTransfer.Client.Agent where

 import Control.Logger.Simple (logInfo)
-import Control.Monad
 import Control.Monad.Except
 import Data.Bifunctor (first)
 import qualified Data.ByteString.Char8 as B
@@ -22,7 +21,7 @@ import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Protocol (ProtocolServer (..), XFTPServer)
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
-import Simplex.Messaging.Util (catchAll_)
+import Simplex.Messaging.Util (catchAll_, tryError)
 import UnliftIO

 type XFTPClientVar = TMVar (Either XFTPClientAgentError XFTPClient)
@@ -8,7 +8,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}

 module Simplex.FileTransfer.Client.Main
  ( SendOptions (..),
@@ -6,7 +6,6 @@

 module Simplex.FileTransfer.Crypto where

-import Control.Monad
 import Control.Monad.Except
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import Data.Bifunctor (first)
@@ -26,6 +26,7 @@ module Simplex.FileTransfer.Description
    YAMLServerReplicas (..), -- for tests
    validateFileDescription,
    groupReplicasByServer,
+    replicaServer,
    fdSeparator,
    kb,
    mb,
@@ -255,6 +256,9 @@ encodeFileReplicas defChunkSize =
          chunks = map (B.unpack . encodeServerReplica) $ L.toList fs
        }

+replicaServer :: FileServerReplica -> XFTPServer
+replicaServer = server
+
 encodeServerReplica :: FileServerReplica -> ByteString
 encodeServerReplica FileServerReplica {chunkNo, replicaId, replicaKey, digest, chunkSize} =
  bshow chunkNo
@@ -12,7 +12,6 @@
 module Simplex.FileTransfer.Server where

 import Control.Logger.Simple
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Unlift (MonadUnliftIO)
 import Control.Monad.Reader
@@ -15,7 +15,6 @@ module Simplex.FileTransfer.Transport
 where

 import qualified Control.Exception as E
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Class
 import Data.Bifunctor (first)
@@ -13,7 +13,6 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeApplications #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}

 -- |
 -- Module      : Simplex.Messaging.Agent
@@ -64,7 +63,6 @@ module Simplex.Messaging.Agent
    resubscribeConnection,
    resubscribeConnections,
    sendMessage,
-    sendMessages,
    ackMessage,
    switchConnection,
    abortConnectionSwitch,
@@ -110,7 +108,6 @@ module Simplex.Messaging.Agent
 where

 import Control.Logger.Simple (logError, logInfo, showText)
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Unlift (MonadUnliftIO)
 import Control.Monad.Reader
@@ -120,17 +117,14 @@ import Data.Bifunctor (bimap, first, second)
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
 import Data.Composition ((.:), (.:.), (.::), (.::.))
-import Data.Either (rights)
-import Data.Foldable (foldl', toList)
+import Data.Foldable (foldl')
 import Data.Functor (($>))
-import Data.Functor.Identity
 import Data.List (find)
 import Data.List.NonEmpty (NonEmpty (..))
 import qualified Data.List.NonEmpty as L
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as M
-import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing, mapMaybe)
-import qualified Data.Set as S
+import Data.Maybe (catMaybes, fromMaybe, isJust, isNothing)
 import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Time.Clock
@@ -281,12 +275,6 @@ resubscribeConnections c = withAgentEnv c . resubscribeConnections' c
 sendMessage :: AgentErrorMonad m => AgentClient -> ConnId -> MsgFlags -> MsgBody -> m AgentMsgId
 sendMessage c = withAgentEnv c .:. sendMessage' c

-type MsgReq = (ConnId, MsgFlags, MsgBody)
-
-- | Send multiple messages to different connections (SEND command)
-sendMessages :: MonadUnliftIO m => AgentClient -> [MsgReq] -> m [Either AgentErrorType AgentMsgId]
-sendMessages c = withAgentEnv c . sendMessages' c
-
 ackMessage :: AgentErrorMonad m => AgentClient -> ConnId -> AgentMsgId -> Maybe MsgReceiptInfo -> m ()
 ackMessage c = withAgentEnv c .:. ackMessage' c

@@ -788,7 +776,7 @@ subscribeConnections' c connIds = do
      ContactConnection _ rq -> Right [rq]
      NewConnection _ -> Left (Right ())
    sndSubResult :: SndQueue -> Either AgentErrorType ()
-    sndSubResult SndQueue {status} = case status of
+    sndSubResult sq = case status (sq :: SndQueue) of
      Confirmed -> Right ()
      Active -> Left $ CONN SIMPLEX
      _ -> Left $ INTERNAL "unexpected queue status"
@@ -859,47 +847,37 @@ getNotificationMessage' c nonce encNtfInfo = do
      (ntfConnId, rcvNtfDhSecret) <- withStore c (`getNtfRcvQueue` smpQueue)
      ntfMsgMeta <- (eitherToMaybe . smpDecode <$> agentCbDecrypt rcvNtfDhSecret nmsgNonce encNMsgMeta) `catchAgentError` \_ -> pure Nothing
      maxMsgs <- asks $ ntfMaxMessages . config
-      (NotificationInfo {ntfConnId, ntfTs, ntfMsgMeta},) <$> getNtfMessages ntfConnId ntfMsgMeta maxMsgs
+      (NotificationInfo {ntfConnId, ntfTs, ntfMsgMeta},) <$> getNtfMessages ntfConnId maxMsgs ntfMsgMeta []
    _ -> throwError $ CMD PROHIBITED
  where
-    getNtfMessages ntfConnId nMeta = getMsg
-      where
-        getMsg 0 = pure []
-        getMsg n =
+    getNtfMessages ntfConnId maxMs nMeta ms
+      | length ms < maxMs =
          getConnectionMessage' c ntfConnId >>= \case
-            Just m
-              | lastMsg m -> pure [m]
-              | otherwise -> (m :) <$> getMsg (n - 1)
-            Nothing -> pure []
-        lastMsg SMP.SMPMsgMeta {msgId, msgTs, msgFlags} = case nMeta of
-          Just SMP.NMsgMeta {msgId = msgId', msgTs = msgTs'} -> msgId == msgId' || msgTs > msgTs'
-          Nothing -> SMP.notification msgFlags
+            Just m@SMP.SMPMsgMeta {msgId, msgTs, msgFlags} -> case nMeta of
+              Just SMP.NMsgMeta {msgId = msgId', msgTs = msgTs'}
+                | msgId == msgId' || msgTs > msgTs' -> pure $ reverse (m : ms)
+                | otherwise -> getMsg (m : ms)
+              _
+                | SMP.notification msgFlags -> pure $ reverse (m : ms)
+                | otherwise -> getMsg (m : ms)
+            _ -> pure $ reverse ms
+      | otherwise = pure $ reverse ms
+      where
+        getMsg = getNtfMessages ntfConnId maxMs nMeta

 -- | Send message to the connection (SEND command) in Reader monad
 sendMessage' :: forall m. AgentMonad m => AgentClient -> ConnId -> MsgFlags -> MsgBody -> m AgentMsgId
-sendMessage' c connId msgFlags msg = liftEither . runIdentity =<< sendMessagesB c (Identity (Right (connId, msgFlags, msg)))
-
-- | Send multiple messages to different connections (SEND command) in Reader monad
-sendMessages' :: forall m. AgentMonad' m => AgentClient -> [MsgReq] -> m [Either AgentErrorType AgentMsgId]
-sendMessages' c = sendMessagesB c . map Right
-
-sendMessagesB :: forall m t. (AgentMonad' m, Traversable t) => AgentClient -> t (Either AgentErrorType MsgReq) -> m (t (Either AgentErrorType AgentMsgId))
-sendMessagesB c reqs = withConnLocks c connIds "sendMessages" $ do
-  reqs' <- withStoreBatch c (\db -> fmap (mapE $ \req@(connId, _, _) -> bimap storeError (req,) <$> getConn db connId) reqs)
-  let reqs'' = fmap (>>= prepareConn) reqs'
-  enqueueMessagesB c reqs''
+sendMessage' c connId msgFlags msg = withConnLock c connId "sendMessage" $ do
+  SomeConn _ conn <- withStore c (`getConn` connId)
+  case conn of
+    DuplexConnection cData _ sqs -> enqueueMsgs cData sqs
+    SndConnection cData sq -> enqueueMsgs cData [sq]
+    _ -> throwError $ CONN SIMPLEX
  where
-    prepareConn :: (MsgReq, SomeConn) -> Either AgentErrorType (ConnData, NonEmpty SndQueue, MsgFlags, AMessage)
-    prepareConn ((_, msgFlags, msg), SomeConn _ conn) = case conn of
-      DuplexConnection cData _ sqs -> prepareMsgs cData sqs
-      SndConnection cData sq -> prepareMsgs cData [sq]
-      _ -> Left $ CONN SIMPLEX
-      where
-        prepareMsgs :: ConnData -> NonEmpty SndQueue -> Either AgentErrorType (ConnData, NonEmpty SndQueue, MsgFlags, AMessage)
-        prepareMsgs cData sqs
-          | ratchetSyncSendProhibited cData = Left $ CMD PROHIBITED
-          | otherwise = Right (cData, sqs, msgFlags, A_MSG msg)
-    connIds = foldl' (\cs -> either (\_ -> cs) (\(connId, _, _) -> S.insert connId cs)) S.empty reqs
+    enqueueMsgs :: ConnData -> NonEmpty SndQueue -> m AgentMsgId
+    enqueueMsgs cData sqs = do
+      when (ratchetSyncSendProhibited cData) $ throwError $ CMD PROHIBITED
+      enqueueMessages c cData sqs msgFlags $ A_MSG msg

 -- / async command processing v v v

@@ -1078,37 +1056,22 @@ enqueueMessages c cData sqs msgFlags aMessage = do
  enqueueMessages' c cData sqs msgFlags aMessage

 enqueueMessages' :: AgentMonad m => AgentClient -> ConnData -> NonEmpty SndQueue -> MsgFlags -> AMessage -> m AgentMsgId
-enqueueMessages' c cData sqs msgFlags aMessage =
-  liftEither . runIdentity =<< enqueueMessagesB c (Identity (Right (cData, sqs, msgFlags, aMessage)))
-
-enqueueMessagesB :: (AgentMonad' m, Traversable t) => AgentClient -> t (Either AgentErrorType (ConnData, NonEmpty SndQueue, MsgFlags, AMessage)) -> m (t (Either AgentErrorType AgentMsgId))
-enqueueMessagesB c reqs = do
-  reqs' <- enqueueMessageB c reqs
-  enqueueSavedMessageB c $ mapMaybe snd $ rights $ toList reqs'
-  pure $ fst <$$> reqs'
-
-isActiveSndQ :: SndQueue -> Bool
-isActiveSndQ SndQueue {status} = status == Secured || status == Active
+enqueueMessages' c cData (sq :| sqs) msgFlags aMessage = do
+  msgId <- enqueueMessage c cData sq msgFlags aMessage
+  mapM_ (enqueueSavedMessage c cData msgId) $
+    filter (\SndQueue {status} -> status == Secured || status == Active) sqs
+  pure msgId

 enqueueMessage :: forall m. AgentMonad m => AgentClient -> ConnData -> SndQueue -> MsgFlags -> AMessage -> m AgentMsgId
-enqueueMessage c cData sq msgFlags aMessage =
-  liftEither . fmap fst . runIdentity =<< enqueueMessageB c (Identity (Right (cData, [sq], msgFlags, aMessage)))
-
-- this function is used only for sending messages in batch, it returns the list of successes to enqueue additional deliveries
-enqueueMessageB :: forall m t. (AgentMonad' m, Traversable t) => AgentClient -> t (Either AgentErrorType (ConnData, NonEmpty SndQueue, MsgFlags, AMessage)) -> m (t (Either AgentErrorType (AgentMsgId, Maybe (ConnData, [SndQueue], AgentMsgId))))
-enqueueMessageB c reqs = do
-  void . forME reqs $ \(cData, sq :| _, _, _) ->
-    runExceptT $ resumeMsgDelivery c cData sq
-  aVRange <- asks $ maxVersion . smpAgentVRange . config
-  reqMids <- withStoreBatch c $ \db -> fmap (mapE $ storeSentMsg db aVRange) reqs
-  forME reqMids $ \((cData, sq :| sqs, _, _), mId) -> do
-    let InternalId msgId = mId
-    queuePendingMsgs c sq [mId]
-    let sqs' = filter isActiveSndQ sqs
-    pure $ Right (msgId, if null sqs' then Nothing else Just (cData, sqs', msgId))
+enqueueMessage c cData@ConnData {connId} sq msgFlags aMessage = do
+  resumeMsgDelivery c cData sq
+  aVRange <- asks $ smpAgentVRange . config
+  msgId <- storeSentMsg $ maxVersion aVRange
+  queuePendingMsgs c sq [msgId]
+  pure $ unId msgId
  where
-    storeSentMsg :: DB.Connection -> Version -> (ConnData, NonEmpty SndQueue, MsgFlags, AMessage) -> IO (Either AgentErrorType ((ConnData, NonEmpty SndQueue, MsgFlags, AMessage), InternalId))
-    storeSentMsg db agentVersion req@(ConnData {connId}, sq :| _, msgFlags, aMessage) = fmap (first storeError) $ runExceptT $ do
+    storeSentMsg :: Version -> m InternalId
+    storeSentMsg agentVersion = withStore c $ \db -> runExceptT $ do
      internalTs <- liftIO getCurrentTime
      (internalId, internalSndId, prevMsgHash) <- liftIO $ updateSndIds db connId
      let privHeader = APrivHeader (unSndId internalSndId) prevMsgHash
@@ -1121,25 +1084,14 @@ enqueueMessageB c reqs = do
          msgData = SndMsgData {internalId, internalSndId, internalTs, msgType, msgFlags, msgBody, internalHash, prevMsgHash}
      liftIO $ createSndMsg db connId msgData
      liftIO $ createSndMsgDelivery db connId sq internalId
-      pure (req, internalId)
+      pure internalId

-enqueueSavedMessage :: AgentMonad' m => AgentClient -> ConnData -> AgentMsgId -> SndQueue -> m ()
-enqueueSavedMessage c cData msgId sq = enqueueSavedMessageB c $ Identity (cData, [sq], msgId)
-
-enqueueSavedMessageB :: (AgentMonad' m, Foldable t) => AgentClient -> t (ConnData, [SndQueue], AgentMsgId) -> m ()
-enqueueSavedMessageB c reqs = do
-  -- saving to the database has to be before enqueue to avoid race condition when delivery is read from queue before it is saved
-  void $ withStoreBatch' c $ \db -> concatMap (storeDeliveries db) reqs
-  forM_ reqs $ \(cData, sqs, msgId) ->
-    forM sqs $ \sq -> do
-      void . runExceptT $ resumeMsgDelivery c cData sq
-      let mId = InternalId msgId
-      queuePendingMsgs c sq [mId]
-  where
-    storeDeliveries :: DB.Connection -> (ConnData, [SndQueue], AgentMsgId) -> [IO ()]
-    storeDeliveries db (ConnData {connId}, sqs, msgId) = do
-      let mId = InternalId msgId
-       in map (\sq -> createSndMsgDelivery db connId sq mId) sqs
+enqueueSavedMessage :: AgentMonad m => AgentClient -> ConnData -> AgentMsgId -> SndQueue -> m ()
+enqueueSavedMessage c cData@ConnData {connId} msgId sq = do
+  resumeMsgDelivery c cData sq
+  let mId = InternalId msgId
+  queuePendingMsgs c sq [mId]
+  withStore' c $ \db -> createSndMsgDelivery db connId sq mId

 resumeMsgDelivery :: forall m. AgentMonad m => AgentClient -> ConnData -> SndQueue -> m ()
 resumeMsgDelivery c cData@ConnData {connId} sq@SndQueue {server, sndId} = do
@@ -1149,23 +1101,20 @@ resumeMsgDelivery c cData@ConnData {connId} sq@SndQueue {server, sndId} = do
      >>= \a -> atomically (TM.insert qKey a $ smpQueueMsgDeliveries c)
  unlessM msgsQueued $
    withStore' c (\db -> getPendingMsgs db connId sq)
-      >>= queuePendingMsgs' c False sq
+      >>= queuePendingMsgs c sq
  where
    queueDelivering qKey = atomically $ TM.member qKey (smpQueueMsgDeliveries c)
    msgsQueued = atomically $ isJust <$> TM.lookupInsert (server, sndId) True (pendingMsgsQueued c)

 queuePendingMsgs :: AgentMonad' m => AgentClient -> SndQueue -> [InternalId] -> m ()
-queuePendingMsgs c = queuePendingMsgs' c True
-
-queuePendingMsgs' :: AgentMonad' m => AgentClient -> Bool -> SndQueue -> [InternalId] -> m ()
-queuePendingMsgs' c setDeliveryOps sq msgIds = atomically $ do
-  when setDeliveryOps $ modifyTVar' (msgDeliveryOp c) $ \s -> s {opsInProgress = opsInProgress s + length msgIds}
+queuePendingMsgs c sq msgIds = atomically $ do
+  modifyTVar' (msgDeliveryOp c) $ \s -> s {opsInProgress = opsInProgress s + length msgIds}
  -- s <- readTVar (msgDeliveryOp c)
  -- unsafeIOToSTM $ putStrLn $ "msgDeliveryOp: " <> show (opsInProgress s)
  (mq, _) <- getPendingMsgQ c sq
-  mapM_ (writeTQueue mq . (,setDeliveryOps)) msgIds
+  mapM_ (writeTQueue mq) msgIds

-getPendingMsgQ :: AgentClient -> SndQueue -> STM (TQueue (InternalId, Bool), TMVar ())
+getPendingMsgQ :: AgentClient -> SndQueue -> STM (TQueue InternalId, TMVar ())
 getPendingMsgQ c SndQueue {server, sndId} = do
  let qKey = (server, sndId)
  maybe (newMsgQueue qKey) pure =<< TM.lookup qKey (smpQueueMsgQueues c)
@@ -1183,9 +1132,9 @@ runSmpQueueMsgDelivery c@AgentClient {subQ} cData@ConnData {userId, connId, dupl
    atomically $ endAgentOperation c AOSndNetwork
    atomically $ throwWhenInactive c
    atomically $ throwWhenNoDelivery c sq
-    (msgId, deliveryOp) <- atomically $ readTQueue mq
+    msgId <- atomically $ readTQueue mq
    atomically $ beginAgentOperation c AOSndNetwork
-    when deliveryOp $ atomically $ endAgentOperation c AOMsgDelivery -- this operation begins in queuePendingMsgs
+    atomically $ endAgentOperation c AOMsgDelivery -- this operation begins in queuePendingMsgs
    let mId = unId msgId
    tryAgentError (withStore c $ \db -> getPendingMsgData db connId msgId) >>= \case
      Left e -> notify $ MERR mId e
@@ -1934,13 +1883,10 @@ processSMPTransmission c@AgentClient {smpClients, subQ} (tSess@(_, srv, _), v, s
      cData@ConnData {userId, connId, duplexHandshake, connAgentVersion, ratchetSyncState = rss} =
        withConnLock c connId "processSMP" $ case cmd of
          SMP.MSG msg@SMP.RcvMessage {msgId = srvMsgId} ->
-            handleNotifyAck $ do
-              msg' <- decryptSMPMessage v rq msg
-              handleNotifyAck $ case msg' of
+            handleNotifyAck $
+              decryptSMPMessage v rq msg >>= \case
                SMP.ClientRcvMsgBody {msgTs = srvTs, msgFlags, msgBody} -> processClientMsg srvTs msgFlags msgBody
                SMP.ClientRcvMsgQuota {} -> queueDrained >> ack
-              whenM (atomically $ hasGetLock c rq) $
-                notify (MSGNTF $ SMP.rcvMessageMeta srvMsgId msg')
            where
              queueDrained = case conn of
                DuplexConnection _ _ sqs -> void $ enqueueMessages c cData sqs SMP.noMsgFlags $ QCONT (sndAddress rq)
@@ -2248,7 +2194,7 @@ processSMPTransmission c@AgentClient {smpClients, subQ} (tSess@(_, srv, _), v, s
                case (findQ (qAddress sqInfo) sqs, findQ addr sqs) of
                  (Just _, _) -> qError "QADD: queue address is already used in connection"
                  (_, Just sq@SndQueue {dbQueueId}) -> do
-                    let (delSqs, keepSqs) = L.partition ((Just dbQueueId == ) . dbReplaceQId) sqs
+                    let (delSqs, keepSqs) = L.partition ((Just dbQueueId ==) . dbReplaceQId) sqs
                    case L.nonEmpty keepSqs of
                      Just sqs' -> do
                        -- move inside case?
@@ -2482,7 +2428,8 @@ storeConfirmation c ConnData {connId, connAgentVersion} sq e2eEncryption_ agentM
 enqueueRatchetKeyMsgs :: forall m. AgentMonad m => AgentClient -> ConnData -> NonEmpty SndQueue -> CR.E2ERatchetParams 'C.X448 -> m AgentMsgId
 enqueueRatchetKeyMsgs c cData (sq :| sqs) e2eEncryption = do
  msgId <- enqueueRatchetKey c cData sq e2eEncryption
-  mapM_ (enqueueSavedMessage c cData msgId) $ filter isActiveSndQ sqs
+  mapM_ (enqueueSavedMessage c cData msgId) $
+    filter (\SndQueue {status} -> status == Secured || status == Active) sqs
  pure msgId

 enqueueRatchetKey :: forall m. AgentMonad m => AgentClient -> ConnData -> SndQueue -> CR.E2ERatchetParams 'C.X448 -> m AgentMsgId
@@ -24,7 +24,6 @@ module Simplex.Messaging.Agent.Client
    ProtocolTestStep (..),
    newAgentClient,
    withConnLock,
-    withConnLocks,
    withInvLock,
    closeAgentClient,
    closeProtocolServerClients,
@@ -73,7 +72,6 @@ module Simplex.Messaging.Agent.Client
    logSecret,
    removeSubscription,
    hasActiveSubscription,
-    hasGetLock,
    agentClientStore,
    agentDRG,
    getAgentSubscriptions,
@@ -100,8 +98,6 @@ module Simplex.Messaging.Agent.Client
    withStore',
    withStoreCtx,
    withStoreCtx',
-    withStoreBatch,
-    withStoreBatch',
    storeError,
    userServers,
    pickServer,
@@ -117,7 +113,6 @@ import Control.Concurrent.Async (Async, uninterruptibleCancel)
 import Control.Concurrent.STM (retry, throwSTM)
 import Control.Exception (AsyncException (..))
 import Control.Logger.Simple
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader
@@ -238,7 +233,7 @@ data AgentClient = AgentClient
    pendingSubs :: TRcvQueues,
    removedSubs :: TMap (UserId, SMPServer, SMP.RecipientId) SMPClientError,
    pendingMsgsQueued :: TMap SndQAddr Bool,
-    smpQueueMsgQueues :: TMap SndQAddr (TQueue (InternalId, Bool), TMVar ()),
+    smpQueueMsgQueues :: TMap SndQAddr (TQueue InternalId, TMVar ()),
    smpQueueMsgDeliveries :: TMap SndQAddr (Async ()),
    connCmdsQueued :: TMap ConnId Bool,
    asyncCmdQueues :: TMap (Maybe SMPServer) (TQueue AsyncCmdId),
@@ -661,17 +656,8 @@ withConnLock AgentClient {connLocks} connId name = withLockMap_ connLocks connId
 withInvLock :: MonadUnliftIO m => AgentClient -> ByteString -> String -> m a -> m a
 withInvLock AgentClient {invLocks} = withLockMap_ invLocks

-withConnLocks :: MonadUnliftIO m => AgentClient -> Set ConnId -> String -> m a -> m a
-withConnLocks AgentClient {connLocks} = withLocksMap_ connLocks . S.filter (not . B.null)
-
 withLockMap_ :: (Ord k, MonadUnliftIO m) => TMap k Lock -> k -> String -> m a -> m a
-withLockMap_ = withGetLock . getMapLock
-
-withLocksMap_ :: (Ord k, MonadUnliftIO m) => TMap k Lock -> Set k -> String -> m a -> m a
-withLocksMap_ = withGetLocks . getMapLock
-
-getMapLock :: Ord k => TMap k Lock -> k -> STM Lock
-getMapLock locks key = TM.lookup key locks >>= maybe newLock pure
+withLockMap_ locks key = withGetLock $ TM.lookup key locks >>= maybe newLock pure
  where
    newLock = createLock >>= \l -> TM.insert key l locks $> l

@@ -910,8 +896,8 @@ subscribeQueues c qs = do
  -- only "checked" queues are subscribed
  (errs <>) <$> sendTSessionBatches "SUB" 90 id (subscribeQueues_ u) c qs'
  where
-    checkQueue rq = do
-      prohibited <- atomically $ hasGetLock c rq
+    checkQueue rq@RcvQueue {rcvId, server} = do
+      prohibited <- atomically . TM.member (server, rcvId) $ getMsgLocks c
      pure $ if prohibited then Left (rq, Left $ CMD PROHIBITED) else Right rq
    subscribeQueues_ :: UnliftIO m -> SMPClient -> NonEmpty RcvQueue -> IO (BatchResponses SMPClientError ())
    subscribeQueues_ u smp qs' = do
@@ -1062,10 +1048,6 @@ sendAck c rq@RcvQueue {rcvId, rcvPrivateKey} msgId = do
    ackSMPMessage smp rcvPrivateKey rcvId msgId
  atomically $ releaseGetLock c rq

-hasGetLock :: AgentClient -> RcvQueue -> STM Bool
-hasGetLock c RcvQueue {server, rcvId} =
-  TM.member (server, rcvId) $ getMsgLocks c
-
 releaseGetLock :: AgentClient -> RcvQueue -> STM ()
 releaseGetLock c RcvQueue {server, rcvId} =
  TM.lookup (server, rcvId) (getMsgLocks c) >>= mapM_ (`tryPutTMVar` ())
@@ -1303,18 +1285,6 @@ withStoreCtx_ ctx_ c action = do
    handleInternal :: String -> E.SomeException -> IO (Either StoreError a)
    handleInternal ctxStr e = pure . Left . SEInternal . B.pack $ show e <> ctxStr

-withStoreBatch :: (AgentMonad' m, Traversable t) => AgentClient -> (DB.Connection -> t (IO (Either AgentErrorType a))) -> m (t (Either AgentErrorType a))
-withStoreBatch c actions = do
-  st <- asks store
-  liftIO $ agentOperationBracket c AODatabase (\_ -> pure ()) $
-      withTransaction st $ mapM (`E.catch` handleInternal) . actions
-  where
-    handleInternal :: E.SomeException -> IO (Either AgentErrorType a)
-    handleInternal = pure . Left . INTERNAL . show
-
-withStoreBatch' :: (AgentMonad' m, Traversable t) => AgentClient -> (DB.Connection -> t (IO a)) -> m (t (Either AgentErrorType a))
-withStoreBatch' c actions = withStoreBatch c $ \db -> fmap Right <$> actions db
-
 storeError :: StoreError -> AgentErrorType
 storeError = \case
  SEConnNotFound -> CONN NOT_FOUND
@@ -34,7 +34,6 @@ import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Reader
 import Crypto.Random
-import Data.ByteArray (ScrubbedBytes)
 import Data.Int (Int64)
 import Data.List.NonEmpty (NonEmpty)
 import Data.Map (Map)
@@ -164,7 +163,7 @@ defaultAgentConfig =
      ntfWorkerDelay = 100000, -- microseconds
      ntfSMPWorkerDelay = 500000, -- microseconds
      ntfSubCheckInterval = nominalDay,
-      ntfMaxMessages = 3,
+      ntfMaxMessages = 4,
      -- CA certificate private key is not needed for initialization
      -- ! we do not generate these
      caCertificateFile = "/etc/opt/simplex-agent/ca.crt",
@@ -197,8 +196,8 @@ newSMPAgentEnv config@AgentConfig {initialClientId} store = do
  multicastSubscribers <- newTMVarIO 0
  pure Env {config, store, random, clientCounter, randomServer, ntfSupervisor, xftpAgent, multicastSubscribers}

-createAgentStore :: FilePath -> ScrubbedBytes -> Bool -> MigrationConfirmation -> IO (Either MigrationError SQLiteStore)
-createAgentStore dbFilePath dbKey keepKey = createSQLiteStore dbFilePath dbKey keepKey Migrations.app
+createAgentStore :: FilePath -> String -> MigrationConfirmation -> IO (Either MigrationError SQLiteStore)
+createAgentStore dbFilePath dbKey = createSQLiteStore dbFilePath dbKey Migrations.app

 data NtfSupervisor = NtfSupervisor
  { ntfTkn :: TVar (Maybe NtfToken),
@@ -1,20 +1,8 @@
-{-# LANGUAGE NamedFieldPuns #-}
-
-module Simplex.Messaging.Agent.Lock
-  ( Lock,
-    createLock,
-    withLock,
-    withGetLock,
-    withGetLocks,
-  )
-where
+module Simplex.Messaging.Agent.Lock where

 import Control.Monad (void)
 import Control.Monad.IO.Unlift
 import Data.Functor (($>))
-import Data.Set (Set)
-import qualified Data.Set as S
-import UnliftIO.Async (forConcurrently)
 import qualified UnliftIO.Exception as E
 import UnliftIO.STM

@@ -30,22 +18,9 @@ withLock lock name =
    (atomically $ putTMVar lock name)
    (void . atomically $ takeTMVar lock)

-withGetLock :: MonadUnliftIO m => (k -> STM Lock) -> k -> String -> m a -> m a
-withGetLock getLock key name a =
+withGetLock :: MonadUnliftIO m => STM Lock -> String -> m a -> m a
+withGetLock getLock name a =
  E.bracket
-    (atomically $ getPutLock getLock key name)
+    (atomically $ getLock >>= \l -> putTMVar l name $> l)
    (atomically . takeTMVar)
    (const a)
-
-withGetLocks :: MonadUnliftIO m => (k -> STM Lock) -> Set k -> String -> m a -> m a
-withGetLocks getLock keys name = E.bracket holdLocks releaseLocks . const
-  where
-    holdLocks = forConcurrently (S.toList keys) $ \key -> atomically $ getPutLock getLock key name
-    -- only this withGetLocks would be holding the locks,
-    -- so it's safe to combine all lock releases into one transaction
-    releaseLocks = atomically . mapM_ takeTMVar
-
-- getLock and putTMVar can be in one transaction on the assumption that getLock doesn't write in case the lock already exists,
-- and in case it is created and added to some shared resource (we use TMap) it also helps avoid contention for the newly created lock.
-getPutLock :: (k -> STM Lock) -> k -> String -> STM Lock
-getPutLock getLock key name = getLock key >>= \l -> putTMVar l name $> l
@@ -5,7 +5,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}

 module Simplex.Messaging.Agent.NtfSubSupervisor
  ( runNtfSupervisor,
@@ -51,13 +50,13 @@ runNtfSupervisor c = do
  ns <- asks ntfSupervisor
  forever $ do
    cmd@(connId, _) <- atomically . readTBQueue $ ntfSubQ ns
-    handleErr connId . agentOperationBracket c AONtfNetwork waitUntilActive $
+    handleError connId . agentOperationBracket c AONtfNetwork waitUntilActive $
      runExceptT (processNtfSub c cmd) >>= \case
        Left e -> notifyErr connId e
        Right _ -> return ()
  where
-    handleErr :: ConnId -> m () -> m ()
-    handleErr connId = E.handle $ \(e :: E.SomeException) -> do
+    handleError :: ConnId -> m () -> m ()
+    handleError connId = E.handle $ \(e :: E.SomeException) -> do
      logError $ "runNtfSupervisor error " <> tshow e
      notifyErr connId e
    notifyErr connId e = notifyInternalError c connId $ "runNtfSupervisor error " <> show e
@@ -80,8 +80,6 @@ module Simplex.Messaging.Agent.Protocol
    SMPServerWithAuth,
    SrvLoc (..),
    SMPQueue (..),
-    qAddress,
-    sameQueue,
    sameQAddress,
    noAuthSrv,
    SMPQueueUri (..),
@@ -193,7 +191,6 @@ import Simplex.Messaging.Protocol
    MsgId,
    NMsgMeta,
    ProtocolServer (..),
-    SMPMsgMeta,
    SMPServer,
    SMPServerWithAuth,
    SndPublicVerifyKey,
@@ -338,7 +335,6 @@ data ACommand (p :: AParty) (e :: AEntity) where
  SENT :: AgentMsgId -> ACommand Agent AEConn
  MERR :: AgentMsgId -> AgentErrorType -> ACommand Agent AEConn
  MSG :: MsgMeta -> MsgFlags -> MsgBody -> ACommand Agent AEConn
-  MSGNTF :: SMPMsgMeta -> ACommand Agent AEConn
  ACK :: AgentMsgId -> Maybe MsgReceiptInfo -> ACommand Client AEConn
  RCVD :: MsgMeta -> NonEmpty MsgReceipt -> ACommand Agent AEConn
  SWCH :: ACommand Client AEConn
@@ -399,7 +395,6 @@ data ACommandTag (p :: AParty) (e :: AEntity) where
  SENT_ :: ACommandTag Agent AEConn
  MERR_ :: ACommandTag Agent AEConn
  MSG_ :: ACommandTag Agent AEConn
-  MSGNTF_ :: ACommandTag Agent AEConn
  ACK_ :: ACommandTag Client AEConn
  RCVD_ :: ACommandTag Agent AEConn
  SWCH_ :: ACommandTag Client AEConn
@@ -453,7 +448,6 @@ aCommandTag = \case
  SENT _ -> SENT_
  MERR {} -> MERR_
  MSG {} -> MSG_
-  MSGNTF {} -> MSGNTF_
  ACK {} -> ACK_
  RCVD {} -> RCVD_
  SWCH -> SWCH_
@@ -1200,15 +1194,8 @@ updateSMPServerHosts srv@ProtocolServer {host} = case host of

 class SMPQueue q where
  qServer :: q -> SMPServer
-  queueId :: q -> SMP.QueueId
-
-qAddress :: SMPQueue q => q -> (SMPServer, SMP.QueueId)
-qAddress q = (qServer q, queueId q)
-{-# INLINE qAddress #-}
-
-sameQueue :: SMPQueue q => (SMPServer, SMP.QueueId) -> q -> Bool
-sameQueue addr q = sameQAddress addr (qAddress q)
-{-# INLINE sameQueue #-}
+  qAddress :: q -> (SMPServer, SMP.QueueId)
+  sameQueue :: (SMPServer, SMP.QueueId) -> q -> Bool

 data SMPQueueInfo = SMPQueueInfo {clientVersion :: Version, queueAddress :: SMPQueueAddress}
  deriving (Eq, Show)
@@ -1253,20 +1240,26 @@ data SMPQueueAddress = SMPQueueAddress
 instance SMPQueue SMPQueueUri where
  qServer SMPQueueUri {queueAddress} = qServer queueAddress
  {-# INLINE qServer #-}
-  queueId SMPQueueUri {queueAddress} = queueId queueAddress
-  {-# INLINE queueId #-}
+  qAddress SMPQueueUri {queueAddress} = qAddress queueAddress
+  {-# INLINE qAddress #-}
+  sameQueue addr q = sameQAddress addr (qAddress q)
+  {-# INLINE sameQueue #-}

 instance SMPQueue SMPQueueInfo where
  qServer SMPQueueInfo {queueAddress} = qServer queueAddress
  {-# INLINE qServer #-}
-  queueId SMPQueueInfo {queueAddress} = queueId queueAddress
-  {-# INLINE queueId #-}
+  qAddress SMPQueueInfo {queueAddress} = qAddress queueAddress
+  {-# INLINE qAddress #-}
+  sameQueue addr q = sameQAddress addr (qAddress q)
+  {-# INLINE sameQueue #-}

 instance SMPQueue SMPQueueAddress where
  qServer SMPQueueAddress {smpServer} = smpServer
  {-# INLINE qServer #-}
-  queueId SMPQueueAddress {senderId} = senderId
-  {-# INLINE queueId #-}
+  qAddress SMPQueueAddress {smpServer, senderId} = (smpServer, senderId)
+  {-# INLINE qAddress #-}
+  sameQueue addr q = sameQAddress addr (qAddress q)
+  {-# INLINE sameQueue #-}

 sameQAddress :: (SMPServer, SMP.QueueId) -> (SMPServer, SMP.QueueId) -> Bool
 sameQAddress (srv, qId) (srv', qId') = sameSrvAddr srv srv' && qId == qId'
@@ -1608,7 +1601,6 @@ instance StrEncoding ACmdTag where
      "SENT" -> ct SENT_
      "MERR" -> ct MERR_
      "MSG" -> ct MSG_
-      "MSGNTF" -> ct MSGNTF_
      "ACK" -> t ACK_
      "RCVD" -> ct RCVD_
      "SWCH" -> t SWCH_
@@ -1664,7 +1656,6 @@ instance (APartyI p, AEntityI e) => StrEncoding (ACommandTag p e) where
    SENT_ -> "SENT"
    MERR_ -> "MERR"
    MSG_ -> "MSG"
-    MSGNTF_ -> "MSGNTF"
    ACK_ -> "ACK"
    RCVD_ -> "RCVD"
    SWCH_ -> "SWCH"
@@ -1733,7 +1724,6 @@ commandP binaryP =
          SENT_ -> s (SENT <$> A.decimal)
          MERR_ -> s (MERR <$> A.decimal <* A.space <*> strP)
          MSG_ -> s (MSG <$> strP <* A.space <*> smpP <* A.space <*> binaryP)
-          MSGNTF_ -> s (MSGNTF <$> strP)
          RCVD_ -> s (RCVD <$> strP <* A.space <*> strP)
          DEL_RCVQ_ -> s (DEL_RCVQ <$> strP_ <*> strP_ <*> strP)
          DEL_CONN_ -> pure DEL_CONN
@@ -1788,7 +1778,6 @@ serializeCommand = \case
  SENT mId -> s (SENT_, Str $ bshow mId)
  MERR mId e -> s (MERR_, Str $ bshow mId, e)
  MSG msgMeta msgFlags msgBody -> B.unwords [s MSG_, s msgMeta, smpEncode msgFlags, serializeBinary msgBody]
-  MSGNTF smpMsgMeta -> s (MSGNTF_, smpMsgMeta)
  ACK mId rcptInfo_ -> s (ACK_, Str $ bshow mId) <> maybe "" (B.cons ' ' . serializeBinary) rcptInfo_
  RCVD msgMeta rcpts -> s (RCVD_, msgMeta, rcpts)
  SWCH -> s SWCH_
@@ -11,7 +11,7 @@ module Simplex.Messaging.Agent.Server
 where

 import Control.Logger.Simple (logInfo)
-import Control.Monad
+import Control.Monad.Except
 import Control.Monad.IO.Unlift (MonadUnliftIO)
 import Control.Monad.Reader
 import Crypto.Random (MonadRandom)
@@ -1,8 +1,6 @@
-{-# LANGUAGE ConstraintKinds #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DeriveAnyClass #-}
 {-# LANGUAGE DuplicateRecordFields #-}
-{-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE KindSignatures #-}
 {-# LANGUAGE LambdaCase #-}
@@ -38,6 +36,7 @@ import Simplex.Messaging.Protocol
    NotifierId,
    NtfPrivateSignKey,
    NtfPublicVerifyKey,
+    QueueId,
    RcvDhSecret,
    RcvNtfDhSecret,
    RcvPrivateSignKey,
@@ -145,14 +144,18 @@ sndQueueInfo SndQueue {server, sndSwchStatus} =
 instance SMPQueue RcvQueue where
  qServer RcvQueue {server} = server
  {-# INLINE qServer #-}
-  queueId RcvQueue {rcvId} = rcvId
-  {-# INLINE queueId #-}
+  qAddress RcvQueue {server, rcvId} = (server, rcvId)
+  {-# INLINE qAddress #-}
+  sameQueue addr q = sameQAddress addr (qAddress q)
+  {-# INLINE sameQueue #-}

 instance SMPQueue SndQueue where
  qServer SndQueue {server} = server
  {-# INLINE qServer #-}
-  queueId SndQueue {sndId} = sndId
-  {-# INLINE queueId #-}
+  qAddress SndQueue {server, sndId} = (server, sndId)
+  {-# INLINE qAddress #-}
+  sameQueue addr q = sameQAddress addr (qAddress q)
+  {-# INLINE sameQueue #-}

 findQ :: SMPQueue q => (SMPServer, SMP.QueueId) -> NonEmpty q -> Maybe q
 findQ = find . sameQueue
@@ -19,7 +19,6 @@
 {-# LANGUAGE TupleSections #-}
 {-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}

 module Simplex.Messaging.Agent.Store.SQLite
@@ -31,10 +30,7 @@ module Simplex.Messaging.Agent.Store.SQLite
    connectSQLiteStore,
    closeSQLiteStore,
    openSQLiteStore,
-    reopenSQLiteStore,
    sqlString,
-    keyString,
-    storeKey,
    execSQL,
    upMigration, -- used in tests

@@ -217,15 +213,11 @@ module Simplex.Messaging.Agent.Store.SQLite
  )
 where

-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Crypto.Random (ChaChaDRG)
 import qualified Data.Aeson.TH as J
 import qualified Data.Attoparsec.ByteString.Char8 as A
 import Data.Bifunctor (second)
-import Data.ByteArray (ScrubbedBytes)
-import qualified Data.ByteArray as BA
 import Data.ByteString (ByteString)
 import qualified Data.ByteString.Base64.URL as U
 import Data.Char (toLower)
@@ -272,7 +264,7 @@ import Simplex.Messaging.Parsers (blobFieldParser, defaultJSON, dropPrefix, from
 import Simplex.Messaging.Protocol
 import qualified Simplex.Messaging.Protocol as SMP
 import Simplex.Messaging.Transport.Client (TransportHost)
-import Simplex.Messaging.Util (bshow, eitherToMaybe, groupOn, ifM, safeDecodeUtf8, ($>>=), (<$$>))
+import Simplex.Messaging.Util (bshow, eitherToMaybe, groupOn, ifM, ($>>=), (<$$>))
 import Simplex.Messaging.Version
 import System.Directory (copyFile, createDirectoryIfMissing, doesFileExist)
 import System.Exit (exitFailure)
@@ -321,11 +313,11 @@ instance StrEncoding MigrationConfirmation where
      "error" -> pure MCError
      _ -> fail "invalid MigrationConfirmation"

-createSQLiteStore :: FilePath -> ScrubbedBytes -> Bool -> [Migration] -> MigrationConfirmation -> IO (Either MigrationError SQLiteStore)
-createSQLiteStore dbFilePath dbKey keepKey migrations confirmMigrations = do
+createSQLiteStore :: FilePath -> String -> [Migration] -> MigrationConfirmation -> IO (Either MigrationError SQLiteStore)
+createSQLiteStore dbFilePath dbKey migrations confirmMigrations = do
  let dbDir = takeDirectory dbFilePath
  createDirectoryIfMissing True dbDir
-  st <- connectSQLiteStore dbFilePath dbKey keepKey
+  st <- connectSQLiteStore dbFilePath dbKey
  r <- migrateSchema st migrations confirmMigrations `onException` closeSQLiteStore st
  case r of
    Right () -> pure $ Right st
@@ -371,17 +363,17 @@ confirmOrExit s = do
  ok <- getLine
  when (map toLower ok /= "y") exitFailure

-connectSQLiteStore :: FilePath -> ScrubbedBytes -> Bool -> IO SQLiteStore
-connectSQLiteStore dbFilePath key keepKey = do
+connectSQLiteStore :: FilePath -> String -> IO SQLiteStore
+connectSQLiteStore dbFilePath dbKey = do
  dbNew <- not <$> doesFileExist dbFilePath
-  dbConn <- dbBusyLoop (connectDB dbFilePath key)
+  dbConn <- dbBusyLoop (connectDB dbFilePath dbKey)
  atomically $ do
    dbConnection <- newTMVar dbConn
-    dbKey <- newTVar $! storeKey key keepKey
+    dbEncrypted <- newTVar . not $ null dbKey
    dbClosed <- newTVar False
-    pure SQLiteStore {dbFilePath, dbKey, dbConnection, dbNew, dbClosed}
+    pure SQLiteStore {dbFilePath, dbEncrypted, dbConnection, dbNew, dbClosed}

-connectDB :: FilePath -> ScrubbedBytes -> IO DB.Connection
+connectDB :: FilePath -> String -> IO DB.Connection
 connectDB path key = do
  db <- DB.open path
  prepare db `onException` DB.close db
@@ -390,7 +382,7 @@ connectDB path key = do
  where
    prepare db = do
      let exec = SQLite3.exec $ SQL.connectionHandle $ DB.conn db
-      unless (BA.null key) . exec $ "PRAGMA key = " <> keyString key <> ";"
+      unless (null key) . exec $ "PRAGMA key = " <> sqlString key <> ";"
      exec . fromQuery $
        [sql|
          PRAGMA busy_timeout = 100;
@@ -407,36 +399,22 @@ closeSQLiteStore st@SQLiteStore {dbClosed} =
      DB.close conn
      atomically $ writeTVar dbClosed True

-openSQLiteStore :: SQLiteStore -> ScrubbedBytes -> Bool -> IO ()
-openSQLiteStore st@SQLiteStore {dbClosed} key keepKey =
-  ifM (readTVarIO dbClosed) (openSQLiteStore_ st key keepKey) (putStrLn "openSQLiteStore: already opened")
-
-openSQLiteStore_ :: SQLiteStore -> ScrubbedBytes -> Bool -> IO ()
-openSQLiteStore_ SQLiteStore {dbConnection, dbFilePath, dbKey, dbClosed} key keepKey =
-  bracketOnError
-    (atomically $ takeTMVar dbConnection)
-    (atomically . tryPutTMVar dbConnection)
-    $ \DB.Connection {slow} -> do
-      DB.Connection {conn} <- connectDB dbFilePath key
-      atomically $ do
-        putTMVar dbConnection DB.Connection {conn, slow}
-        writeTVar dbClosed False
-        writeTVar dbKey $! storeKey key keepKey
-
-reopenSQLiteStore :: SQLiteStore -> IO ()
-reopenSQLiteStore st@SQLiteStore {dbKey, dbClosed} =
-  ifM (readTVarIO dbClosed) open (putStrLn "reopenSQLiteStore: already opened")
+openSQLiteStore :: SQLiteStore -> String -> IO ()
+openSQLiteStore SQLiteStore {dbConnection, dbFilePath, dbClosed} key =
+  ifM (readTVarIO dbClosed) open (putStrLn "closeSQLiteStore: already opened")
  where
    open =
-      readTVarIO dbKey >>= \case
-        Just key -> openSQLiteStore_ st key True
-        Nothing -> fail "reopenSQLiteStore: no key"
+      bracketOnError
+        (atomically $ takeTMVar dbConnection)
+        (atomically . tryPutTMVar dbConnection)
+        $ \DB.Connection {slow} -> do
+          DB.Connection {conn} <- connectDB dbFilePath key
+          atomically $ do
+            putTMVar dbConnection DB.Connection {conn, slow}
+            writeTVar dbClosed False

-keyString :: ScrubbedBytes -> Text
-keyString = sqlString . safeDecodeUtf8 . BA.convert
-
-sqlString :: Text -> Text
-sqlString s = quote <> T.replace quote "''" s <> quote
+sqlString :: String -> Text
+sqlString s = quote <> T.replace quote "''" (T.pack s) <> quote
  where
    quote = "'"

@@ -10,13 +10,10 @@ module Simplex.Messaging.Agent.Store.SQLite.Common
    withTransaction',
    withTransactionCtx,
    dbBusyLoop,
-    storeKey,
  )
 where

 import Control.Concurrent (threadDelay)
-import Data.ByteArray (ScrubbedBytes)
-import qualified Data.ByteArray as BA
 import Data.Time.Clock (diffUTCTime, getCurrentTime)
 import Database.SQLite.Simple (SQLError)
 import qualified Database.SQLite.Simple as SQL
@@ -26,12 +23,9 @@ import UnliftIO.Exception (bracket)
 import qualified UnliftIO.Exception as E
 import UnliftIO.STM

-storeKey :: ScrubbedBytes -> Bool -> Maybe ScrubbedBytes
-storeKey key keepKey = if keepKey || BA.null key then Just key else Nothing
-
 data SQLiteStore = SQLiteStore
  { dbFilePath :: FilePath,
-    dbKey :: TVar (Maybe ScrubbedBytes),
+    dbEncrypted :: TVar Bool,
    dbConnection :: TMVar DB.Connection,
    dbClosed :: TVar Bool,
    dbNew :: Bool
@@ -48,7 +48,7 @@ timeIt slow sql a = do
  r <- a
  t' <- getCurrentTime
  let diff = diffToMilliseconds $ diffUTCTime t' t
-  atomically $ when (diff > 5) $ TM.alter (updateQueryStats diff) sql slow
+  atomically $ when (diff > 50) $ TM.alter (updateQueryStats diff) sql slow
  pure r
  where
    updateQueryStats :: Int64 -> Maybe SlowQueryStats -> Maybe SlowQueryStats
@@ -226,9 +226,9 @@ defaultNetworkConfig =
      hostMode = HMOnionViaSocks,
      requiredHostMode = False,
      sessionMode = TSMUser,
-      tcpConnectTimeout = 20_000_000,
-      tcpTimeout = 15_000_000,
-      tcpTimeoutPerKb = 45_000, -- 45ms, should be less than 130ms to avoid Int overflow on 32 bit systems
+      tcpConnectTimeout = 15_000_000,
+      tcpTimeout = 10_000_000,
+      tcpTimeoutPerKb = 20_000, -- 20ms, should be less than 130ms to avoid Int overflow on 32 bit systems
      tcpKeepAlive = Just defaultKeepAliveOpts,
      smpPingInterval = 600_000_000, -- 10min
      smpPingCount = 3,
@@ -14,7 +14,6 @@ module Simplex.Messaging.Client.Agent where
 import Control.Concurrent (forkIO)
 import Control.Concurrent.Async (Async, uninterruptibleCancel)
 import Control.Logger.Simple
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Control.Monad.Trans.Except
@@ -40,7 +39,7 @@ import Simplex.Messaging.Protocol (BrokerMsg, NotifierId, NtfPrivateSignKey, Pro
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Transport
-import Simplex.Messaging.Util (catchAll_, toChunks, ($>>=))
+import Simplex.Messaging.Util (catchAll_, toChunks, tryE, ($>>=))
 import System.Timeout (timeout)
 import UnliftIO (async)
 import UnliftIO.Exception (Exception)
@@ -273,13 +272,13 @@ withSMP ca srv action = (getSMPServerClient' ca srv >>= action) `catchE` logSMPE
 subscribeQueue :: SMPClientAgent -> SMPServer -> (SMPSub, C.APrivateSignKey) -> ExceptT SMPClientError IO ()
 subscribeQueue ca srv sub = do
  atomically $ addPendingSubscription ca srv sub
-  withSMP ca srv $ \smp -> subscribe_ smp `catchE` handleErr
+  withSMP ca srv $ \smp -> subscribe_ smp `catchE` handleError
  where
    subscribe_ smp = do
      smpSubscribe smp sub
      atomically $ addSubscription ca srv sub

-    handleErr e = do
+    handleError e = do
      atomically . when (e /= PCENetworkError && e /= PCEResponseTimeout) $
        removePendingSubscription ca srv (fst sub)
      throwE e
@@ -167,7 +167,6 @@ where

 import Control.Concurrent.STM
 import Control.Exception (Exception)
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Trans.Except
 import Crypto.Cipher.AES (AES256)
@@ -21,7 +21,6 @@ module Simplex.Messaging.Crypto.File
 where

 import Control.Exception
-import Control.Monad
 import Control.Monad.Except
 import qualified Data.Aeson.TH as J
 import qualified Data.ByteArray as BA
@@ -37,7 +36,7 @@ import qualified Simplex.Messaging.Crypto.Lazy as LC
 import Simplex.Messaging.Parsers (defaultJSON)
 import Simplex.Messaging.Util (liftEitherWith)
 import System.Directory (getFileSize)
-import UnliftIO (Handle, IOMode (..), liftIO)
+import UnliftIO (Handle, IOMode (..))
 import qualified UnliftIO as IO
 import UnliftIO.STM

@@ -15,7 +15,6 @@
 module Simplex.Messaging.Crypto.Ratchet where

 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Control.Monad.Trans.Except
 import Crypto.Cipher.AES (AES256)
 import Crypto.Hash (SHA512)
@@ -39,6 +38,7 @@ import Simplex.Messaging.Crypto
 import Simplex.Messaging.Encoding
 import Simplex.Messaging.Encoding.String
 import Simplex.Messaging.Parsers (blobFieldDecoder, defaultJSON, parseE, parseE')
+import Simplex.Messaging.Util (tryE)
 import Simplex.Messaging.Version

 currentE2EEncryptVersion :: Version
@@ -12,8 +12,8 @@

 module Simplex.Messaging.Notifications.Server where

+import Control.Concurrent.STM (stateTVar)
 import Control.Logger.Simple
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.Reader
 import Data.ByteString.Char8 (ByteString)
@@ -12,9 +12,7 @@ module Simplex.Messaging.Notifications.Server.Push.APNS where

 import Control.Exception (Exception)
 import Control.Logger.Simple
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Crypto.Hash.Algorithms (SHA256 (..))
 import qualified Crypto.PubKey.ECC.ECDSA as EC
 import qualified Crypto.PubKey.ECC.Types as ECT
@@ -5,7 +5,6 @@
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE StrictData #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}

 module Simplex.Messaging.Notifications.Server.StoreLog
  ( StoreLog,
@@ -460,14 +460,7 @@ data SMPMsgMeta = SMPMsgMeta
    msgTs :: SystemTime,
    msgFlags :: MsgFlags
  }
-  deriving (Eq, Show)
-
-instance StrEncoding SMPMsgMeta where
-  strEncode SMPMsgMeta {msgId, msgTs, msgFlags} =
-    strEncode (msgId, msgTs, msgFlags)
-  strP = do
-    (msgId, msgTs, msgFlags) <- strP
-    pure SMPMsgMeta {msgId, msgTs, msgFlags}
+  deriving (Show)

 rcvMessageMeta :: MsgId -> ClientRcvMsgBody -> SMPMsgMeta
 rcvMessageMeta msgId = \case
@@ -73,7 +73,7 @@ import Simplex.Messaging.Server.Expiration
 import Simplex.Messaging.Server.MsgStore
 import Simplex.Messaging.Server.MsgStore.STM
 import Simplex.Messaging.Server.QueueStore
-import Simplex.Messaging.Server.QueueStore.STM as QS
+import Simplex.Messaging.Server.QueueStore.STM
 import Simplex.Messaging.Server.Stats
 import Simplex.Messaging.Server.StoreLog
 import Simplex.Messaging.TMap (TMap)
@@ -120,8 +120,8 @@ smpServer started cfg@ServerConfig {transports, transportConfig = tCfg} = do
  restoreServerMessages
  restoreServerStats
  raceAny_
-    ( serverThread s "server subscribedQ" subscribedQ subscribers subscriptions cancelSub
-        : serverThread s "server ntfSubscribedQ" ntfSubscribedQ Env.notifiers ntfSubscriptions (\_ -> pure ())
+    ( serverThread s subscribedQ subscribers subscriptions cancelSub
+        : serverThread s ntfSubscribedQ Env.notifiers ntfSubscriptions (\_ -> pure ())
        : map runServer transports <> expireMessagesThread_ cfg <> serverStatsThread_ cfg <> controlPortThread_ cfg
    )
    `finally` withLock (savingLock s) "final" (saveServer False)
@@ -137,14 +137,12 @@ smpServer started cfg@ServerConfig {transports, transportConfig = tCfg} = do
    serverThread ::
      forall s.
      Server ->
-      String ->
      (Server -> TQueue (QueueId, Client)) ->
      (Server -> TMap QueueId Client) ->
      (Client -> TMap QueueId s) ->
      (s -> IO ()) ->
      M ()
-    serverThread s label subQ subs clientSubs unsub = forever $ do
-      labelMyThread label
+    serverThread s subQ subs clientSubs unsub = forever $ do
      atomically updateSubscribers
        $>>= endPreviousSubscriptions
        >>= liftIO . mapM_ unsub
@@ -161,7 +159,6 @@ smpServer started cfg@ServerConfig {transports, transportConfig = tCfg} = do
          TM.lookupInsert qId clnt (subs s) $>>= clientToBeNotified
        endPreviousSubscriptions :: (QueueId, Client) -> M (Maybe s)
        endPreviousSubscriptions (qId, c) = do
-          labelMyThread $ label <> ".endPreviousSubscriptions"
          void . forkIO . atomically $
            writeTBQueue (sndQ c) [(CorrId "", qId, END)]
          atomically $ TM.lookupDelete qId (clientSubs c)
@@ -175,7 +172,6 @@ smpServer started cfg@ServerConfig {transports, transportConfig = tCfg} = do
      ms <- asks msgStore
      quota <- asks $ msgQueueQuota . config
      let interval = checkInterval expCfg * 1000000
-      labelMyThread "expireMessages"
      forever $ do
        liftIO $ threadDelay' interval
        old <- liftIO $ expireBeforeEpoch expCfg
@@ -191,7 +187,6 @@ smpServer started cfg@ServerConfig {transports, transportConfig = tCfg} = do

    logServerStats :: Int64 -> Int64 -> FilePath -> M ()
    logServerStats startAt logInterval statsFilePath = do
-      labelMyThread "logServerStats"
      initialDelay <- (startAt -) . fromIntegral . (`div` 1000000_000000) . diffTimeToPicoseconds . utctDayTime <$> liftIO getCurrentTime
      liftIO $ putStrLn $ "server stats log enabled: " <> statsFilePath
      liftIO $ threadDelay' $ 1000000 * (initialDelay + if initialDelay < 0 then 86400 else 0)
@@ -236,10 +231,9 @@ smpServer started cfg@ServerConfig {transports, transportConfig = tCfg} = do
          threadDelay' interval

    runClient :: Transport c => TProxy c -> c -> M ()
-    runClient tp h = do
+    runClient _ h = do
      kh <- asks serverIdentity
      smpVRange <- asks $ smpServerVRange . config
-      labelMyThread $ "smp handshake for " <> transportName tp
      liftIO (runExceptT $ smpServerHandshake h kh smpVRange) >>= \case
        Right th -> runClientTransport th
        Left _ -> pure ()
@@ -253,13 +247,10 @@ smpServer started cfg@ServerConfig {transports, transportConfig = tCfg} = do
      srv <- asks server
      cpStarted <- newEmptyTMVarIO
      u <- askUnliftIO
-      liftIO $ do
-        labelMyThread "control port server"
-        runTCPServer cpStarted port $ runCPClient u srv
+      liftIO $ runTCPServer cpStarted port $ runCPClient u srv
      where
        runCPClient :: UnliftIO (ReaderT Env IO) -> Server -> Socket -> IO ()
        runCPClient u srv sock = do
-          labelMyThread "control port client"
          h <- socketToHandle sock ReadWriteMode
          hSetBuffering h LineBuffering
          hSetNewlineMode h universalNewlineMode
@@ -315,9 +306,8 @@ smpServer started cfg@ServerConfig {transports, transportConfig = tCfg} = do
                hPutStrLn h "saving server state..."
                unliftIO u $ saveServer True
                hPutStrLn h "server state saved!"
-              CPHelp -> hPutStrLn h "commands: stats, stats-rts, clients, threads, save, help, quit"
+              CPHelp -> hPutStrLn h "commands: stats, save, help, quit"
              CPQuit -> pure ()
-              CPSkip -> pure ()

 runClientTransport :: Transport c => THandle c -> M ()
 runClientTransport th@THandle {thVersion, sessionId} = do
@@ -357,14 +347,12 @@ cancelSub sub =
    _ -> return ()

 receive :: Transport c => THandle c -> Client -> M ()
-receive th Client {rcvQ, sndQ, activeAt, sessionId} = do
-  labelMyThread . B.unpack $ "client $" <> encode sessionId <> " receive"
-  forever $ do
-    ts <- L.toList <$> liftIO (tGet th)
-    atomically . writeTVar activeAt =<< liftIO getSystemTime
-    as <- partitionEithers <$> mapM cmdAction ts
-    write sndQ $ fst as
-    write rcvQ $ snd as
+receive th Client {rcvQ, sndQ, activeAt} = forever $ do
+  ts <- L.toList <$> liftIO (tGet th)
+  atomically . writeTVar activeAt =<< liftIO getSystemTime
+  as <- partitionEithers <$> mapM cmdAction ts
+  write sndQ $ fst as
+  write rcvQ $ snd as
  where
    cmdAction :: SignedTransmission ErrorType Cmd -> M (Either (Transmission BrokerMsg) (Maybe QueueRec, Transmission Cmd))
    cmdAction (sig, signed, (corrId, queueId, cmdOrError)) =
@@ -378,12 +366,10 @@ receive th Client {rcvQ, sndQ, activeAt, sessionId} = do
    write q = mapM_ (atomically . writeTBQueue q) . L.nonEmpty

 send :: Transport c => THandle c -> Client -> IO ()
-send h@THandle {thVersion = v} Client {sndQ, sessionId, activeAt} = do
-  labelMyThread . B.unpack $ "client $" <> encode sessionId <> " send"
-  forever $ do
-    ts <- atomically $ L.sortWith tOrder <$> readTBQueue sndQ
-    void . liftIO . tPut h Nothing $ L.map ((Nothing,) . encodeTransmission v sessionId) ts
-    atomically . writeTVar activeAt =<< liftIO getSystemTime
+send h@THandle {thVersion = v} Client {sndQ, sessionId, activeAt} = forever $ do
+  ts <- atomically $ L.sortWith tOrder <$> readTBQueue sndQ
+  void . liftIO . tPut h Nothing $ L.map ((Nothing,) . encodeTransmission v sessionId) ts
+  atomically . writeTVar activeAt =<< liftIO getSystemTime
  where
    tOrder :: Transmission BrokerMsg -> Int
    tOrder (_, _, cmd) = case cmd of
@@ -392,8 +378,7 @@ send h@THandle {thVersion = v} Client {sndQ, sessionId, activeAt} = do
      _ -> 1

 disconnectTransport :: Transport c => THandle c -> client -> (client -> TVar SystemTime) -> ExpirationConfig -> IO ()
-disconnectTransport THandle {connection, sessionId} c activeAt expCfg = do
-  labelMyThread . B.unpack $ "client $" <> encode sessionId <> " disconnectTransport"
+disconnectTransport THandle {connection} c activeAt expCfg = do
  let interval = checkInterval expCfg * 1000000
  forever . liftIO $ do
    threadDelay' interval
@@ -11,12 +11,9 @@ data ControlProtocol
  | CPResume
  | CPClients
  | CPStats
-  | CPStatsRTS
-  | CPThreads
  | CPSave
  | CPHelp
  | CPQuit
-  | CPSkip

 instance StrEncoding ControlProtocol where
  strEncode = \case
@@ -24,22 +21,16 @@ instance StrEncoding ControlProtocol where
    CPResume -> "resume"
    CPClients -> "clients"
    CPStats -> "stats"
-    CPStatsRTS -> "stats-rts"
-    CPThreads -> "threads"
    CPSave -> "save"
    CPHelp -> "help"
    CPQuit -> "quit"
-    CPSkip -> ""
  strP =
    A.takeTill (== ' ') >>= \case
      "suspend" -> pure CPSuspend
      "resume" -> pure CPResume
      "clients" -> pure CPClients
      "stats" -> pure CPStats
-      "stats-rts" -> pure CPStatsRTS
-      "threads" -> pure CPThreads
      "save" -> pure CPSave
      "help" -> pure CPHelp
      "quit" -> pure CPQuit
-      "" -> pure CPSkip
      _ -> fail "bad ControlProtocol command"
@@ -11,7 +11,7 @@ import qualified Data.Attoparsec.ByteString.Char8 as A
 import qualified Data.ByteString.Char8 as B
 import Data.Set (Set)
 import qualified Data.Set as S
-import Data.Time.Calendar.Month (pattern MonthDay)
+import Data.Time.Calendar.Month.Compat (pattern MonthDay)
 import Data.Time.Calendar.OrdinalDate (mondayStartWeek)
 import Data.Time.Clock (UTCTime (..))
 import Simplex.Messaging.Encoding.String
@@ -21,6 +21,7 @@ module Simplex.Messaging.Transport.Client
 where

 import Control.Applicative (optional)
+import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import Data.Aeson (FromJSON (..), ToJSON (..))
 import qualified Data.Attoparsec.ByteString.Char8 as A
@@ -10,7 +10,7 @@ module Simplex.Messaging.Transport.HTTP2.Client where
 import Control.Concurrent.Async
 import Control.Exception (IOException, try)
 import qualified Control.Exception as E
-import Control.Monad
+import Control.Monad.Except
 import Data.ByteString.Char8 (ByteString)
 import Data.Functor (($>))
 import Data.Time (UTCTime, getCurrentTime)
@@ -20,8 +20,9 @@ module Simplex.Messaging.Transport.Server
 where

 import Control.Applicative ((<|>))
+import Control.Concurrent.STM (stateTVar)
 import Control.Logger.Simple
-import Control.Monad
+import Control.Monad.Except
 import Control.Monad.IO.Unlift
 import qualified Crypto.Store.X509 as SX
 import Data.Default (def)
@@ -35,7 +36,7 @@ import qualified Network.TLS as T
 import Simplex.Messaging.TMap (TMap)
 import qualified Simplex.Messaging.TMap as TM
 import Simplex.Messaging.Transport
-import Simplex.Messaging.Util (catchAll_, labelMyThread, tshow)
+import Simplex.Messaging.Util (catchAll_, tshow)
 import System.Exit (exitFailure)
 import System.Mem.Weak (Weak, deRefWeak)
 import UnliftIO.Concurrent
@@ -71,7 +72,6 @@ runTransportServerSocket :: (MonadUnliftIO m, T.TLSParams p, Transport a) => TMV
 runTransportServerSocket started getSocket threadLabel serverParams cfg server = do
  u <- askUnliftIO
  let tCfg = serverTransportConfig cfg
-  labelMyThread $ "transport server for " <> threadLabel
  liftIO . runTCPServerSocket started getSocket $ \conn ->
    E.bracket
      (connectTLS Nothing tCfg serverParams conn >>= getServerConnection tCfg)
@@ -3,10 +3,11 @@

 module Simplex.Messaging.Util where

+import Control.Concurrent (threadDelay)
 import qualified Control.Exception as E
-import Control.Monad
 import Control.Monad.Except
 import Control.Monad.IO.Unlift
+import Control.Monad.Trans.Except
 import Data.Bifunctor (first)
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
@@ -18,7 +19,6 @@ import Data.Text (Text)
 import qualified Data.Text as T
 import Data.Text.Encoding (decodeUtf8With)
 import Data.Time (NominalDiffTime)
-import GHC.Conc (labelThread, myThreadId, threadDelay)
 import UnliftIO
 import qualified UnliftIO.Exception as UE

@@ -66,6 +66,14 @@ liftEitherWith :: MonadError e' m => (e -> e') -> Either e a -> m a
 liftEitherWith f = liftEither . first f
 {-# INLINE liftEitherWith #-}

+tryError :: MonadError e m => m a -> m (Either e a)
+tryError action = (Right <$> action) `catchError` (pure . Left)
+{-# INLINE tryError #-}
+
+tryE :: Monad m => ExceptT e m a -> ExceptT e m (Either e a)
+tryE m = (Right <$> m) `catchE` (pure . Left)
+{-# INLINE tryE #-}
+
 liftE :: (e -> e') -> ExceptT e IO a -> ExceptT e' IO a
 liftE f a = ExceptT $ first f <$> runExceptT a
 {-# INLINE liftE #-}
@@ -85,26 +93,6 @@ unlessM b = ifM b $ pure ()
 ($>>=) :: (Monad m, Monad f, Traversable f) => m (f a) -> (a -> m (f b)) -> m (f b)
 f $>>= g = f >>= fmap join . mapM g

-mapME :: (Monad m, Traversable t) => (a -> m (Either e b)) -> t (Either e a) -> m (t (Either e b))
-mapME f = mapM (mapE f)
-{-# INLINE mapME #-}
-
-mapME_ :: (Monad m, Traversable t) => (a -> m (Either e b)) -> t (Either e a) -> m ()
-mapME_ f = mapM_ (mapE f)
-{-# INLINE mapME_ #-}
-
-mapE :: Monad m => (a -> m (Either e b)) -> Either e a -> m (Either e b)
-mapE = either (pure . Left)
-{-# INLINE mapE #-}
-
-forME :: (Monad m, Traversable t) => t (Either e a) -> (a -> m (Either e b)) -> m (t (Either e b))
-forME = flip mapME
-{-# INLINE forME #-}
-
-forME_ :: (Monad m, Traversable t) => t (Either e a) -> (a -> m (Either e b)) -> m ()
-forME_ f = void . forME f
-{-# INLINE forME_ #-}
-
 catchAll :: IO a -> (E.SomeException -> IO a) -> IO a
 catchAll = E.catch
 {-# INLINE catchAll #-}
@@ -172,6 +160,3 @@ diffToMicroseconds diff = fromIntegral ((truncate $ diff * 1000000) :: Integer)

 diffToMilliseconds :: NominalDiffTime -> Int64
 diffToMilliseconds diff = fromIntegral ((truncate $ diff * 1000) :: Integer)
-
-labelMyThread :: MonadIO m => String -> m ()
-labelMyThread label = liftIO $ myThreadId >>= (`labelThread` label)
@@ -0,0 +1,86 @@
+# This file was automatically generated by 'stack init'
+#
+# Some commonly used options have been documented as comments in this file.
+# For advanced use and comprehensive documentation of the format, please see:
+# https://docs.haskellstack.org/en/stable/yaml_configuration/
+
+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
+# A snapshot resolver dictates the compiler version and the set of packages
+# to be used for project dependencies. For example:
+#
+# resolver: lts-3.5
+# resolver: nightly-2015-09-21
+# resolver: ghc-7.10.2
+#
+# The location of a snapshot can be provided as a file or url. Stack assumes
+# a snapshot provided as a file might change, whereas a url resource does not.
+#
+# resolver: ./custom-snapshot.yaml
+# resolver: https://example.com/snapshots/2018-01-01.yaml
+resolver: lts-18.28
+
+# User packages to be built.
+# Various formats can be used as shown in the example below.
+#
+# packages:
+# - some-directory
+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
+#   subdirs:
+#   - auto-update
+#   - wai
+packages:
+  - .
+# Dependency packages to be pulled from upstream that are not in the resolver.
+# These entries can reference officially published versions as well as
+# forks / in-progress versions pinned to a git hash. For example:
+#
+extra-deps:
+  - cryptostore-0.2.1.0@sha256:9896e2984f36a1c8790f057fd5ce3da4cbcaf8aa73eb2d9277916886978c5b19,3881
+  - network-3.1.2.7@sha256:e3d78b13db9512aeb106e44a334ab42b7aa48d26c097299084084cb8be5c5568,4888
+  - simple-logger-0.1.0@sha256:be8ede4bd251a9cac776533bae7fb643369ebd826eb948a9a18df1a8dd252ff8,1079
+  - tls-1.6.0@sha256:7ae39373fd2de27fb80e90f76d22aeeb9a074a0ddd120cbd02c9c52f516a9e55,6987
+  # below dependencies are to update Aeson to 2.0.3
+  - OneTuple-0.3.1@sha256:a848c096c9d29e82ffdd30a9998aa2931cbccb3a1bc137539d80f6174d31603e,2262
+  - attoparsec-0.14.4@sha256:79584bdada8b730cb5138fca8c35c76fbef75fc1d1e01e6b1d815a5ee9843191,5810
+  - hashable-1.4.0.2@sha256:0cddd0229d1aac305ea0404409c0bbfab81f075817bd74b8b2929eff58333e55,5005
+  - semialign-1.2.0.1@sha256:0e179b4d3a8eff79001d374d6c91917c6221696b9620f0a4d86852fc6a9b9501,2836
+  - text-short-0.1.5@sha256:962c6228555debdc46f758d0317dea16e5240d01419b42966674b08a5c3d8fa6,3498
+  - time-compat-1.9.6.1@sha256:42d8f2e08e965e1718917d54ad69e1d06bd4b87d66c41dc7410f59313dba4ed1,5033
+  - github: simplex-chat/aeson
+    commit: aab7b5a14d6c5ea64c64dcaee418de1bb00dcc2b
+  - github: kazu-yamamoto/http2
+    commit: f5525b755ff2418e6e6ecc69e877363b0d0bcaeb
+  # - ../direct-sqlcipher
+  - github: simplex-chat/direct-sqlcipher
+    commit: 34309410eb2069b029b8fc1872deb1e0db123294
+  # - ../sqlcipher-simple
+  - github: simplex-chat/sqlcipher-simple
+    commit: 5e154a2aeccc33ead6c243ec07195ab673137221
+  # - ../hs-tls/core
+  # - github: simplex-chat/hs-tls
+  #   commit: f6cc753611f80af300401cfae63846e9d7c40d9e
+  #   subdirs:
+  #     - core
+# Override default flag values for local packages and extra-deps
+# flags: {}
+
+# Extra package databases containing global packages
+# extra-package-dbs: []
+
+# Control whether we use the GHC we find on the path
+# system-ghc: true
+#
+# Require a specific version of stack, using version ranges
+# require-stack-version: -any # Default
+# require-stack-version: ">=2.1"
+#
+# Override the architecture used by stack, especially useful on Windows
+# arch: i386
+# arch: x86_64
+#
+# Extra directories used by stack for building
+# extra-include-dirs: [/path/to/dir]
+# extra-lib-dirs: [/path/to/dir]
+#
+# Allow a newer minor version of GHC than the snapshot specifies
+# compiler-check: newer-minor
@@ -2,7 +2,6 @@
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}

 module AgentTests.ConnectionRequestTests where

@@ -61,6 +61,7 @@ import qualified Simplex.Messaging.Protocol as SMP
 import Simplex.Messaging.Server.Env.STM (ServerConfig (..))
 import Simplex.Messaging.Server.Expiration
 import Simplex.Messaging.Transport (ATransport (..))
+import Simplex.Messaging.Util (tryError)
 import Simplex.Messaging.Version
 import System.Directory (copyFile, renameFile)
 import Test.Hspec
@@ -1010,35 +1011,34 @@ testOnlyCreatePull :: IO ()
 testOnlyCreatePull = withAgentClients2 $ \alice bob -> runRight_ $ do
  (bobId, qInfo) <- createConnection alice 1 True SCMInvitation Nothing SMOnlyCreate
  aliceId <- joinConnection bob 1 True qInfo "bob's connInfo" SMOnlyCreate
-  Just ("", _, CONF confId _ "bob's connInfo") <- getMsg alice bobId $ timeout 5_000000 $ get alice
+  getMsg alice bobId
+  Just ("", _, CONF confId _ "bob's connInfo") <- timeout 5_000000 $ get alice
  allowConnection alice bobId confId "alice's connInfo"
  liftIO $ threadDelay 1_000000
-  getMsg bob aliceId $
-    get bob ##> ("", aliceId, INFO "alice's connInfo")
+  getMsg bob aliceId
+  get bob ##> ("", aliceId, INFO "alice's connInfo")
  liftIO $ threadDelay 1_000000
-  getMsg alice bobId $ pure ()
+  getMsg alice bobId
  get alice ##> ("", bobId, CON)
-  getMsg bob aliceId $
-    get bob ##> ("", aliceId, CON)
+  getMsg bob aliceId
+  get bob ##> ("", aliceId, CON)
  -- exchange messages
  4 <- sendMessage alice bobId SMP.noMsgFlags "hello"
  get alice ##> ("", bobId, SENT 4)
-  getMsg bob aliceId $
-    get bob =##> \case ("", c, Msg "hello") -> c == aliceId; _ -> False
+  getMsg bob aliceId
+  get bob =##> \case ("", c, Msg "hello") -> c == aliceId; _ -> False
  ackMessage bob aliceId 4 Nothing
  5 <- sendMessage bob aliceId SMP.noMsgFlags "hello too"
  get bob ##> ("", aliceId, SENT 5)
-  getMsg alice bobId $
-    get alice =##> \case ("", c, Msg "hello too") -> c == bobId; _ -> False
+  getMsg alice bobId
+  get alice =##> \case ("", c, Msg "hello too") -> c == bobId; _ -> False
  ackMessage alice bobId 5 Nothing
  where
-    getMsg :: AgentClient -> ConnId -> ExceptT AgentErrorType IO a -> ExceptT AgentErrorType IO a
-    getMsg c cId action = do
+    getMsg :: AgentClient -> ConnId -> ExceptT AgentErrorType IO ()
+    getMsg c cId = do
      liftIO $ noMessages c "nothing should be delivered before GET"
      Just _ <- getConnectionMessage c cId
-      r <- action
-      get c =##> \case ("", cId', MSGNTF _) -> cId == cId'; _ -> False
-      pure r
+      pure ()

 makeConnection :: AgentClient -> AgentClient -> ExceptT AgentErrorType IO (ConnId, ConnId)
 makeConnection alice bob = makeConnectionForUsers alice 1 bob 1
@@ -2050,7 +2050,7 @@ testTwoUsers = withAgentClients2 $ \a b -> do

 getSMPAgentClient' :: AgentConfig -> InitialAgentServers -> FilePath -> IO AgentClient
 getSMPAgentClient' cfg' initServers dbPath = do
-  Right st <- liftIO $ createAgentStore dbPath "" False MCError
+  Right st <- liftIO $ createAgentStore dbPath "" MCError
  getSMPAgentClient cfg' initServers st

 testServerMultipleIdentities :: HasCallStack => IO ()
@@ -178,16 +178,16 @@ testMigration ::
 testMigration (initMs, initTables) (finalMs, confirmModes, tablesOrError) = forM_ confirmModes $ \confirmMode -> do
  r <- randomIO :: IO Word32
  let dpPath = testDB <> show r
-  Right st <- createSQLiteStore dpPath "" False initMs MCError
+  Right st <- createSQLiteStore dpPath "" initMs MCError
  st `shouldHaveTables` initTables
  closeSQLiteStore st
  case tablesOrError of
    Right tables -> do
-      Right st' <- createSQLiteStore dpPath "" False finalMs confirmMode
+      Right st' <- createSQLiteStore dpPath "" finalMs confirmMode
      st' `shouldHaveTables` tables
      closeSQLiteStore st'
    Left e -> do
-      Left e' <- createSQLiteStore dpPath "" False finalMs confirmMode
+      Left e' <- createSQLiteStore dpPath "" finalMs confirmMode
      e `shouldBe` e'
  removeFile dpPath
  where
@@ -11,9 +11,7 @@ module AgentTests.NotificationTests where
 -- import Control.Logger.Simple (LogConfig (..), LogLevel (..), setLogLevel, withGlobalLogging)
 import AgentTests.FunctionalAPITests (exchangeGreetingsMsgId, get, getSMPAgentClient', makeConnection, nGet, runRight, runRight_, switchComplete, testServerMatrix2, (##>), (=##>), pattern Msg)
 import Control.Concurrent (killThread, threadDelay)
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.Trans.Except
 import qualified Data.Aeson as J
 import qualified Data.Aeson.Types as JT
 import Data.Bifunctor (bimap, first)
@@ -35,6 +33,7 @@ import Simplex.Messaging.Protocol (ErrorType (AUTH), MsgFlags (MsgFlags), SMPMsg
 import qualified Simplex.Messaging.Protocol as SMP
 import Simplex.Messaging.Server.Env.STM (ServerConfig (..))
 import Simplex.Messaging.Transport (ATransport)
+import Simplex.Messaging.Util (tryE)
 import System.Directory (doesFileExist, removeFile)
 import Test.Hspec
 import UnliftIO
@@ -7,7 +7,6 @@
 {-# LANGUAGE QuasiQuotes #-}
 {-# LANGUAGE RecordWildCards #-}
 {-# LANGUAGE ScopedTypeVariables #-}
-{-# OPTIONS_GHC -fno-warn-ambiguous-fields #-}

 module AgentTests.SQLiteTests (storeTests) where

@@ -16,7 +15,6 @@ import Control.Concurrent.STM
 import Control.Exception (SomeException)
 import Control.Monad (replicateM_)
 import Crypto.Random (drgNew)
-import Data.ByteArray (ScrubbedBytes)
 import Data.ByteString.Char8 (ByteString)
 import Data.List (isInfixOf)
 import qualified Data.Text as T
@@ -50,18 +48,18 @@ withStore2 = before connect2 . after (removeStore . fst)
    connect2 :: IO (SQLiteStore, SQLiteStore)
    connect2 = do
      s1 <- createStore
-      s2 <- connectSQLiteStore (dbFilePath s1) "" False
+      s2 <- connectSQLiteStore (dbFilePath s1) ""
      pure (s1, s2)

 createStore :: IO SQLiteStore
-createStore = createEncryptedStore "" False
+createStore = createEncryptedStore ""

-createEncryptedStore :: ScrubbedBytes -> Bool -> IO SQLiteStore
-createEncryptedStore key keepKey = do
+createEncryptedStore :: String -> IO SQLiteStore
+createEncryptedStore key = do
  -- Randomize DB file name to avoid SQLite IO errors supposedly caused by asynchronous
  -- IO operations on multiple similarly named files; error seems to be environment specific
  r <- randomIO :: IO Word32
-  Right st <- createSQLiteStore (testDB <> show r) key keepKey Migrations.app MCError
+  Right st <- createSQLiteStore (testDB <> show r) key Migrations.app MCError
  pure st

 removeStore :: SQLiteStore -> IO ()
@@ -113,7 +111,6 @@ storeTests = do
  describe "open/close store" $ do
    it "should close and re-open" testCloseReopenStore
    it "should close and re-open encrypted store" testCloseReopenEncryptedStore
-    it "should close and re-open encrypted store (keep key)" testReopenEncryptedStoreKeepKey

 testConcurrentWrites :: SpecWith (SQLiteStore, SQLiteStore)
 testConcurrentWrites =
@@ -522,39 +519,28 @@ testCloseReopenStore = do
  closeSQLiteStore st
  closeSQLiteStore st
  errorGettingMigrations st
-  openSQLiteStore st "" False
-  openSQLiteStore st "" False
+  openSQLiteStore st ""
+  openSQLiteStore st ""
  hasMigrations st
  closeSQLiteStore st
  errorGettingMigrations st
-  reopenSQLiteStore st
+  openSQLiteStore st ""
  hasMigrations st

 testCloseReopenEncryptedStore :: IO ()
 testCloseReopenEncryptedStore = do
  let key = "test_key"
-  st <- createEncryptedStore key False
+  st <- createEncryptedStore key
  hasMigrations st
  closeSQLiteStore st
  closeSQLiteStore st
  errorGettingMigrations st
-  reopenSQLiteStore st `shouldThrow` \(e :: SomeException) -> "reopenSQLiteStore: no key" `isInfixOf` show e
-  openSQLiteStore st key True
-  openSQLiteStore st key True
+  openSQLiteStore st key
+  openSQLiteStore st key
  hasMigrations st
  closeSQLiteStore st
  errorGettingMigrations st
-  reopenSQLiteStore st
-  hasMigrations st
-
-testReopenEncryptedStoreKeepKey :: IO ()
-testReopenEncryptedStoreKeepKey = do
-  let key = "test_key"
-  st <- createEncryptedStore key True
-  hasMigrations st
-  closeSQLiteStore st
-  errorGettingMigrations st
-  reopenSQLiteStore st
+  openSQLiteStore st key
  hasMigrations st

 getMigrations :: SQLiteStore -> IO Bool
@@ -33,14 +33,14 @@ testVerifySchemaDump :: IO ()
 testVerifySchemaDump = do
  savedSchema <- ifM (doesFileExist appSchema) (readFile appSchema) (pure "")
  savedSchema `deepseq` pure ()
-  void $ createSQLiteStore testDB "" False Migrations.app MCConsole
+  void $ createSQLiteStore testDB "" Migrations.app MCConsole
  getSchema testDB appSchema `shouldReturn` savedSchema
  removeFile testDB

 testSchemaMigrations :: IO ()
 testSchemaMigrations = do
  let noDownMigrations = dropWhileEnd (\Migration {down} -> isJust down) Migrations.app
-  Right st <- createSQLiteStore testDB "" False noDownMigrations MCError
+  Right st <- createSQLiteStore testDB "" noDownMigrations MCError
  mapM_ (testDownMigration st) $ drop (length noDownMigrations) Migrations.app
  closeSQLiteStore st
  removeFile testDB
@@ -3,7 +3,7 @@
 module CoreTests.BatchingTests (batchingTests) where

 import Control.Concurrent.STM
-import Control.Monad
+import Control.Monad.Except
 import Crypto.Random (MonadRandom (..))
 import Data.ByteString.Char8 (ByteString)
 import qualified Data.ByteString.Char8 as B
@@ -4,7 +4,6 @@ module CoreTests.CryptoFileTests (cryptoFileTests) where

 import AgentTests.FunctionalAPITests (runRight_)
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Crypto.Random (getRandomBytes)
 import qualified Data.ByteString.Lazy as LB
 import GHC.IO.IOMode (IOMode (..))
@@ -4,7 +4,6 @@ module CoreTests.UtilTests where

 import Control.Exception (Exception, SomeException, throwIO)
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import Data.IORef
 import Simplex.Messaging.Client.Agent ()
 import Simplex.Messaging.Util
@@ -5,6 +5,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE NumericUnderscores #-}
 {-# LANGUAGE OverloadedLists #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
@@ -213,7 +213,7 @@ withSmpAgentThreadOn_ t (port', smpPort', db') afterProcess =
      initServers' = initAgentServers {smp = userServers [ProtoServerWithAuth (SMPServer "localhost" smpPort' testKeyHash) Nothing]}
   in serverBracket
        ( \started -> do
-            Right st <- liftIO $ createAgentStore db' "" False MCError
+            Right st <- liftIO $ createAgentStore db' "" MCError
            runSMPAgentBlocking t cfg' initServers' st started
        )
        afterProcess
@@ -15,7 +15,7 @@ import AgentTests.NotificationTests (removeFileIfExists)
 import Control.Concurrent (ThreadId, killThread, threadDelay)
 import Control.Concurrent.STM
 import Control.Exception (SomeException, try)
-import Control.Monad
+import Control.Monad.Except (forM, forM_)
 import Control.Monad.IO.Class
 import Data.Bifunctor (first)
 import Data.ByteString.Base64
@@ -9,9 +9,7 @@ module XFTPAgent where
 import AgentTests.FunctionalAPITests (get, getSMPAgentClient', rfGet, runRight, runRight_, sfGet)
 import Control.Concurrent (threadDelay)
 import Control.Logger.Simple
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Class
 import qualified Data.ByteString.Char8 as B
 import qualified Data.ByteString.Lazy as LB
 import Data.Int (Int64)
@@ -10,9 +10,7 @@ import AgentTests.FunctionalAPITests (runRight_)
 import Control.Concurrent (threadDelay)
 import Control.Concurrent.STM
 import Control.Exception (SomeException)
-import Control.Monad
 import Control.Monad.Except
-import Control.Monad.IO.Unlift
 import Crypto.Random (getRandomBytes)
 import qualified Data.ByteString.Base64.URL as B64
 import Data.ByteString.Char8 (ByteString)
@@ -142,7 +140,7 @@ runTestFileChunkDelete s r = do
  deleteXFTPChunk s spKey sId
  liftIO $
    readChunk sId
-      `shouldThrow` \(e :: SomeException) -> "does not exist" `isInfixOf` show e
+      `shouldThrow` \(e :: SomeException) -> "withBinaryFile" `isInfixOf` show e
  downloadXFTPChunk r rpKey rId (XFTPRcvChunkSpec "tests/tmp/received_chunk2" chSize digest)
    `catchError` (liftIO . (`shouldBe` PCEProtocolError AUTH))
  deleteXFTPChunk s spKey sId
Author	SHA1	Message	Date
Evgeny Poberezkin	257982ccce	Merge branch 'master' into master-ghc8107	2023-11-29 13:00:20 +00:00
Evgeny Poberezkin	281bdebcb8	Merge branch 'master' into master-ghc8107	2023-11-21 20:51:27 +00:00
Evgeny Poberezkin	6926b45703	fix for ghc 8.10.7	2023-11-20 12:29:11 +00:00
Evgeny Poberezkin	2991644e9f	Merge branch 'master' into master-ghc8107	2023-11-20 12:19:09 +00:00
Evgeny Poberezkin	20d9767c54	Merge branch 'master' into master-ghc8107	2023-11-16 17:57:05 +00:00
Evgeny Poberezkin	897001efbf	Merge branch 'master' into master-ghc8107	2023-11-11 09:37:34 +00:00
Evgeny Poberezkin	f3045563ed	Merge branch 'master' into master-ghc8107	2023-11-04 12:51:07 +00:00
Evgeny Poberezkin	3a2969c44a	Merge branch 'master' into master-ghc8107	2023-10-29 16:46:26 +00:00
Evgeny Poberezkin	26b551132e	Merge branch 'master' into master-ghc8107	2023-10-26 10:24:01 +01:00
spaced4ndy	bba7ad3494	Merge branch 'master' into master-ghc8107	2023-10-25 10:25:29 +04:00
spaced4ndy	6e2bb08026	Merge branch 'master' into master-ghc8107	2023-10-24 17:21:31 +04:00
spaced4ndy	05a794b5fd	Merge branch 'master' into master-ghc8107	2023-10-24 16:57:06 +04:00
Evgeny Poberezkin	9dfc0e0e92	Merge branch 'master' into master-ghc8107	2023-10-22 12:02:19 +01:00
spaced4ndy	2a43717738	Merge branch 'master' into master-ghc8107	2023-10-16 19:25:26 +04:00
Evgeny Poberezkin	9f0f53d2ec	Merge branch 'master' into master-ghc8107	2023-10-07 18:02:57 +01:00
Evgeny Poberezkin	cf7fbf8a54	Merge branch 'master' into master-ghc8107	2023-10-05 22:30:15 +01:00
Evgeny Poberezkin	6087628c59	Merge branch 'master' into master-ghc8107	2023-10-05 12:01:12 +01:00
Evgeny Poberezkin	899d26e8c8	Merge branch 'master' into master-ghc8107	2023-09-29 12:35:30 +01:00
Evgeny Poberezkin	e7bd0fb31a	Merge branch 'master' into master-ghc8107	2023-09-27 15:46:15 +01:00
Evgeny Poberezkin	53c793d559	Merge branch 'master' into master-ghc8107	2023-09-21 11:59:46 +01:00
Evgeny Poberezkin	3438655532	Merge branch 'master-ghc9' into master-ghc8107 without applying any changes	2023-09-18 21:05:36 +01:00