Fix conflict

Signed-off-by: naviechan <[email protected]>
ensi321 · Sep 22, 2023 · 1f2d834 · 1f2d834
1 parent 7ecfbcd
commit 1f2d834
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/...n/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java b/...n/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/results/BlockResultFactory.java
@@ -158,7 +158,9 @@ public EngineGetPayloadResultV6110 payloadTransactionCompleteV6110(
       final BlockWithReceipts blockWithReceipts) {
     final List<String> txs =
         blockWithReceipts.getBlock().getBody().getTransactions().stream()
-            .map(TransactionEncoder::encodeOpaqueBytes)
+            .map(
+                transaction ->
+                    TransactionEncoder.encodeOpaqueBytes(transaction, EncodingContext.BLOCK_BODY))
             .map(Bytes::toHexString)
             .collect(Collectors.toList());