Skip to content

refactor(api): remove dead WalletExtension gRPC service and config #6975

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

Open
0xbigapple wants to merge 3 commits into
base: release_v4.8.3
Choose a base branch
from
+146 −215
Open

refactor(api): remove dead WalletExtension gRPC service and config #6975

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
ca08100
refactor(api): remove dead WalletExtension gRPC service and config
0xbigapple Aug 7, 2026
941b04a
test(api): cover WalletExtension removal warning and gRPC status
0xbigapple Oct 9, 2026
af2f8ce
Merge remote-tracking branch 'upstream/release_v4.8.3' into feature/r…
0xbigapple Oct 9, 2026
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
3 changes: 0 additions & 3 deletions common/src/main/java/org/tron/common/parameter/CommonParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,9 +295,6 @@ public class CommonParameter {
public String trustNodeAddr; // clearParam: ""
@Getter
@Setter
public boolean walletExtensionApi;
@Getter
@Setter
public boolean estimateEnergy;
@Getter
@Setter
Expand Down
7 changes: 6 additions & 1 deletion common/src/main/java/org/tron/core/config/args/NodeConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public class NodeConfig {

// ---- Flat scalar fields (auto-bound by ConfigBeanFactory) ----
private String trustNode = "";
private boolean walletExtensionApi = false;
private int syncFetchBatchNum = 2000;
private int maxPendingBlockSize = 500;
private int validateSignThreadNum = 0; // 0 = auto (availableProcessors)
Expand Down Expand Up @@ -327,6 +326,12 @@ public static NodeConfig fromConfig(Config config) {
nc.maxConnectionsWithSameIp = section.getInt("maxActiveNodesWithSameIp");
}

// node.walletExtensionApi (removed): the WalletExtension gRPC service no longer exists
Comment thread
0xbigapple marked this conversation as resolved.
if (section.hasPath("walletExtensionApi")) {

@bladehan1 bladehan1 Sep 18, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

[NIT] First node.* key removed without a deprecation period — please record the exception in release notes

node.walletExtensionApi was a published config key (present in both shipped samples: config.conf defaulted it to true, reference.conf to false). The project config convention calls for a full deprecation cycle before removing a published key; this PR removes it in one step, with only this warn-and-ignore fallback. The practical impact is nil — old configs still boot (unknown keys are ignored) and operators get a clear warning, and ArgsTest.testRemovedWalletExtensionApiKeyIsIgnored locks that behavior in — so this reads as a documentable exception rather than a contract violation.

Suggestion: list the removal explicitly in the release notes ("Removed: WalletExtension gRPC service (4 RPCs) + node.walletExtensionApi config key") so the skipped deprecation cycle is visible to operators and future reviewers.

@0xbigapple 0xbigapple Sep 21, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Thanks for the suggestion. Agreed on the release note, will add it.

@waynercheung waynercheung Sep 29, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

[SHOULD] Please link the release-note/migration entry and the downstream follow-ups requested in #6931 before merge. The current diff contains no release note, and "Follow up" lists projects without tracking links. Cover the generated-code API break, reflection changes, the legacy-config warning, and the TronGrid alternative; link follow-ups for the affected protocol, clients, documentation, and deployment templates.

Please also update #6921's principle 2 and item 4 to record the agreed direct-removal exception and target release; its body still describes a two-stage deprecation plan.

logger.warn("Configuring [node.walletExtensionApi] has been removed and is ignored. "
+ "The WalletExtension gRPC service no longer exists.");
}

// Legacy key fallback: node.allowShieldedTransactionApi wins fullNodeAllowShieldedTransaction
if (section.hasPath("allowShieldedTransactionApi")) {
nc.allowShieldedTransactionApi =
Expand Down
3 changes: 0 additions & 3 deletions common/src/main/resources/reference.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,6 @@ node {
# Trust node for solidity node (example: "127.0.0.1:50051").
trustNode = ""

# Expose extension api to public or not
walletExtensionApi = false

listen.port = 18888 # P2P listen port.
fetchBlock.timeout = 500 # Block fetch timeout (ms).

Expand Down
1 change: 0 additions & 1 deletion framework/src/main/java/org/tron/core/config/args/Args.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,6 @@ private static void applyNodeConfig(NodeConfig nc) {
PARAMETER.trustNodeAddr = nc.getTrustNode();

PARAMETER.validateSignThreadNum = nc.getValidateSignThreadNum();
PARAMETER.walletExtensionApi = nc.isWalletExtensionApi();
PARAMETER.isOpenFullTcpDisconnect = nc.isOpenFullTcpDisconnect();
PARAMETER.nodeDetectEnable = nc.isNodeDetectEnable();

Expand Down
23 changes: 0 additions & 23 deletions framework/src/main/java/org/tron/core/services/RpcApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,10 @@
import org.tron.api.GrpcAPI.TransactionExtention;
import org.tron.api.GrpcAPI.TransactionIdList;
import org.tron.api.GrpcAPI.TransactionInfoList;
import org.tron.api.GrpcAPI.TransactionList;
import org.tron.api.GrpcAPI.TransactionListExtention;
import org.tron.api.GrpcAPI.TransactionSignWeight;
import org.tron.api.GrpcAPI.ViewingKeyMessage;
import org.tron.api.GrpcAPI.WitnessList;
import org.tron.api.MonitorGrpc;
import org.tron.api.WalletExtensionGrpc;
import org.tron.api.WalletGrpc.WalletImplBase;
import org.tron.api.WalletSolidityGrpc.WalletSolidityImplBase;
import org.tron.common.application.RpcService;
Expand Down Expand Up @@ -199,9 +196,6 @@ protected void addService(NettyServerBuilder serverBuilder) {
CommonParameter parameter = Args.getInstance();
if (parameter.isSolidityNode()) {
serverBuilder.addService(walletSolidityApi);
if (parameter.isWalletExtensionApi()) {
serverBuilder.addService(new WalletExtensionApi());
}
} else {
serverBuilder.addService(walletApi);
}
Expand Down Expand Up @@ -935,23 +929,6 @@ public void getEnergyPrices(EmptyMessage request,
}
}

/**
* WalletExtensionApi.
*/
public class WalletExtensionApi extends WalletExtensionGrpc.WalletExtensionImplBase {

private TransactionListExtention transactionList2Extention(TransactionList transactionList) {
if (transactionList == null) {
return null;
}
TransactionListExtention.Builder builder = TransactionListExtention.newBuilder();
for (Transaction transaction : transactionList.getTransactionList()) {
builder.addTransaction(transaction2Extention(transaction));
}
return builder.build();
}
}

/**
* WalletApi.
*/
Expand Down
13 changes: 0 additions & 13 deletions framework/src/main/java/org/tron/core/services/http/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
import org.tron.api.GrpcAPI.TransactionApprovedList;
import org.tron.api.GrpcAPI.TransactionExtention;
import org.tron.api.GrpcAPI.TransactionIdList;
import org.tron.api.GrpcAPI.TransactionList;
import org.tron.api.GrpcAPI.TransactionSignWeight;
import org.tron.common.crypto.Hash;
import org.tron.common.parameter.CommonParameter;
Expand Down Expand Up @@ -173,18 +172,6 @@ public static JSONObject printBlockToJSON(Block block, boolean selfType) {
return jsonObject;
}

public static String printTransactionList(TransactionList list, boolean selfType) {
List<Transaction> transactions = list.getTransactionList();
JSONObject jsonObject = JSONObject.outboundParseObject(
JsonFormat.printToString(list, selfType));
JSONArray jsonArray = new JSONArray();
transactions.stream()
.forEach(transaction -> jsonArray.add(printTransactionToJSON(transaction, selfType)));
jsonObject.put(TRANSACTION, jsonArray);

return jsonObject.toJSONString();
}

public static String printTransactionIdList(TransactionIdList list, boolean selfType) {
JSONObject jsonObject = JSONObject.outboundParseObject(
JsonFormat.printToString(list, selfType));
Expand Down
3 changes: 0 additions & 3 deletions framework/src/main/resources/config.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@ node.metrics = {
node {
trustNode = "127.0.0.1:50051"

# expose extension api to public or not
walletExtensionApi = true

listen.port = 18888

fetchBlock.timeout = 200
Expand Down
2 changes: 0 additions & 2 deletions framework/src/test/java/org/tron/common/ParameterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ public void testCommonParameter() {
assertEquals(1, parameter.getForbidTransferToContract());
parameter.setTrustNodeAddr("address");
assertEquals("address", parameter.getTrustNodeAddr());
parameter.setWalletExtensionApi(false);
assertFalse(parameter.isWalletExtensionApi());
parameter.setEstimateEnergy(false);
assertFalse(parameter.isEstimateEnergy());
parameter.setEstimateEnergyMaxRetry(2);
Expand Down
55 changes: 0 additions & 55 deletions framework/src/test/java/org/tron/common/utils/client/GrpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import org.tron.api.GrpcAPI;
import org.tron.api.GrpcAPI.AccountNetMessage;
import org.tron.api.GrpcAPI.AccountPaginated;
import org.tron.api.GrpcAPI.AssetIssueList;
import org.tron.api.GrpcAPI.BlockLimit;
import org.tron.api.GrpcAPI.BlockList;
Expand All @@ -17,9 +16,7 @@
import org.tron.api.GrpcAPI.NodeList;
import org.tron.api.GrpcAPI.NumberMessage;
import org.tron.api.GrpcAPI.PaginatedMessage;
import org.tron.api.GrpcAPI.TransactionList;
import org.tron.api.GrpcAPI.WitnessList;
import org.tron.api.WalletExtensionGrpc;
import org.tron.api.WalletGrpc;
import org.tron.api.WalletSolidityGrpc;
import org.tron.common.utils.ByteArray;
Expand All @@ -42,7 +39,6 @@ public class GrpcClient {
private ManagedChannel channelSolidity = null;
private WalletGrpc.WalletBlockingStub blockingStubFull = null;
private WalletSolidityGrpc.WalletSolidityBlockingStub blockingStubSolidity = null;
private WalletExtensionGrpc.WalletExtensionBlockingStub blockingStubExtension = null;

// public GrpcClient(String host, int port) {
// channel = ManagedChannelBuilder.forAddress(host, port)
Expand All @@ -67,7 +63,6 @@ public GrpcClient(String fullnode, String soliditynode) {
.usePlaintext()
.build();
blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelSolidity);
blockingStubExtension = WalletExtensionGrpc.newBlockingStub(channelSolidity);
}
}

Expand Down Expand Up @@ -284,56 +279,6 @@ public Optional<NodeList> listNodes() {
}
}*/

/* public Optional<AssetIssueList> getAssetIssueListByTimestamp(long time) {
NumberMessage.Builder timeStamp = NumberMessage.newBuilder();
timeStamp.setNum(time);
AssetIssueList assetIssueList = blockingStubSolidity
.getAssetIssueListByTimestamp(timeStamp.build());
return Optional.ofNullable(assetIssueList);
}*/
/* public Optional<TransactionList> getTransactionsByTimestamp(
long start, long end, int offset , int limit) {
TimeMessage.Builder timeMessage = TimeMessage.newBuilder();
timeMessage.setBeginInMilliseconds(start);
timeMessage.setEndInMilliseconds(end);
TimePaginatedMessage.Builder timePageMessage = TimePaginatedMessage.newBuilder();
timePageMessage.setTimeMessage(timeMessage);
timePageMessage.setOffset(offset);
timePageMessage.setLimit(limit);
TransactionList transactionList = blockingStubExtension
.getTransactionsByTimestamp(timePageMessage.build());
return Optional.ofNullable(transactionList);
}*/

/**
* constructor.
*/

public Optional<TransactionList> getTransactionsFromThis(byte[] address) {
ByteString addressBs = ByteString.copyFrom(address);
Account account = Account.newBuilder().setAddress(addressBs).build();
AccountPaginated.Builder builder = AccountPaginated.newBuilder().setAccount(account);
builder.setLimit(1000);
builder.setOffset(0);
TransactionList transactionList = blockingStubExtension
.getTransactionsFromThis(builder.build());
return Optional.ofNullable(transactionList);
}

/**
* constructor.
*/

public Optional<TransactionList> getTransactionsToThis(byte[] address) {
ByteString addressBs = ByteString.copyFrom(address);
Account account = Account.newBuilder().setAddress(addressBs).build();
AccountPaginated.Builder builder = AccountPaginated.newBuilder().setAccount(account);
builder.setLimit(1000);
builder.setOffset(0);
TransactionList transactionList = blockingStubExtension.getTransactionsToThis(builder.build());
return Optional.ofNullable(transactionList);
}

/* public Optional<Transaction> getTransactionById(String txID){
ByteString bsTxid = ByteString.copyFrom(ByteArray.fromHexString(txID));
BytesMessage request = BytesMessage.newBuilder().setValue(bsTxid).build();
Expand Down
18 changes: 0 additions & 18 deletions framework/src/test/java/org/tron/common/utils/client/WalletClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.tron.api.GrpcAPI.AssetIssueList;
import org.tron.api.GrpcAPI.BlockList;
import org.tron.api.GrpcAPI.NodeList;
import org.tron.api.GrpcAPI.TransactionList;
import org.tron.api.GrpcAPI.WitnessList;
import org.tron.common.crypto.ECKey;
import org.tron.common.parameter.CommonParameter;
Expand Down Expand Up @@ -647,14 +646,6 @@ public static Optional<NodeList> listNodes() {
return rpcCli.listNodes();
}

public static Optional<TransactionList> getTransactionsFromThis(byte[] address) {
return rpcCli.getTransactionsFromThis(address);
}

public static Optional<TransactionList> getTransactionsToThis(byte[] address) {
return rpcCli.getTransactionsToThis(address);
}

public static Block getBlock(long blockNum) {
return rpcCli.getBlock(blockNum);
}
Expand Down Expand Up @@ -701,15 +692,6 @@ private Transaction signTransaction(Transaction transaction) {
return TransactionUtils.sign(transaction, this.ecKey);
}

/* public static Optional<AssetIssueList> getAssetIssueListByTimestamp(long timestamp) {
return rpcCli.getAssetIssueListByTimestamp(timestamp);
}*/

/* public static Optional<TransactionList> getTransactionsByTimestamp(
long start, long end, int offset, int limit) {
return rpcCli.getTransactionsByTimestamp(start, end, offset, limit);
}*/

/**
* constructor.
*/
Expand Down
44 changes: 0 additions & 44 deletions framework/src/test/java/org/tron/common/utils/client/utils/HttpMethed.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,50 +1910,6 @@ public static HttpResponse getTransactionCountByBlocknumFromPbft(
return response;
}

/** constructor. */
public static HttpResponse getTransactionsFromThisFromSolidity(
String httpSolidityNode, byte[] fromAddress, long offset, long limit) {
try {
Map<String, String> map1 = new HashMap<String, String>();
Map<String, Object> map = new HashMap<String, Object>();
map1.put("address", ByteArray.toHexString(fromAddress));
map.put("account", map1);
map.put("offset", offset);
map.put("limit", limit);
String requestUrl = "http://" + httpSolidityNode + "/walletextension/gettransactionsfromthis";
String jsonStr = new Gson().toJson(map);
JsonObject jsonObj = new JsonParser().parse(jsonStr).getAsJsonObject();
response = createConnect(requestUrl, jsonObj);
} catch (Exception e) {
e.printStackTrace();
httppost.releaseConnection();
return null;
}
return response;
}

/** constructor. */
public static HttpResponse getTransactionsToThisFromSolidity(
String httpSolidityNode, byte[] toAddress, long offset, long limit) {
try {
Map<String, String> map1 = new HashMap<String, String>();
Map<String, Object> map = new HashMap<String, Object>();
map1.put("address", ByteArray.toHexString(toAddress));
map.put("account", map1);
map.put("offset", offset);
map.put("limit", limit);
String requestUrl = "http://" + httpSolidityNode + "/walletextension/gettransactionstothis";
String jsonStr = new Gson().toJson(map);
JsonObject jsonObj = new JsonParser().parse(jsonStr).getAsJsonObject();
response = createConnect(requestUrl, jsonObj);
} catch (Exception e) {
e.printStackTrace();
httppost.releaseConnection();
return null;
}
return response;
}

/** constructor. */
public static HttpResponse getAssetIssueByName(String httpNode, String name) {
try {
Expand Down
45 changes: 45 additions & 0 deletions framework/src/test/java/org/tron/core/config/args/ArgsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@

package org.tron.core.config.args;

import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.Logger;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.read.ListAppender;
import com.google.common.collect.Lists;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
Expand All @@ -31,6 +35,7 @@
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.slf4j.LoggerFactory;
import org.tron.common.TestConstants;
import org.tron.common.args.GenesisBlock;
import org.tron.common.parameter.CommonParameter;
Expand Down Expand Up @@ -369,6 +374,46 @@ public void testConfigStorageDefaults() {
Args.clearParam();
}

/**
* The removed node.walletExtensionApi key must stay harmless in operator configs:
* binding ignores it and fromConfig logs a removal warning. Lives here rather than
* NodeConfigTest because module jacoco reports only aggregate framework execution data.
*/
@Test
public void testRemovedWalletExtensionApiKeyWarnsWhenTrue() {
Assert.assertEquals(1, countWalletExtensionApiWarnings("node { walletExtensionApi = true }"));
}

@Test
public void testRemovedWalletExtensionApiKeyWarnsWhenFalse() {
Assert.assertEquals(1, countWalletExtensionApiWarnings("node { walletExtensionApi = false }"));
}

@Test
public void testNoWalletExtensionApiWarningWhenKeyAbsent() {
Assert.assertEquals(0, countWalletExtensionApiWarnings(""));
}

private static long countWalletExtensionApiWarnings(String hocon) {
Config config = ConfigFactory.parseString(hocon)
.withFallback(ConfigFactory.defaultReference());
Logger logger = (Logger) LoggerFactory.getLogger(NodeConfig.class);
ListAppender<ILoggingEvent> appender = new ListAppender<>();
appender.start();
logger.addAppender(appender);
try {
Assert.assertNotNull(NodeConfig.fromConfig(config));
} finally {
logger.detachAppender(appender);
appender.stop();
}
return appender.list.stream()
.filter(e -> e.getLevel() == Level.WARN)
.filter(e -> e.getFormattedMessage()
.contains("[node.walletExtensionApi] has been removed and is ignored"))
.count();
}

// ===========================================================================
// Boundary tests for node.fetchBlock.timeout clamping.
//
Expand Down
Loading
Loading