Skip to content

fet(event): optimize event service to obtain transaction information #6443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kuny0707 merged 3 commits into from
Sep 15, 2025
+94 −41
Merged

fet(event): optimize event service to obtain transaction information #6443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
498a985
fet(event): optimize event service to obtain transaction information
zeusoo001 Sep 9, 2025
954e124
feat(event): solve the problem of concurrent access to a single SR
zeusoo001 Sep 11, 2025
a4af427
feat(event): solve the concurrency problem of single SR obtaining sol…
zeusoo001 Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 1 addition & 31 deletions framework/src/main/java/org/tron/core/Wallet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2771,37 +2771,7 @@ public BytesMessage getShieldTransactionHash(Transaction transaction)
}

public TransactionInfoList getTransactionInfoByBlockNum(long blockNum) {
TransactionInfoList.Builder transactionInfoList = TransactionInfoList.newBuilder();

try {
TransactionRetCapsule result = dbManager.getTransactionRetStore()
.getTransactionInfoByBlockNum(ByteArray.fromLong(blockNum));

if (!Objects.isNull(result) && !Objects.isNull(result.getInstance())) {
result.getInstance().getTransactioninfoList().forEach(
transactionInfo -> transactionInfoList.addTransactionInfo(transactionInfo)
);
} else {
Block block = chainBaseManager.getBlockByNum(blockNum).getInstance();

if (block != null) {
List<Transaction> listTransaction = block.getTransactionsList();
for (Transaction transaction : listTransaction) {
TransactionInfoCapsule transactionInfoCapsule = dbManager.getTransactionHistoryStore()
.get(Sha256Hash.hash(CommonParameter.getInstance()
.isECKeyCryptoEngine(), transaction.getRawData().toByteArray()));

if (transactionInfoCapsule != null) {
transactionInfoList.addTransactionInfo(transactionInfoCapsule.getInstance());
}
}
}
}
} catch (BadItemException | ItemNotFoundException e) {
logger.warn(e.getMessage());
}

return transactionInfoList.build();
return dbManager.getTransactionInfoByBlockNum(blockNum);
}

