Merge remote-tracking branch 'origin/pp/evm' into pp/evm

Author: larskuhtz

bench/Chainweb/Pact/Backend/ApplyCmd.hs

@@ -100,7 +100,7 @@ benchApplyCmd ver rdb act =
             lgr <- testLogger
 
             psEnvVar <- newEmptyMVar
-            tid <- forkIO $ void $ withPactService ver chain0 lgr Nothing bhdb (_bdbPayloadDb tdb) sql testPactServiceConfig $ do
+            tid <- forkIO $ void $ withPactService ver chain0 lgr Nothing bhdb (_bdbPayloadDb tdb) sql defaultPactServiceConfig $ do
                 initialPayloadState ver chain0
                 psEnv <- ask
                 liftIO $ putMVar psEnvVar psEnv

bench/Chainweb/Pact/Backend/ForkingBench.hs

@@ -248,7 +248,7 @@ withResources rdb trunkLength logLevel f = C.envWithCleanup create destroy unwra
 
     startPact version l bhdb pdb mempool sqlEnv = do
         reqQ <- newPactQueue pactQueueSize
-        a <- async $ runPactService version cid l Nothing reqQ mempool bhdb pdb sqlEnv testPactServiceConfig
+        a <- async $ runPactService version cid l Nothing reqQ mempool bhdb pdb sqlEnv defaultPactServiceConfig
             { _pactNewBlockGasLimit = 180_000
             , _pactPersistIntraBlockWrites = p
             }

bench/Chainweb/Pact/Backend/PactService.hs

@@ -166,7 +166,7 @@ destroyFixture fx = do
 oneBlock :: ChainwebVersion -> RocksDb -> Word -> C.Benchmarkable
 oneBlock v rdb numTxs =
     let cid = unsafeChainId 0
-        cfg = testPactServiceConfig
+        cfg = defaultPactServiceConfig
 
         setupEnv _ = do
             fx <- createFixture v rdb cfg

cabal.project

@@ -101,7 +101,7 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/kadena-io/pact-5.git
-    tag: 166fdba5e6b50a5528eba72fc8e1ca835538899d
+    tag: 18a8a1c192f30c9f22561a834478a7a664fcf4a3
     --sha256: 15bzwmhjh9733ngbqp83n95fxsncscsx6l144y964ydii47ri3i8
 
 source-repository-package

cabal.project.freeze

@@ -1,6 +1,6 @@
 active-repositories: hackage.haskell.org:merge
-constraints: any.Cabal ==3.10.2.0,
-             any.Cabal-syntax ==3.10.2.0,
+constraints: any.Cabal ==3.14.1.0,
+             any.Cabal-syntax ==3.14.2.0,
              any.Decimal ==0.5.2,
              any.Diff ==1.0.2,
              any.Glob ==0.10.2,
@@ -332,7 +332,7 @@ constraints: any.Cabal ==3.10.2.0,
              any.random ==1.3.1,
              any.raw-strings-qq ==1.1,
              any.recover-rtti ==0.5.0,
-             any.recv ==0.1.0,
+             any.recv ==0.1.1,
              any.reducers ==3.12.5,
              any.reflection ==2.1.9,
              reflection -slow +template-haskell,
@@ -420,7 +420,7 @@ constraints: any.Cabal ==3.10.2.0,
              any.terminal-progress-bar ==0.4.2,
              any.terminal-size ==0.3.4,
              any.terminfo ==0.4.1.6,
-             any.texmath ==0.12.9,
+             any.texmath ==0.12.10,
              texmath -executable -server,
              any.text ==2.1.1,
              any.text-conversions ==0.3.1.1,
@@ -447,7 +447,7 @@ constraints: any.Cabal ==3.10.2.0,
              any.tls-session-manager ==0.0.8,
              any.token-bucket ==0.1.0.1,
              token-bucket +use-cbits,
-             any.toml-parser ==2.0.1.0,
+             any.toml-parser ==2.0.1.2,
              any.torsor ==0.1.0.1,
              any.transformers ==0.6.1.0,
              any.transformers-base ==0.4.6,
@@ -522,4 +522,4 @@ constraints: any.Cabal ==3.10.2.0,
              zip-archive -executable,
              any.zlib ==0.7.1.0,
              zlib -bundled-c-zlib +non-blocking-ffi +pkg-config
-index-state: hackage.haskell.org 2025-04-21T12:07:04Z
+index-state: hackage.haskell.org 2025-05-02T15:38:56Z

chainweb.cabal

@@ -550,6 +550,7 @@ library chainweb-test-utils
         , quickcheck-instances >= 0.3
         , random >= 1.3
         , resourcet >= 1.3
+        , resource-pool >= 0.4
         , retry >= 0.7
         , rocksdb-haskell-kadena >= 1.1.0
         , safe-exceptions >= 0.1
@@ -726,7 +727,7 @@ test-suite chainweb-tests
         Chainweb.Test.Pact.HyperlanePluginTests
         Chainweb.Test.Pact.PactServiceTest
         Chainweb.Test.Pact.RemotePactTest
-        Chainweb.Test.Pact.SPVTest
+        -- Chainweb.Test.Pact.SPVTest
         Chainweb.Test.Pact.TransactionExecTest
         Chainweb.Test.Pact.TransactionTests
         Chainweb.Test.RestAPI

cwtools/cwtools.cabal

@@ -174,12 +174,14 @@ executable ea
         , async
         , base
         , chainweb-storage
+        , filepath
         , lens
         , loglevel
         , pact-json
         , pact-tng:pact-request-api
         , pact-tng
         , resource-pool
