From 1c9ec417b8a124ebbd3f635588c919f9ec3b827b Mon Sep 17 00:00:00 2001
From: Mate Soos <mate.soos@ethereum.org>
Date: Mon, 4 Mar 2024 14:22:53 +0100
Subject: [PATCH] Using with-utf8 so we don't encounter weird utf8 issues
 anymore

---
 CHANGELOG.md | 6 +++---
 cli/cli.hs   | 3 ++-
 hevm.cabal   | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bca5f6b3a..3ae5f2ddf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,12 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## Added
 
 ## Fixed
--- `concat` is a 2-ary, not an n-ary function in SMT2LIB, declare-const does not exist in QF_AUFBV, replacing
+- `concat` is a 2-ary, not an n-ary function in SMT2LIB, declare-const does not exist in QF_AUFBV, replacing
    with declare-fun
+- CVC5 needs `--incremental` flag to work properly in abstraction-refinement mode
+- cli.hs now uses with-utf8 so no release binary will have locale issues anymore
 
 ## [0.53.0] - 2024-02-23
 
-
 ## Changed
 
 - Minimum distance requirements are now asserted for Keccak function calls. They assert that it's hard to generate two Keccak's that are less than 256 afar.
@@ -47,7 +48,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Traces now correctly perform source mapping to display contract details
 - Event traces now correctly display indexed arguments and argument names
 - JSON reading of foundry JSONs was dependent on locale and did not work with many locales.
-- CVC5 needs `--incremental` flag to work properly in abstraction-refinement mode
 
 ## [0.52.0] - 2023-10-26
 
diff --git a/cli/cli.hs b/cli/cli.hs
index 48e076915..7dfa31c92 100644
--- a/cli/cli.hs
+++ b/cli/cli.hs
@@ -26,6 +26,7 @@ import Paths_hevm qualified as Paths
 import System.Directory (withCurrentDirectory, getCurrentDirectory, doesDirectoryExist, makeAbsolute)
 import System.FilePath ((</>))
 import System.Exit (exitFailure, exitWith, ExitCode(..))
+import Main.Utf8 (withUtf8)
 
 import EVM (initialContract, abstractContract, makeVm)
 import EVM.ABI (Sig(..))
@@ -197,7 +198,7 @@ getFullVersion = showVersion Paths.version <> " [" <> gitVersion <> "]"
       Left _ -> "no git revision present"
 
 main :: IO ()
-main = do
+main = withUtf8 $ do
   cmd <- Options.unwrapRecord "hevm -- Ethereum evaluator"
   let env = Env { config = defaultConfig
     { dumpQueries = cmd.smtdebug
diff --git a/hevm.cabal b/hevm.cabal
index 1ef0b1cee..8608b7a83 100644
--- a/hevm.cabal
+++ b/hevm.cabal
@@ -236,7 +236,8 @@ executable hevm
     optics-core,
     githash                       >= 0.1.6 && < 0.2,
     witch,
-    unliftio-core
+    unliftio-core,
+    with-utf8                     >= 1.0.0.0
   if os(windows)
     buildable: False