public NodeList listNodes() {
Expand Down
35 changes: 35 additions & 0 deletions framework/src/main/java/org/tron/core/db/Manager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@
import org.tron.core.store.WitnessScheduleStore;
import org.tron.core.store.WitnessStore;
import org.tron.core.utils.TransactionRegister;
import org.tron.protos.Protocol;
import org.tron.protos.Protocol.AccountType;
import org.tron.protos.Protocol.Permission;
import org.tron.protos.Protocol.Transaction;
Expand Down Expand Up @@ -2488,6 +2489,40 @@ private boolean isBlockWaitingLock() {
return blockWaitLock.get() > NO_BLOCK_WAITING_LOCK;
}

public TransactionInfoList getTransactionInfoByBlockNum(long blockNum) {
TransactionInfoList.Builder transactionInfoList = TransactionInfoList.newBuilder();

try {
TransactionRetCapsule result = getTransactionRetStore()
.getTransactionInfoByBlockNum(ByteArray.fromLong(blockNum));

if (!Objects.isNull(result) && !Objects.isNull(result.getInstance())) {
result.getInstance().getTransactioninfoList().forEach(
transactionInfo -> transactionInfoList.addTransactionInfo(transactionInfo)
);
} else {
Protocol.Block block = chainBaseManager.getBlockByNum(blockNum).getInstance();

if (block != null) {
List<Transaction> listTransaction = block.getTransactionsList();
for (Transaction transaction : listTransaction) {
TransactionInfoCapsule transactionInfoCapsule = getTransactionHistoryStore()
.get(Sha256Hash.hash(CommonParameter.getInstance()
.isECKeyCryptoEngine(), transaction.getRawData().toByteArray()));

if (transactionInfoCapsule != null) {
transactionInfoList.addTransactionInfo(transactionInfoCapsule.getInstance());
}
}
}
}
} catch (BadItemException | ItemNotFoundException e) {
logger.warn(e.getMessage());
}

return transactionInfoList.build();
}

public void close() {
stopRePushThread();
stopRePushTriggerThread();
Expand Down
17 changes: 9 additions & 8 deletions framework/src/main/java/org/tron/core/services/event/BlockEventGet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,16 @@ public BlockEvent getBlockEvent(long blockNum) throws Exception {
BlockCapsule block = manager.getChainBaseManager().getBlockByNum(blockNum);
block.getTransactions().forEach(t -> t.setBlockNum(block.getNum()));
long solidNum = manager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
long headNum = manager.getHeadBlockNum();
// solve the single SR concurrency problem
if (solidNum >= headNum && headNum > 0) {
solidNum = headNum - 1;
}
BlockEvent blockEvent = new BlockEvent();
blockEvent.setBlockId(block.getBlockId());
blockEvent.setParentId(block.getParentBlockId());
blockEvent.setSolidId(manager.getChainBaseManager().getBlockIdByNum(solidNum));

if (instance.isBlockLogTriggerEnable()) {
blockEvent.setBlockLogTriggerCapsule(getBlockLogTrigger(block, solidNum));
}
Expand Down Expand Up @@ -88,18 +94,13 @@ public BlockEvent getBlockEvent(long blockNum) throws Exception {
}

public SmartContractTrigger getContractTrigger(BlockCapsule block, long solidNum) {
TransactionRetCapsule result;
try {
result = manager.getChainBaseManager().getTransactionRetStore()
.getTransactionInfoByBlockNum(ByteArray.fromLong(block.getNum()));
} catch (BadItemException e) {
throw new RuntimeException(e);
}

GrpcAPI.TransactionInfoList list = manager.getTransactionInfoByBlockNum(block.getNum());

SmartContractTrigger contractTrigger = new SmartContractTrigger();
for (int i = 0; i < block.getTransactions().size(); i++) {
Protocol.Transaction tx = block.getInstance().getTransactions(i);
Protocol.TransactionInfo txInfo = result.getInstance().getTransactioninfo(i);
Protocol.TransactionInfo txInfo = list.getTransactionInfo(i);
Copy link
Contributor

@waynercheung waynercheung Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if list get from getTransactionInfoByBlockNum is empty, or list.getTransactionInfoCount() != block.getTransactions().size(), is there any problem?

Copy link
Contributor

@xxo1shine xxo1shine Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem, this situation does not exist, otherwise the data is inconsistent.


List<ContractTrigger> triggers = parseLogs(tx, txInfo);
for (ContractTrigger trigger : triggers) {
Expand Down
8 changes: 6 additions & 2 deletions framework/src/main/java/org/tron/core/services/event/HistoryEventService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ private void syncEvent() {
try {
long tmp = instance.getStartSyncBlockNum();
long endNum = manager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
while (tmp <= endNum) {
while (tmp < endNum) {
if (thread.isInterrupted()) {
throw new InterruptedException();
}
if (instance.isUseNativeQueue()) {
Thread.sleep(20);
} else if (instance.isBusy()) {
Expand All @@ -67,7 +70,8 @@ private void syncEvent() {
tmp++;
endNum = manager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
}
initEventService(manager.getChainBaseManager().getBlockIdByNum(endNum));
long startNum = endNum == 0 ? 0 : endNum - 1;
Copy link

@0xbigapple 0xbigapple Sep 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If now solidifiedBlockNum is 100, but the startSyncBlockNum in config is 1000, it still start writing events from 99?

Copy link
Contributor

@xxo1shine xxo1shine Sep 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will write from 100, and you need to configure startSyncBlockNum reasonably.

initEventService(manager.getChainBaseManager().getBlockIdByNum(startNum));
} catch (InterruptedException e1) {
logger.warn("History event service interrupted.");
Thread.currentThread().interrupt();
Expand Down
43 changes: 43 additions & 0 deletions framework/src/test/java/org/tron/core/db/ManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import org.tron.api.GrpcAPI;
import org.tron.common.application.TronApplicationContext;
import org.tron.common.crypto.ECKey;
import org.tron.common.runtime.RuntimeImpl;
Expand All @@ -52,7 +53,10 @@
import org.tron.core.capsule.AccountCapsule;
import org.tron.core.capsule.AssetIssueCapsule;
import org.tron.core.capsule.BlockCapsule;
import org.tron.core.capsule.BytesCapsule;
import org.tron.core.capsule.TransactionCapsule;
import org.tron.core.capsule.TransactionInfoCapsule;
import org.tron.core.capsule.TransactionRetCapsule;
import org.tron.core.capsule.WitnessCapsule;
import org.tron.core.config.DefaultConfig;
import org.tron.core.config.Parameter;
Expand Down Expand Up @@ -1233,6 +1237,45 @@ public void testExpiration() {

}

@Test
public void testGetTransactionInfoByBlockNum() throws Exception {

Transaction transaction = Protocol.Transaction.newBuilder()
.addSignature(ByteString.copyFrom(new byte[1])).build();
TransactionCapsule transactionCapsule = new TransactionCapsule(transaction);

Protocol.BlockHeader.raw raw = Protocol.BlockHeader.raw.newBuilder().setNumber(1000L).build();
Protocol.BlockHeader header = Protocol.BlockHeader.newBuilder().setRawData(raw).build();
Block block = Block.newBuilder().setBlockHeader(header).addTransactions(transaction).build();

Protocol.TransactionInfo info = Protocol.TransactionInfo.newBuilder()
.setBlockNumber(1000L).build();

BlockCapsule blockCapsule = new BlockCapsule(block);
byte[] blockId = new BlockCapsule(block).getBlockId().getBytes();
dbManager.getBlockIndexStore().put(ByteArray.fromLong(1000L), new BytesCapsule(blockId));
dbManager.getBlockStore().put(blockId, blockCapsule);
dbManager.getTransactionHistoryStore().put(transactionCapsule.getTransactionId().getBytes(),
new TransactionInfoCapsule(info));

GrpcAPI.TransactionInfoList transactionInfoList = dbManager.getTransactionInfoByBlockNum(1000L);

Assert.assertEquals(1, transactionInfoList.getTransactionInfoCount());

Protocol.TransactionRet ret = Protocol.TransactionRet.newBuilder()
.addTransactioninfo(info)
.addTransactioninfo(info).build();

TransactionRetCapsule transactionRetCapsule = new TransactionRetCapsule(ret.toByteArray());

dbManager.getTransactionRetStore()
.put(ByteArray.fromLong(1000L), transactionRetCapsule);

transactionInfoList = dbManager.getTransactionInfoByBlockNum(1000L);

Assert.assertEquals(2, transactionInfoList.getTransactionInfoCount());
}

@Test
public void blockTrigger() {
Manager manager = spy(new Manager());
Expand Down