Update base64-bytestring-kadena and cabal.project.freeze

kadena-io · May 31, 2024 · e4beac7 · e4beac7
1 parent c7bd0c7
commit e4beac7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/cabal.project b/cabal.project
@@ -86,8 +86,8 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/kadena-io/pact-5.git
-    tag: 8b1c652aad086d8026a34582f3012964602aead4
-    --sha256: 1hzpsbfzwm33jd1asws4d84kyqbw5kl98m926mkfkv4n7yadajpp
+    tag: 3e5454901b4480bdcebe32fdd06e07555bd9a103
+    --sha256: sha256-/bEUYaQFGlbYWTU+pBuqQd0SDDiD0az7zdq59mZnek0=
 
 source-repository-package
     type: git
@@ -144,9 +144,9 @@ source-repository-package
 -- Required for non-canonical decode in base64-bytestring (remove after 2.20 fork)
 source-repository-package
     type: git
-    location: https://github.com/emilypi/base64-bytestring-kadena
-    tag: 174af3523616c8fe01449da5ccbb9f16df097ac3
-    --sha256: sha256-kVFIy+Aj3TNJpsM1Cs/5uGmzeWwHKYWjjCQ+L1/XOj8=
+    location: https://github.com/kadena-io/base64-bytestring-kadena
+    tag: 90247042ab3b8662809210af2a78e6dee0f9b4ac
+    --sha256: sha256-xqIGml2asB+FxqVpsvVO59fdOGyJVBhZL6MyULvMGjc=
 
 source-repository-package
     type: git

diff --git a/chainweb.cabal b/chainweb.cabal
@@ -122,7 +122,7 @@ custom-setup
 -- -------------------------------------------------------------------------- --
 
 library
-    import: warning-flags, debugging-flags
+    import: debugging-flags
     default-language: Haskell2010
     hs-source-dirs: src
     other-modules:

diff --git a/src/Chainweb/Pact/PactService/ExecBlock.hs b/src/Chainweb/Pact/PactService/ExecBlock.hs
@@ -337,11 +337,11 @@ initModuleCacheForBlock isGenesis = do
         mc <- readInitModules
         updateInitCacheM mc
         return mc
-    Just (_,(mc, cmc)) ->
-      if (not $ (PCore.ModuleName "core" Nothing) `Set.member` (M.keysSet $ _getCoreModuleCache cmc)) then do
-        cmc' <- liftIO (readInitModulesCore l (_cpPactDbEnv dbEnv, _cpPactCoreDbEnv dbEnv) txCtx)
-        pure (mc, cmc' <> cmc)
-      else pure (mc, cmc)
+    Just (_,(mc, cmc)) -> pure (mc, cmc)
+      -- if (not $ (PCore.ModuleName "core" Nothing) `Set.member` (M.keysSet $ _getCoreModuleCache cmc)) then do
+      --   cmc' <- liftIO (readInitModulesCore l (_cpPactDbEnv dbEnv, _cpPactCoreDbEnv dbEnv) txCtx)
+      --   pure (mc, cmc' <> cmc)
+      -- else pure (mc, cmc)
 
 runCoinbase
     :: (Logger logger)

diff --git a/src/Chainweb/Pact/TransactionExec.hs b/src/Chainweb/Pact/TransactionExec.hs
@@ -519,7 +519,7 @@ applyCoinbase v logger (dbEnv, coreDb) (Miner mid mks@(MinerKeys mk)) reward@(Pa
         Just coinbaseTerm | usePactTng -> do
           coreState <-
             if (not $ (PCore.ModuleName "core" Nothing) `S.member` (M.keysSet $ _getCoreModuleCache cmc)) then do
-              cmc' <- undefined readInitModulesCore
+              cmc' <- undefined --readInitModulesCore
               pure $ setCoreModuleCache cmc' evState
             else pure evState