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

common/src/main/java/org/tron/common/parameter/CommonParameter.java

@@ -295,9 +295,6 @@ public class CommonParameter {
   public String trustNodeAddr; // clearParam: ""
   @Getter
   @Setter
-  public boolean walletExtensionApi;
-  @Getter
-  @Setter
   public boolean estimateEnergy;
   @Getter
   @Setter

common/src/main/java/org/tron/core/config/args/NodeConfig.java

@@ -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)
@@ -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
+    if (section.hasPath("walletExtensionApi")) {
+      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 =

common/src/main/resources/reference.conf

@@ -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).
 

framework/src/main/java/org/tron/core/config/args/Args.java

@@ -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();
 

framework/src/main/java/org/tron/core/services/RpcApiService.java

@@ -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;
@@ -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);
     }
@@ -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.
    */

framework/src/main/java/org/tron/core/services/http/Util.java

@@ -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;
@@ -148,17 +147,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.parseObject(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.parseObject(JsonFormat.printToString(list, selfType));
 

framework/src/main/resources/config.conf

@@ -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

framework/src/test/java/org/tron/common/ParameterTest.java

@@ -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);

framework/src/test/java/org/tron/common/utils/client/GrpcClient.java

@@ -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;
@@ -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;
@@ -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)
@@ -67,7 +63,6 @@ public GrpcClient(String fullnode, String soliditynode) {
           .usePlaintext()
           .build();
       blockingStubSolidity = WalletSolidityGrpc.newBlockingStub(channelSolidity);
-      blockingStubExtension = WalletExtensionGrpc.newBlockingStub(channelSolidity);
     }
   }
 
@@ -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();

framework/src/test/java/org/tron/common/utils/client/WalletClient.java

@@ -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;
@@ -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);
   }
@@ -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.
    */

framework/src/test/java/org/tron/common/utils/client/utils/HttpMethed.java

@@ -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 {

framework/src/test/java/org/tron/core/config/args/ArgsTest.java

@@ -369,6 +369,18 @@ 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 testRemovedWalletExtensionApiKeyIsIgnored() {
+    Config config = ConfigFactory.parseString("node { walletExtensionApi = true }")
+        .withFallback(ConfigFactory.defaultReference());
+    Assert.assertNotNull(NodeConfig.fromConfig(config));
+  }
+
   // ===========================================================================
   // Boundary tests for node.fetchBlock.timeout clamping.
   //

framework/src/test/java/org/tron/core/services/http/UtilMockTest.java

@@ -198,16 +198,6 @@ public void testPrintBlockToJSONCoversAllProtoTopLevelFields() {
     }
   }
 
-  @Test
-  public void testPrintTransactionList() {
-    TransactionCapsule transactionCapsule = getTransactionCapsuleExample();
-    GrpcAPI.TransactionList list = GrpcAPI.TransactionList.newBuilder()
-        .addTransaction(transactionCapsule.getInstance())
-        .build();
-    String out = Util.printTransactionList(list, true);
-    Assert.assertNotNull(out);
-  }
-
   private TransactionCapsule getTransactionCapsuleExample() {
     final String OWNER_ADDRESS = "41548794500882809695a8a687866e76d4271a1abc";
     final String RECEIVER_ADDRESS = "41abd4b9367799eaa3197fecb144eb71de1e049150";

framework/src/test/resources/config-shield.conf

@@ -41,9 +41,6 @@ node {
   # trustNode = "ip:port"
   trustNode = "127.0.0.1:50051"
 
-  # expose extension api to public or not
-  walletExtensionApi = true
-
   listen.port = 6666
 
   # Number of validate sign thread, default availableProcessors / 2