+        , resourcet
         , temporary
         , text
         , vector

cwtools/ea/Ea.hs

@@ -33,7 +33,7 @@ import Chainweb.Logger (genericLogger)
 import Chainweb.Miner.Pact (noMiner)
 import Chainweb.Pact.Backend.Utils
 import Chainweb.Pact.PactService
-import Chainweb.Pact.Types (testPactServiceConfig)
+import Chainweb.Pact.Types (defaultPactServiceConfig, GenesisConfig(..))
 import Chainweb.Pact.Utils (toTxCreationTime, emptyPayload)
 import Chainweb.Pact.Transaction qualified as Pact
 import Chainweb.Pact.Validations (defaultMaxTTLSeconds)
@@ -48,6 +48,8 @@ import Chainweb.Version.RecapDevelopment (pattern RecapDevelopment)
 import Chainweb.Version.Registry (registerVersion)
 import Control.Concurrent.Async
 import Control.Exception
+import Control.Monad.Trans.Resource
+import Control.Monad.IO.Class
 import Control.Lens
 import Data.Aeson qualified as Aeson
 import Data.Foldable
@@ -63,6 +65,7 @@ import Data.Traversable
 import Data.Vector qualified as V
 import Ea.Genesis
 import GHC.Exts(the)
+import System.FilePath
 import System.LogLevel
 import System.IO.Temp
 import Text.Printf
@@ -155,11 +158,11 @@ genPayloadModule :: ChainwebVersion -> Text -> Chainweb.ChainId -> [Pact.Transac
 genPayloadModule v tag cid cwTxs = do
     let logger = genericLogger Warn TIO.putStrLn
     pdb <- newPayloadDb
-    withSystemTempDirectory "ea-pact-db" $ \pactDbDir -> do
-        payloadWO <- withSqliteDb cid logger pactDbDir False $ \readWriteSql -> do
-            roPool <- Pool.newPool $ Pool.defaultPoolConfig (startReadSqliteDb cid logger pactDbDir) stopSqliteDb 10 10
-            withPactService v cid Nothing mempty logger Nothing pdb roPool readWriteSql (testPactServiceConfig emptyPayload) $ \serviceEnv ->
-                execNewGenesisBlock logger serviceEnv (V.fromList cwTxs)
+    withSystemTempDirectory "ea-pact-db" $ \pactDbDir -> runResourceT $ do
+        readWriteSql <- withSqliteDb cid logger pactDbDir False
+        roPool <- withReadSqlitePool cid pactDbDir
+        serviceEnv <- withPactService v cid Nothing mempty logger Nothing pdb roPool readWriteSql defaultPactServiceConfig GeneratingGenesis
+        payloadWO <- liftIO $ execNewGenesisBlock logger serviceEnv (V.fromList cwTxs)
         return $ TL.toStrict $ TB.toLazyText $ payloadModuleCode tag payloadWO
 
 mkChainwebTxs :: [FilePath] -> IO [Pact.Transaction]

cwtools/ea/Ea/Genesis.hs

@@ -61,7 +61,7 @@ module Ea.Genesis
 import Control.Lens
 import Control.Monad
 
-import Data.Text
+import Data.Text (Text)
 import Data.Word
 
 import Chainweb.Graph

node/Setup.hs

@@ -8,6 +8,7 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiWayIf #-}
+{-# LANGUAGE ViewPatterns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 
@@ -133,7 +134,7 @@ import System.Directory
     doesFileExist, getCurrentDirectory)
 import System.Environment (lookupEnv)
 import System.Exit (ExitCode(ExitSuccess))
-import System.FilePath (isDrive, takeDirectory, (</>))
+import System.FilePath (isDrive, takeDirectory)
 
 -- | Include this function when your setup doesn't contain any
 -- extra functionality.
@@ -183,7 +184,7 @@ mkPkgInfoModulesPostConf hook args flags pkgDesc bInfo = do
 
 updatePkgInfoModule :: PackageDescription -> LocalBuildInfo -> ComponentLocalBuildInfo -> IO ()
 updatePkgInfoModule pkgDesc bInfo clbInfo = do
-    createDirectoryIfMissing True dirName
+    createDirectoryIfMissing True $ interpretSymbolicPathCWD dirName
     moduleBytes <- pkgInfoModule moduleName cName pkgDesc bInfo
     updateFile fileName moduleBytes
 
@@ -196,19 +197,19 @@ updatePkgInfoModule pkgDesc bInfo clbInfo = do
     cName = unUnqualComponentName <$> componentNameString (componentLocalName clbInfo)
 
     moduleName = pkgInfoModuleName
-    fileName = dirName ++ "/" ++ moduleName ++ ".hs"
+    fileName = dirName </> unsafeMakeSymbolicPath moduleName <.> ".hs"
 
     legacyModuleName = legacyPkgInfoModuleName cName
-    legacyFileName = dirName ++ "/" ++ legacyModuleName ++ ".hs"
+    legacyFileName = dirName </> unsafeMakeSymbolicPath legacyModuleName <.> ".hs"
 
 -- -------------------------------------------------------------------------- --
 -- Generate PkgInfo Module
 
 pkgInfoModuleName :: String
 pkgInfoModuleName = "PkgInfo"
 
-updateFile :: FilePath -> B.ByteString -> IO ()
-updateFile fileName content = do
+updateFile :: SymbolicPath from to -> B.ByteString -> IO ()
+updateFile (interpretSymbolicPathCWD -> fileName) content = do
     x <- doesFileExist fileName
     if | not x -> update
        | otherwise -> do