Merge branch 'master' into edmund/block-endpoints

kadena-io · Dec 20, 2023 · 521f5ec · 521f5ec
2 parents 38aa14c + 21c149d
commit 521f5ec
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/haskell-src/exec/Chainweb/Server.hs b/haskell-src/exec/Chainweb/Server.hs
@@ -433,9 +433,11 @@ queryTxsByKey logger rk c =
         , Api._signer_capList = caps
         }
     let sigs = Api.Sig . unSignature . _signer_sig <$> dbSigners
+        sameBlock tx ev = (unBlockId $ _tx_block tx) == (unBlockId $ _ev_block ev)
 
     return $ (`fmap` r) $ \(tx,contHist, blk) ->
-      toApiTxDetail tx contHist blk evs signers sigs
+      let evsInTxBlock = filter (sameBlock tx) evs
+      in toApiTxDetail tx contHist blk evsInTxBlock signers sigs
 
 queryTxsByPactId :: LogFunctionIO Text -> Limit -> Text -> Connection -> IO [TxSummary]
 queryTxsByPactId logger limit pactid c =