From cde47df44516804a4642e5d54a59ed68f5e8b767 Mon Sep 17 00:00:00 2001 From: clarkchen Date: Mon, 21 Apr 2025 15:44:14 +0800 Subject: [PATCH 1/2] feat: add parent hash in the block event --- .../common/logsfilter/trigger/BlockLogTrigger.java | 11 ++++++++++- .../logsfilter/capsule/BlockLogTriggerCapsule.java | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java b/common/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java index 5e64c5a1050..78989be33a9 100644 --- a/common/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java +++ b/common/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java @@ -27,6 +27,11 @@ public class BlockLogTrigger extends Trigger { @Setter private List transactionList = new ArrayList<>(); + + @Getter + @Setter + private String parentHash; + public BlockLogTrigger() { setTriggerName(Trigger.BLOCK_TRIGGER_NAME); } @@ -45,6 +50,10 @@ public String toString() { .append(", latestSolidifiedBlockNumber: ") .append(latestSolidifiedBlockNumber) .append(", transactionList: ") - .append(transactionList).toString(); + .append(transactionList) + .append(", parentHash: ") + .append(parentHash) + .toString(); + } } diff --git a/framework/src/main/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsule.java b/framework/src/main/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsule.java index b714134ff60..b04666b1bb8 100644 --- a/framework/src/main/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsule.java +++ b/framework/src/main/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsule.java @@ -21,6 +21,7 @@ public BlockLogTriggerCapsule(BlockCapsule block) { block.getTransactions().forEach(trx -> blockLogTrigger.getTransactionList().add(trx.getTransactionId().toString()) ); + blockLogTrigger.setParentHash(block.getParentHash().toString()); } public void setLatestSolidifiedBlockNumber(long latestSolidifiedBlockNumber) { From 42f0c6424c5d188d89cd0f6def4bb7937672b9a4 Mon Sep 17 00:00:00 2001 From: clarkchen Date: Thu, 21 May 2026 16:31:42 +0800 Subject: [PATCH 2/2] style(event): address PR #6294 review nits and assert parentHash - Remove double blank line before parentHash field in BlockLogTrigger - Remove trailing blank line inside toString() body - Add testParentHashPopulated to verify capsule constructor sets parentHash --- .../org/tron/common/logsfilter/trigger/BlockLogTrigger.java | 2 -- .../logsfilter/capsule/BlockLogTriggerCapsuleTest.java | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java b/common/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java index ef5506936ac..c77638d5ac6 100644 --- a/common/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java +++ b/common/src/main/java/org/tron/common/logsfilter/trigger/BlockLogTrigger.java @@ -27,7 +27,6 @@ public class BlockLogTrigger extends Trigger { @Setter private List transactionList = new ArrayList<>(); - @Getter @Setter private String parentHash; @@ -54,6 +53,5 @@ public String toString() { .append(", parentHash: ") .append(parentHash) .toString(); - } } diff --git a/framework/src/test/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsuleTest.java b/framework/src/test/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsuleTest.java index f77869b8650..2c0036bdf43 100644 --- a/framework/src/test/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsuleTest.java +++ b/framework/src/test/java/org/tron/common/logsfilter/capsule/BlockLogTriggerCapsuleTest.java @@ -32,4 +32,10 @@ public void testSetLatestSolidifiedBlockNumber() { Assert.assertEquals(100, blockLogTriggerCapsule.getBlockLogTrigger().getLatestSolidifiedBlockNumber()); } + + @Test + public void testParentHashPopulated() { + Assert.assertEquals(Sha256Hash.ZERO_HASH.toString(), + blockLogTriggerCapsule.getBlockLogTrigger().getParentHash()); + } }