Merge branch 'master' into chessai/fold-in-chainweb-storage

Change-Id: Ie3dc6fe90a04f9ac15c41b13f1cb766e797f9d51
kadena-io · Jan 14, 2025 · d39b7a5 · d39b7a5
2 parents a4c9654 + d7b0fae
commit d39b7a5
Show file tree

Hide file tree

Showing 10 changed files with 1,568 additions and 4 deletions.
diff --git a/cabal.project b/cabal.project
@@ -101,8 +101,8 @@ source-repository-package
 source-repository-package
     type: git
     location: https://github.com/kadena-io/pact-5.git
-    tag: 87c2d748ce18331cd8e0ad45af11c93b64684323
-    --sha256: 1w0rmid741c6amvcgcla21yvliilp09aixcr9rzhvj4gc6mfbflc
+    tag: ebb66271ecce7cac1a7901a15658ad1b8233743a
+    --sha256: 1c362q6jpiq7gndypxci5bdpcm7hxbpg90fim4c977pxphsbiv1k
 
 source-repository-package
     type: git

diff --git a/chainweb.cabal b/chainweb.cabal
@@ -661,6 +661,7 @@ test-suite chainweb-tests
         Chainweb.Test.Pact5.RemotePactTest
         Chainweb.Test.Pact5.SPVTest
         Chainweb.Test.Pact5.TransactionExecTest
+        Chainweb.Test.Pact5.TransactionTests
         Chainweb.Test.RestAPI
         Chainweb.Test.Roundtrips
         Chainweb.Test.SPV
@@ -725,6 +726,7 @@ test-suite chainweb-tests
         , pact-tng
         , pact-tng:pact-request-api
         , pact-tng:test-utils
+        , pact-tng:pact-repl
         , patience >= 0.3
         , prettyprinter
         , property-matchers ^>= 0.4

diff --git a/node/src/ChainwebNode.hs b/node/src/ChainwebNode.hs
@@ -86,6 +86,7 @@ import Chainweb.Chainweb.CutResources
 import Chainweb.Counter
 import Chainweb.Cut.CutHashes
 import Chainweb.CutDB
+import Chainweb.Difficulty
 import Chainweb.Logger
 import Chainweb.Logging.Config
 import Chainweb.Logging.Miner
@@ -223,6 +224,7 @@ data BlockUpdate = BlockUpdate
     { _blockUpdateBlockHeader :: !(ObjectEncoded BlockHeader)
     , _blockUpdateOrphaned :: !Bool
     , _blockUpdateTxCount :: !Int
+    , _blockUpdateDifficultyDouble :: !Double
     }
     deriving (Show, Eq, Ord, Generic, NFData)
 
@@ -231,10 +233,12 @@ instance ToJSON BlockUpdate where
         $ "header" .= _blockUpdateBlockHeader o
         <> "orphaned" .= _blockUpdateOrphaned o
         <> "txCount" .= _blockUpdateTxCount o
+        <> "difficultyDouble" .= _blockUpdateDifficultyDouble o
     toJSON o = object
         [ "header" .= _blockUpdateBlockHeader o
         , "orphaned" .= _blockUpdateOrphaned o
         , "txCount" .= _blockUpdateTxCount o
+        , "difficultyDouble" .= _blockUpdateDifficultyDouble o
         ]
 
     {-# INLINE toEncoding #-}
@@ -261,10 +265,12 @@ runBlockUpdateMonitor logger db = L.withLoggerLabel ("component", "block-update-
         <$> pure (ObjectEncoded bh) -- _blockUpdateBlockHeader
         <*> pure False -- _blockUpdateOrphaned
         <*> txCount bh -- _blockUpdateTxCount
+        <*> pure (difficultyToDouble (targetToDifficulty (view blockTarget bh))) -- _blockUpdateDifficultyDouble
     toUpdate (Left bh) = BlockUpdate
         <$> pure (ObjectEncoded bh) -- _blockUpdateBlockHeader
         <*> pure True -- _blockUpdateOrphaned
         <*> ((0 -) <$> txCount bh) -- _blockUpdateTxCount
+        <*> pure (difficultyToDouble (targetToDifficulty (view blockTarget bh))) -- _blockUpdateDifficultyDouble
 
 -- type CutLog = HM.HashMap ChainId (ObjectEncoded BlockHeader)