From 1fe190b3f2e0c8740cdba085cf0fa9901e3f1173 Mon Sep 17 00:00:00 2001 From: GrapeS Date: Wed, 23 Sep 2026 18:51:34 +0800 Subject: [PATCH 1/9] refactor(db): remove deprecated KhaosDatabase.getBranch overload The BlockId overload had no callers. Every caller uses getBranch(Sha256Hash, Sha256Hash), which rejects a branch whose parent is missing. --- .../java/org/tron/core/db/KhaosDatabase.java | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java b/chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java index c1d3bceeb4b..e634194b683 100644 --- a/chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java +++ b/chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java @@ -205,37 +205,6 @@ private void checkNull(Object o) throws NonCommonBlockException { } } - /** - * Find two block's most recent common parent block. - */ - @Deprecated - public Pair, LinkedList> getBranch( - BlockId block1, BlockId block2) { - LinkedList list1 = new LinkedList<>(); - LinkedList list2 = new LinkedList<>(); - KhaosBlock kblk1 = miniStore.getByHash(block1); - KhaosBlock kblk2 = miniStore.getByHash(block2); - - if (kblk1 != null && kblk2 != null) { - while (!Objects.equals(kblk1, kblk2)) { - if (kblk1.num > kblk2.num) { - list1.add(kblk1.blk); - kblk1 = kblk1.getParent(); - } else if (kblk1.num < kblk2.num) { - list2.add(kblk2.blk); - kblk2 = kblk2.getParent(); - } else { - list1.add(kblk1.blk); - list2.add(kblk2.blk); - kblk1 = kblk1.getParent(); - kblk2 = kblk2.getParent(); - } - } - } - - return new Pair<>(list1, list2); - } - // only for unit test public BlockCapsule getParentBlock(Sha256Hash hash) { return Stream.of(miniStore.getByHash(hash), miniUnlinkedStore.getByHash(hash)) From 0fffb29276d2f08351f5d227d02ab3280d68b438 Mon Sep 17 00:00:00 2001 From: GrapeS Date: Wed, 23 Sep 2026 18:51:34 +0800 Subject: [PATCH 2/9] style(db): remove unused import from Manager --- framework/src/main/java/org/tron/core/db/Manager.java | 1 - 1 file changed, 1 deletion(-) diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java index b7effeb72e2..e6107fa4023 100644 --- a/framework/src/main/java/org/tron/core/db/Manager.java +++ b/framework/src/main/java/org/tron/core/db/Manager.java @@ -5,7 +5,6 @@ import static org.tron.common.math.Maths.min; import static org.tron.common.utils.Commons.adjustBalance; import static org.tron.core.Constant.TRANSACTION_MAX_BYTE_SIZE; -import static org.tron.core.exception.BadBlockException.TypeEnum.CALC_MERKLE_ROOT_FAILED; import static org.tron.protos.Protocol.Transaction.Contract.ContractType.TransferContract; import static org.tron.protos.Protocol.Transaction.Result.contractResult.SUCCESS; From beb2dfa0b5ea07ea275e6f9262a2440ebc51879d Mon Sep 17 00:00:00 2001 From: GrapeS Date: Mon, 12 Oct 2026 17:07:32 +0800 Subject: [PATCH 3/9] style(db): remove unused imports from KhaosDatabase and Manager --- chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java | 1 - framework/src/main/java/org/tron/core/db/Manager.java | 1 - 2 files changed, 2 deletions(-) diff --git a/chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java b/chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java index e634194b683..07f9493da13 100644 --- a/chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java +++ b/chainbase/src/main/java/org/tron/core/db/KhaosDatabase.java @@ -4,7 +4,6 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.Comparator; -import java.util.HashMap; import java.util.LinkedHashMap; import java.util.LinkedList; import java.util.List; diff --git a/framework/src/main/java/org/tron/core/db/Manager.java b/framework/src/main/java/org/tron/core/db/Manager.java index e6107fa4023..b9c94258fb3 100644 --- a/framework/src/main/java/org/tron/core/db/Manager.java +++ b/framework/src/main/java/org/tron/core/db/Manager.java @@ -48,7 +48,6 @@ import org.bouncycastle.util.encoders.Hex; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.tron.api.GrpcAPI; import org.tron.api.GrpcAPI.TransactionInfoList; import org.tron.common.args.GenesisBlock; import org.tron.common.bloom.Bloom; From 377cf029e17f7baa0ff3e7f2dab70ebdd4b08251 Mon Sep 17 00:00:00 2001 From: GrapeS Date: Mon, 12 Oct 2026 17:10:01 +0800 Subject: [PATCH 4/9] style(chainbase): remove unused imports --- .../main/java/org/tron/common/zksnark/JLibrustzcash.java | 2 -- .../main/java/org/tron/common/zksnark/JLibsodium.java | 1 - .../java/org/tron/core/capsule/AccountTraceCapsule.java | 3 --- .../org/tron/core/capsule/BlockBalanceTraceCapsule.java | 3 --- .../main/java/org/tron/core/capsule/ContractCapsule.java | 1 - .../java/org/tron/core/capsule/MarketOrderCapsule.java | 5 ----- .../java/org/tron/core/capsule/MarketPriceCapsule.java | 1 - .../main/java/org/tron/core/capsule/PbftSignCapsule.java | 1 - chainbase/src/main/java/org/tron/core/db/BlockStore.java | 1 - .../org/tron/core/db/common/iterator/DBIterator.java | 3 --- .../src/main/java/org/tron/core/db2/core/Chainbase.java | 1 - .../main/java/org/tron/core/store/BalanceTraceStore.java | 9 --------- .../src/main/java/org/tron/core/store/ContractStore.java | 3 --- .../java/org/tron/core/store/TreeBlockIndexStore.java | 1 - 14 files changed, 35 deletions(-) diff --git a/chainbase/src/main/java/org/tron/common/zksnark/JLibrustzcash.java b/chainbase/src/main/java/org/tron/common/zksnark/JLibrustzcash.java index 3700d300411..88ef1991317 100644 --- a/chainbase/src/main/java/org/tron/common/zksnark/JLibrustzcash.java +++ b/chainbase/src/main/java/org/tron/common/zksnark/JLibrustzcash.java @@ -1,8 +1,6 @@ package org.tron.common.zksnark; import lombok.extern.slf4j.Slf4j; -import org.tron.common.parameter.CommonParameter; -import org.tron.common.utils.ByteUtil; import org.tron.common.zksnark.LibrustzcashParam.BindingSigParams; import org.tron.common.zksnark.LibrustzcashParam.CheckOutputNewParams; import org.tron.common.zksnark.LibrustzcashParam.CheckOutputParams; diff --git a/chainbase/src/main/java/org/tron/common/zksnark/JLibsodium.java b/chainbase/src/main/java/org/tron/common/zksnark/JLibsodium.java index 0713d74b7bd..86fc9671b9e 100644 --- a/chainbase/src/main/java/org/tron/common/zksnark/JLibsodium.java +++ b/chainbase/src/main/java/org/tron/common/zksnark/JLibsodium.java @@ -1,6 +1,5 @@ package org.tron.common.zksnark; -import org.tron.common.parameter.CommonParameter; import org.tron.common.zksnark.JLibsodiumParam.Black2bSaltPersonalParams; import org.tron.common.zksnark.JLibsodiumParam.Blake2bFinalParams; import org.tron.common.zksnark.JLibsodiumParam.Blake2bInitSaltPersonalParams; diff --git a/chainbase/src/main/java/org/tron/core/capsule/AccountTraceCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/AccountTraceCapsule.java index 2437540644f..d0458df5060 100644 --- a/chainbase/src/main/java/org/tron/core/capsule/AccountTraceCapsule.java +++ b/chainbase/src/main/java/org/tron/core/capsule/AccountTraceCapsule.java @@ -1,13 +1,10 @@ package org.tron.core.capsule; import com.google.protobuf.InvalidProtocolBufferException; -import java.util.List; import java.util.Objects; -import org.tron.common.utils.StringUtil; import org.tron.core.exception.BadItemException; import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.BalanceContract.AccountTrace; -import org.tron.protos.contract.BalanceContract.TransactionBalanceTrace; public class AccountTraceCapsule implements ProtoCapsule { private BalanceContract.AccountTrace accountTrace; diff --git a/chainbase/src/main/java/org/tron/core/capsule/BlockBalanceTraceCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/BlockBalanceTraceCapsule.java index 870b2e7018b..1523ea0c494 100644 --- a/chainbase/src/main/java/org/tron/core/capsule/BlockBalanceTraceCapsule.java +++ b/chainbase/src/main/java/org/tron/core/capsule/BlockBalanceTraceCapsule.java @@ -2,10 +2,7 @@ import com.google.protobuf.InvalidProtocolBufferException; import java.util.List; -import java.util.Map; -import org.tron.common.utils.StringUtil; import org.tron.core.exception.BadItemException; -import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.BalanceContract.BlockBalanceTrace; import org.tron.protos.contract.BalanceContract.TransactionBalanceTrace; diff --git a/chainbase/src/main/java/org/tron/core/capsule/ContractCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/ContractCapsule.java index f566a128d6b..b53596df770 100644 --- a/chainbase/src/main/java/org/tron/core/capsule/ContractCapsule.java +++ b/chainbase/src/main/java/org/tron/core/capsule/ContractCapsule.java @@ -28,7 +28,6 @@ import org.tron.protos.contract.SmartContractOuterClass.SmartContract; import org.tron.protos.contract.SmartContractOuterClass.SmartContract.ABI; import org.tron.protos.contract.SmartContractOuterClass.SmartContractDataWrapper; -import org.tron.protos.contract.SmartContractOuterClass.SmartContractDataWrapperOrBuilder; import org.tron.protos.contract.SmartContractOuterClass.TriggerSmartContract; @Slf4j(topic = "capsule") diff --git a/chainbase/src/main/java/org/tron/core/capsule/MarketOrderCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/MarketOrderCapsule.java index d9d02aa6bc9..8c9eda8bf0d 100644 --- a/chainbase/src/main/java/org/tron/core/capsule/MarketOrderCapsule.java +++ b/chainbase/src/main/java/org/tron/core/capsule/MarketOrderCapsule.java @@ -3,15 +3,10 @@ import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import lombok.extern.slf4j.Slf4j; -import org.tron.common.utils.ByteArray; import org.tron.core.exception.ItemNotFoundException; -import org.tron.core.store.AssetIssueStore; -import org.tron.core.store.DynamicPropertiesStore; import org.tron.core.store.MarketOrderStore; -import org.tron.protos.Protocol; import org.tron.protos.Protocol.MarketOrder; -import java.util.Arrays; import org.tron.protos.Protocol.MarketOrder.State; import org.tron.protos.contract.MarketContract.MarketSellAssetContract; diff --git a/chainbase/src/main/java/org/tron/core/capsule/MarketPriceCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/MarketPriceCapsule.java index c33b9e18485..af2004cc075 100644 --- a/chainbase/src/main/java/org/tron/core/capsule/MarketPriceCapsule.java +++ b/chainbase/src/main/java/org/tron/core/capsule/MarketPriceCapsule.java @@ -1,6 +1,5 @@ package org.tron.core.capsule; -import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; import lombok.extern.slf4j.Slf4j; import org.tron.core.capsule.utils.MarketUtils; diff --git a/chainbase/src/main/java/org/tron/core/capsule/PbftSignCapsule.java b/chainbase/src/main/java/org/tron/core/capsule/PbftSignCapsule.java index 14835cb01b5..d01bdaca789 100644 --- a/chainbase/src/main/java/org/tron/core/capsule/PbftSignCapsule.java +++ b/chainbase/src/main/java/org/tron/core/capsule/PbftSignCapsule.java @@ -2,7 +2,6 @@ import com.google.protobuf.ByteString; import com.google.protobuf.InvalidProtocolBufferException; -import java.util.Deque; import java.util.List; import lombok.Getter; import lombok.extern.slf4j.Slf4j; diff --git a/chainbase/src/main/java/org/tron/core/db/BlockStore.java b/chainbase/src/main/java/org/tron/core/db/BlockStore.java index 9198b1c5198..f1ec8218018 100644 --- a/chainbase/src/main/java/org/tron/core/db/BlockStore.java +++ b/chainbase/src/main/java/org/tron/core/db/BlockStore.java @@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.tron.common.error.TronDBException; import org.tron.common.utils.Sha256Hash; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.BlockCapsule.BlockId; diff --git a/chainbase/src/main/java/org/tron/core/db/common/iterator/DBIterator.java b/chainbase/src/main/java/org/tron/core/db/common/iterator/DBIterator.java index afbacac35db..35441639386 100755 --- a/chainbase/src/main/java/org/tron/core/db/common/iterator/DBIterator.java +++ b/chainbase/src/main/java/org/tron/core/db/common/iterator/DBIterator.java @@ -1,8 +1,5 @@ package org.tron.core.db.common.iterator; -import com.google.common.collect.Iterators; -import com.google.common.collect.UnmodifiableIterator; -import com.google.common.primitives.Bytes; import java.io.Closeable; import java.util.Iterator; import java.util.Map.Entry; diff --git a/chainbase/src/main/java/org/tron/core/db2/core/Chainbase.java b/chainbase/src/main/java/org/tron/core/db2/core/Chainbase.java index 17a047f78ae..faa6bbf5074 100644 --- a/chainbase/src/main/java/org/tron/core/db2/core/Chainbase.java +++ b/chainbase/src/main/java/org/tron/core/db2/core/Chainbase.java @@ -13,7 +13,6 @@ import java.util.stream.Collectors; import org.tron.common.utils.ByteUtil; -import org.tron.common.utils.Pair; import org.tron.core.capsule.utils.MarketUtils; import org.tron.core.db2.common.IRevokingDB; import org.tron.core.db2.common.LevelDB; diff --git a/chainbase/src/main/java/org/tron/core/store/BalanceTraceStore.java b/chainbase/src/main/java/org/tron/core/store/BalanceTraceStore.java index 45e6cc8bb9d..c0534bd19de 100644 --- a/chainbase/src/main/java/org/tron/core/store/BalanceTraceStore.java +++ b/chainbase/src/main/java/org/tron/core/store/BalanceTraceStore.java @@ -1,17 +1,9 @@ package org.tron.core.store; -import com.google.common.primitives.Bytes; -import com.google.protobuf.ByteString; -import com.google.protobuf.InvalidProtocolBufferException; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.stream.Collectors; import lombok.Getter; import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -24,7 +16,6 @@ import org.tron.core.capsule.TransactionCapsule; import org.tron.core.db.TronStoreWithRevoking; import org.tron.core.exception.BadItemException; -import org.tron.protos.contract.BalanceContract; import org.tron.protos.contract.BalanceContract.TransactionBalanceTrace; import java.util.Objects; diff --git a/chainbase/src/main/java/org/tron/core/store/ContractStore.java b/chainbase/src/main/java/org/tron/core/store/ContractStore.java index 169d2b9c67e..799fc68eb8b 100644 --- a/chainbase/src/main/java/org/tron/core/store/ContractStore.java +++ b/chainbase/src/main/java/org/tron/core/store/ContractStore.java @@ -2,14 +2,11 @@ import com.google.common.collect.Streams; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; -import org.tron.core.capsule.AbiCapsule; import org.tron.core.capsule.ContractCapsule; import org.tron.core.db.TronStoreWithRevoking; -import org.tron.protos.contract.SmartContractOuterClass.SmartContract; import java.util.Objects; diff --git a/chainbase/src/main/java/org/tron/core/store/TreeBlockIndexStore.java b/chainbase/src/main/java/org/tron/core/store/TreeBlockIndexStore.java index fbeaecfda40..3572ddbb373 100644 --- a/chainbase/src/main/java/org/tron/core/store/TreeBlockIndexStore.java +++ b/chainbase/src/main/java/org/tron/core/store/TreeBlockIndexStore.java @@ -1,6 +1,5 @@ package org.tron.core.store; -import java.util.Arrays; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; From 278c103d91d07aa93e693a4b333678b5f46ef74c Mon Sep 17 00:00:00 2001 From: GrapeS Date: Mon, 12 Oct 2026 17:10:01 +0800 Subject: [PATCH 5/9] style(consensus): remove unused imports --- consensus/src/main/java/org/tron/consensus/dpos/DposService.java | 1 - .../src/main/java/org/tron/consensus/dpos/StateManager.java | 1 - .../src/main/java/org/tron/consensus/pbft/PbftMessageAction.java | 1 - .../main/java/org/tron/consensus/pbft/message/PbftMessage.java | 1 - 4 files changed, 4 deletions(-) diff --git a/consensus/src/main/java/org/tron/consensus/dpos/DposService.java b/consensus/src/main/java/org/tron/consensus/dpos/DposService.java index 0a40ec8e076..a79db682f4c 100644 --- a/consensus/src/main/java/org/tron/consensus/dpos/DposService.java +++ b/consensus/src/main/java/org/tron/consensus/dpos/DposService.java @@ -6,7 +6,6 @@ import com.google.protobuf.ByteString; import java.util.ArrayList; -import java.util.Comparator; import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/consensus/src/main/java/org/tron/consensus/dpos/StateManager.java b/consensus/src/main/java/org/tron/consensus/dpos/StateManager.java index 19d1f88a243..96ca82d1433 100644 --- a/consensus/src/main/java/org/tron/consensus/dpos/StateManager.java +++ b/consensus/src/main/java/org/tron/consensus/dpos/StateManager.java @@ -4,7 +4,6 @@ import static org.tron.core.config.Parameter.ChainConstant.MAX_ACTIVE_WITNESS_NUM; import com.google.protobuf.ByteString; -import java.util.Random; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import lombok.Setter; diff --git a/consensus/src/main/java/org/tron/consensus/pbft/PbftMessageAction.java b/consensus/src/main/java/org/tron/consensus/pbft/PbftMessageAction.java index c4ee235ff2d..c9952be6178 100644 --- a/consensus/src/main/java/org/tron/consensus/pbft/PbftMessageAction.java +++ b/consensus/src/main/java/org/tron/consensus/pbft/PbftMessageAction.java @@ -1,7 +1,6 @@ package org.tron.consensus.pbft; import com.google.protobuf.ByteString; -import java.util.Deque; import java.util.List; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; diff --git a/consensus/src/main/java/org/tron/consensus/pbft/message/PbftMessage.java b/consensus/src/main/java/org/tron/consensus/pbft/message/PbftMessage.java index dbb49bcacb5..f2391ac4af5 100644 --- a/consensus/src/main/java/org/tron/consensus/pbft/message/PbftMessage.java +++ b/consensus/src/main/java/org/tron/consensus/pbft/message/PbftMessage.java @@ -5,7 +5,6 @@ import org.tron.common.crypto.ECKey; import org.tron.common.crypto.ECKey.ECDSASignature; import org.tron.common.utils.Sha256Hash; -import org.tron.consensus.base.Param; import org.tron.consensus.base.Param.Miner; import org.tron.core.capsule.BlockCapsule; import org.tron.core.net.message.MessageTypes; From 7fd8500da690ca566e8257f3a9492942de3c47d1 Mon Sep 17 00:00:00 2001 From: GrapeS Date: Mon, 12 Oct 2026 17:10:01 +0800 Subject: [PATCH 6/9] style(crypto): remove unused imports --- crypto/src/main/java/org/tron/common/crypto/ECKey.java | 1 - 1 file changed, 1 deletion(-) diff --git a/crypto/src/main/java/org/tron/common/crypto/ECKey.java b/crypto/src/main/java/org/tron/common/crypto/ECKey.java index a23933a3a90..1bbc245446c 100644 --- a/crypto/src/main/java/org/tron/common/crypto/ECKey.java +++ b/crypto/src/main/java/org/tron/common/crypto/ECKey.java @@ -31,7 +31,6 @@ import java.security.interfaces.ECPublicKey; import java.security.spec.InvalidKeySpecException; import java.util.Arrays; -import java.util.Objects; import javax.annotation.Nullable; import lombok.extern.slf4j.Slf4j; import org.bouncycastle.asn1.sec.SECNamedCurves; From fe8ce0db24499067ef47f9e292563670b5c2d4fb Mon Sep 17 00:00:00 2001 From: GrapeS Date: Mon, 12 Oct 2026 17:10:01 +0800 Subject: [PATCH 7/9] style(framework): remove unused imports --- .../logsfilter/capsule/TransactionLogTriggerCapsule.java | 3 --- framework/src/main/java/org/tron/core/config/args/Args.java | 1 - .../java/org/tron/core/net/message/TronMessageFactory.java | 1 - .../org/tron/core/net/message/handshake/HelloMessage.java | 1 - .../org/tron/core/net/service/handshake/HandshakeService.java | 1 - .../main/java/org/tron/core/services/event/BlockEventGet.java | 4 ---- .../tron/core/services/filter/LiteFnQueryGrpcInterceptor.java | 1 - .../CreateShieldedContractParametersWithoutAskServlet.java | 1 - .../tron/core/services/http/GetDelegatedResourceServlet.java | 1 - .../org/tron/core/services/http/GetDiversifierServlet.java | 1 - .../core/services/http/GetExpandedSpendingKeyServlet.java | 1 - .../org/tron/core/services/http/GetSpendingKeyServlet.java | 1 - .../tron/core/services/http/GetTransactionByIdServlet.java | 1 - .../services/http/GetTransactionCountByBlockNumServlet.java | 1 - .../core/services/http/GetTransactionInfoByIdServlet.java | 1 - .../http/GetTriggerInputForShieldedTRC20ContractServlet.java | 1 - .../http/IsShieldedTRC20ContractNoteSpentServlet.java | 1 - .../main/java/org/tron/core/services/http/IsSpendServlet.java | 1 - .../org/tron/core/services/http/ScanNoteByIvkServlet.java | 1 - .../org/tron/core/services/http/ScanNoteByOvkServlet.java | 1 - .../java/org/tron/core/services/jsonrpc/filters/LogMatch.java | 2 -- 21 files changed, 27 deletions(-) diff --git a/framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java b/framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java index cf1737d9d22..e563f9709b2 100644 --- a/framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java +++ b/framework/src/main/java/org/tron/common/logsfilter/capsule/TransactionLogTriggerCapsule.java @@ -1,14 +1,11 @@ package org.tron.common.logsfilter.capsule; import static org.tron.protos.Protocol.Transaction.Contract.ContractType.CreateSmartContract; -import static org.tron.protos.contract.Common.ResourceCode.ENERGY; import com.google.protobuf.Any; import com.google.protobuf.ByteString; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Objects; import lombok.Getter; import lombok.Setter; diff --git a/framework/src/main/java/org/tron/core/config/args/Args.java b/framework/src/main/java/org/tron/core/config/args/Args.java index fdf70ce5183..cfa0309a829 100644 --- a/framework/src/main/java/org/tron/core/config/args/Args.java +++ b/framework/src/main/java/org/tron/core/config/args/Args.java @@ -61,7 +61,6 @@ import org.tron.p2p.P2pConfig; import org.tron.p2p.dns.update.DnsType; import org.tron.p2p.dns.update.PublishConfig; -import org.tron.p2p.utils.NetUtil; import org.tron.program.Version; @Slf4j(topic = "app") diff --git a/framework/src/main/java/org/tron/core/net/message/TronMessageFactory.java b/framework/src/main/java/org/tron/core/net/message/TronMessageFactory.java index 3cc1b35e506..9635ea87410 100644 --- a/framework/src/main/java/org/tron/core/net/message/TronMessageFactory.java +++ b/framework/src/main/java/org/tron/core/net/message/TronMessageFactory.java @@ -1,7 +1,6 @@ package org.tron.core.net.message; import org.apache.commons.lang3.ArrayUtils; -import org.tron.consensus.pbft.message.PbftMessage; import org.tron.core.exception.P2pException; import org.tron.core.metrics.MetricsKey; import org.tron.core.metrics.MetricsUtil; diff --git a/framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java b/framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java index 68123c93db6..a36714ede8f 100755 --- a/framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java +++ b/framework/src/main/java/org/tron/core/net/message/handshake/HelloMessage.java @@ -4,7 +4,6 @@ import lombok.Getter; import org.apache.commons.lang3.StringUtils; import org.tron.common.utils.ByteArray; -import org.tron.common.utils.DecodeUtil; import org.tron.common.utils.Sha256Hash; import org.tron.common.utils.StringUtil; import org.tron.core.ChainBaseManager; diff --git a/framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java b/framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java index 070a9f56406..8928f8fbef4 100644 --- a/framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java +++ b/framework/src/main/java/org/tron/core/net/service/handshake/HandshakeService.java @@ -6,7 +6,6 @@ import org.springframework.stereotype.Component; import org.tron.common.utils.ByteArray; import org.tron.core.ChainBaseManager; -import org.tron.core.ChainBaseManager.NodeType; import org.tron.core.config.args.Args; import org.tron.core.net.TronNetService; import org.tron.core.net.message.handshake.HelloMessage; diff --git a/framework/src/main/java/org/tron/core/services/event/BlockEventGet.java b/framework/src/main/java/org/tron/core/services/event/BlockEventGet.java index 122a61222c3..21fc6e1950e 100644 --- a/framework/src/main/java/org/tron/core/services/event/BlockEventGet.java +++ b/framework/src/main/java/org/tron/core/services/event/BlockEventGet.java @@ -6,7 +6,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Objects; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.StringUtils; @@ -26,17 +25,14 @@ import org.tron.common.logsfilter.trigger.ContractTrigger; import org.tron.common.runtime.vm.DataWord; import org.tron.common.runtime.vm.LogInfo; -import org.tron.common.utils.ByteArray; import org.tron.common.utils.StringUtil; import org.tron.core.capsule.AbiCapsule; import org.tron.core.capsule.BlockCapsule; import org.tron.core.capsule.ContractCapsule; import org.tron.core.capsule.TransactionCapsule; -import org.tron.core.capsule.TransactionRetCapsule; import org.tron.core.config.args.Args; import org.tron.core.db.Manager; import org.tron.core.db.TransactionTrace; -import org.tron.core.exception.BadItemException; import org.tron.core.services.event.bo.BlockEvent; import org.tron.core.services.event.bo.SmartContractTrigger; import org.tron.core.services.jsonrpc.JsonRpcApiUtil; diff --git a/framework/src/main/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptor.java b/framework/src/main/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptor.java index 82819d163f3..d89cd5970a8 100644 --- a/framework/src/main/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptor.java +++ b/framework/src/main/java/org/tron/core/services/filter/LiteFnQueryGrpcInterceptor.java @@ -1,7 +1,6 @@ package org.tron.core.services.filter; import com.beust.jcommander.internal.Sets; -import io.grpc.ForwardingServerCall; import io.grpc.Metadata; import io.grpc.ServerCall; import io.grpc.ServerCallHandler; diff --git a/framework/src/main/java/org/tron/core/services/http/CreateShieldedContractParametersWithoutAskServlet.java b/framework/src/main/java/org/tron/core/services/http/CreateShieldedContractParametersWithoutAskServlet.java index 80a8ba53bbc..f5970eabcfc 100644 --- a/framework/src/main/java/org/tron/core/services/http/CreateShieldedContractParametersWithoutAskServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/CreateShieldedContractParametersWithoutAskServlet.java @@ -1,6 +1,5 @@ package org.tron.core.services.http; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/GetDelegatedResourceServlet.java b/framework/src/main/java/org/tron/core/services/http/GetDelegatedResourceServlet.java index 5787aba3c93..e46619a18cb 100644 --- a/framework/src/main/java/org/tron/core/services/http/GetDelegatedResourceServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/GetDelegatedResourceServlet.java @@ -2,7 +2,6 @@ import com.google.protobuf.ByteString; import java.io.IOException; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/GetDiversifierServlet.java b/framework/src/main/java/org/tron/core/services/http/GetDiversifierServlet.java index e37a1d6a785..41edd9579fd 100644 --- a/framework/src/main/java/org/tron/core/services/http/GetDiversifierServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/GetDiversifierServlet.java @@ -1,6 +1,5 @@ package org.tron.core.services.http; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/GetExpandedSpendingKeyServlet.java b/framework/src/main/java/org/tron/core/services/http/GetExpandedSpendingKeyServlet.java index a71f5db56e1..d1529ccb726 100644 --- a/framework/src/main/java/org/tron/core/services/http/GetExpandedSpendingKeyServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/GetExpandedSpendingKeyServlet.java @@ -1,7 +1,6 @@ package org.tron.core.services.http; import com.google.protobuf.ByteString; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/GetSpendingKeyServlet.java b/framework/src/main/java/org/tron/core/services/http/GetSpendingKeyServlet.java index 23c274566ca..c988dc2d8ae 100644 --- a/framework/src/main/java/org/tron/core/services/http/GetSpendingKeyServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/GetSpendingKeyServlet.java @@ -1,6 +1,5 @@ package org.tron.core.services.http; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/GetTransactionByIdServlet.java b/framework/src/main/java/org/tron/core/services/http/GetTransactionByIdServlet.java index 49343da9070..f45151e8372 100644 --- a/framework/src/main/java/org/tron/core/services/http/GetTransactionByIdServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/GetTransactionByIdServlet.java @@ -2,7 +2,6 @@ import com.google.protobuf.ByteString; import java.io.IOException; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/GetTransactionCountByBlockNumServlet.java b/framework/src/main/java/org/tron/core/services/http/GetTransactionCountByBlockNumServlet.java index 81c1ece73fb..523945a5805 100644 --- a/framework/src/main/java/org/tron/core/services/http/GetTransactionCountByBlockNumServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/GetTransactionCountByBlockNumServlet.java @@ -1,7 +1,6 @@ package org.tron.core.services.http; import java.io.IOException; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/GetTransactionInfoByIdServlet.java b/framework/src/main/java/org/tron/core/services/http/GetTransactionInfoByIdServlet.java index 580cb4a5b66..187b5785fcf 100644 --- a/framework/src/main/java/org/tron/core/services/http/GetTransactionInfoByIdServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/GetTransactionInfoByIdServlet.java @@ -2,7 +2,6 @@ import com.google.protobuf.ByteString; import java.util.List; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/GetTriggerInputForShieldedTRC20ContractServlet.java b/framework/src/main/java/org/tron/core/services/http/GetTriggerInputForShieldedTRC20ContractServlet.java index 3a0bc4ed282..ee47fc073f9 100644 --- a/framework/src/main/java/org/tron/core/services/http/GetTriggerInputForShieldedTRC20ContractServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/GetTriggerInputForShieldedTRC20ContractServlet.java @@ -1,6 +1,5 @@ package org.tron.core.services.http; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/IsShieldedTRC20ContractNoteSpentServlet.java b/framework/src/main/java/org/tron/core/services/http/IsShieldedTRC20ContractNoteSpentServlet.java index 9e01ec8fda1..b9d1a9b7cad 100644 --- a/framework/src/main/java/org/tron/core/services/http/IsShieldedTRC20ContractNoteSpentServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/IsShieldedTRC20ContractNoteSpentServlet.java @@ -1,6 +1,5 @@ package org.tron.core.services.http; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/IsSpendServlet.java b/framework/src/main/java/org/tron/core/services/http/IsSpendServlet.java index 46120a6611d..2b615124807 100644 --- a/framework/src/main/java/org/tron/core/services/http/IsSpendServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/IsSpendServlet.java @@ -1,6 +1,5 @@ package org.tron.core.services.http; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/ScanNoteByIvkServlet.java b/framework/src/main/java/org/tron/core/services/http/ScanNoteByIvkServlet.java index bd1c92d13ec..da7da90ee16 100644 --- a/framework/src/main/java/org/tron/core/services/http/ScanNoteByIvkServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/ScanNoteByIvkServlet.java @@ -1,6 +1,5 @@ package org.tron.core.services.http; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/http/ScanNoteByOvkServlet.java b/framework/src/main/java/org/tron/core/services/http/ScanNoteByOvkServlet.java index 1cf6363ba98..8d59c884771 100644 --- a/framework/src/main/java/org/tron/core/services/http/ScanNoteByOvkServlet.java +++ b/framework/src/main/java/org/tron/core/services/http/ScanNoteByOvkServlet.java @@ -1,6 +1,5 @@ package org.tron.core.services.http; -import java.util.stream.Collectors; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; diff --git a/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogMatch.java b/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogMatch.java index 04994969fc4..d42b7fdb427 100644 --- a/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogMatch.java +++ b/framework/src/main/java/org/tron/core/services/jsonrpc/filters/LogMatch.java @@ -6,7 +6,6 @@ import lombok.extern.slf4j.Slf4j; import org.tron.common.runtime.vm.DataWord; import org.tron.common.utils.ByteArray; -import org.tron.core.capsule.TransactionRetCapsule; import org.tron.core.db.Manager; import org.tron.core.exception.BadItemException; import org.tron.core.exception.ItemNotFoundException; @@ -14,7 +13,6 @@ import org.tron.core.services.jsonrpc.TronJsonRpc.LogFilterElement; import org.tron.protos.Protocol.TransactionInfo; import org.tron.protos.Protocol.TransactionInfo.Log; -import org.tron.protos.Protocol.TransactionRet; /** * match events from possible blocks one by one From a4820e20967bffb994cdfb6753ae7cff6bbaf6c5 Mon Sep 17 00:00:00 2001 From: GrapeS Date: Mon, 12 Oct 2026 17:10:01 +0800 Subject: [PATCH 8/9] style(net): remove unused imports from p2p --- .../org/tron/p2p/connection/socket/P2pChannelInitializer.java | 1 - p2p/src/main/java/org/tron/p2p/dns/sync/RandomIterator.java | 1 - p2p/src/main/java/org/tron/p2p/utils/NetUtil.java | 1 - 3 files changed, 3 deletions(-) diff --git a/p2p/src/main/java/org/tron/p2p/connection/socket/P2pChannelInitializer.java b/p2p/src/main/java/org/tron/p2p/connection/socket/P2pChannelInitializer.java index 31b2ea302ef..51138f64b10 100644 --- a/p2p/src/main/java/org/tron/p2p/connection/socket/P2pChannelInitializer.java +++ b/p2p/src/main/java/org/tron/p2p/connection/socket/P2pChannelInitializer.java @@ -5,7 +5,6 @@ import io.netty.channel.ChannelOption; import io.netty.channel.FixedRecvByteBufAllocator; import io.netty.channel.socket.nio.NioSocketChannel; -import lombok.Setter; import lombok.extern.slf4j.Slf4j; import org.tron.p2p.connection.Channel; import org.tron.p2p.connection.ChannelManager; diff --git a/p2p/src/main/java/org/tron/p2p/dns/sync/RandomIterator.java b/p2p/src/main/java/org/tron/p2p/dns/sync/RandomIterator.java index 36d2cf224f1..68a85d7ad4f 100644 --- a/p2p/src/main/java/org/tron/p2p/dns/sync/RandomIterator.java +++ b/p2p/src/main/java/org/tron/p2p/dns/sync/RandomIterator.java @@ -1,7 +1,6 @@ package org.tron.p2p.dns.sync; import java.util.ArrayList; -import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/p2p/src/main/java/org/tron/p2p/utils/NetUtil.java b/p2p/src/main/java/org/tron/p2p/utils/NetUtil.java index f9aa43f5eb3..a6cae89f9d3 100644 --- a/p2p/src/main/java/org/tron/p2p/utils/NetUtil.java +++ b/p2p/src/main/java/org/tron/p2p/utils/NetUtil.java @@ -8,7 +8,6 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.NetworkInterface; -import java.net.Socket; import java.net.SocketException; import java.net.URL; import java.net.URLConnection; From 1ff25f3f5e180cef3321fd0f356ee9f77e8d821f Mon Sep 17 00:00:00 2001 From: GrapeS Date: Mon, 12 Oct 2026 17:10:02 +0800 Subject: [PATCH 9/9] style(plugins): remove unused imports --- .../src/main/java/common/org/tron/plugins/KeystoreUpdate.java | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/src/main/java/common/org/tron/plugins/KeystoreUpdate.java b/plugins/src/main/java/common/org/tron/plugins/KeystoreUpdate.java index cf4737f4488..06e98462d68 100644 --- a/plugins/src/main/java/common/org/tron/plugins/KeystoreUpdate.java +++ b/plugins/src/main/java/common/org/tron/plugins/KeystoreUpdate.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import java.io.Console; import java.io.File; -import java.io.IOException; import java.io.PrintWriter; import java.nio.charset.StandardCharsets; import java.util.Arrays;