Merge pull request #859 from tronprotocol/release_v4.9.0

Release v4.9.0

Author: lvs0075

README.md

@@ -1,3 +1,23 @@
+buildscript {
+    repositories {
+        mavenLocal()
+        maven {
+            url "https://cdn.lfrs.sl/repository.liferay.com/nexus/content/groups/public"
+        }
+        mavenCentral()
+    }
+
+    dependencies {
+//        classpath 'com.github.jengelman.gradle.plugins:shadow:6.1.0'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
+        classpath "com.github.node-gradle:gradle-node-plugin:7.1.0"
+    }
+}
+
+plugins {
+    id 'com.github.johnrengelman.shadow' version '7.1.2'
+}
+
 group 'Tron'
 version '1.0-SNAPSHOT'
 
@@ -38,23 +58,6 @@ sourceSets {
     }
 }
 
-buildscript {
-    repositories {
-        mavenLocal()
-        maven {
-            url "https://cdn.lfrs.sl/repository.liferay.com/nexus/content/groups/public"
-        }
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.github.jengelman.gradle.plugins:shadow:5.2.0'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.12'
-        classpath "gradle.plugin.com.liferay:gradle-plugins-node:7.0.2"
-    }
-}
-
-
 dependencies {
     implementation group: 'junit', name: 'junit', version: '4.13.2'
     implementation group: 'com.beust', name: 'jcommander', version: '1.82'
@@ -97,7 +100,7 @@ dependencies {
     implementation("io.github.tronprotocol:trident:0.10.0") {
         exclude group: "com.google.guava", module: "guava"
     }
-
+    implementation 'javax.annotation:javax.annotation-api:1.3.2'
 }
 
 protobuf {

build.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,21 +1,28 @@
 package org.tron.common.enums;
 
+import static org.tron.trident.core.Constant.FULLNODE_NILE;
+import static org.tron.trident.core.Constant.FULLNODE_NILE_SOLIDITY;
+import static org.tron.trident.core.Constant.TRONGRID_MAIN_NET;
+import static org.tron.trident.core.Constant.TRONGRID_MAIN_NET_SOLIDITY;
+import static org.tron.trident.core.Constant.TRONGRID_SHASTA;
+import static org.tron.trident.core.Constant.TRONGRID_SHASTA_SOLIDITY;
+
 import lombok.Getter;
 import lombok.Setter;
 
 @Getter
 public enum NetType {
   MAIN(
       "https://api.trongrid.io",
-      new Grpc("grpc.trongrid.io:50051", "grpc.trongrid.io:50052"),
+      new Grpc(TRONGRID_MAIN_NET, TRONGRID_MAIN_NET_SOLIDITY),
       new GasFree(
           728126428L,
           "TFFAMQLZybALaLb4uxHA9RBE7pxhUAjF3U",
           "https://open.gasfree.io",
           "/tron")
   ),
   NILE("https://nile.trongrid.io",
-      new Grpc("grpc.nile.trongrid.io:50051", "grpc.nile.trongrid.io:50061"),
+      new Grpc(FULLNODE_NILE, FULLNODE_NILE_SOLIDITY),
       new GasFree(
           3448148188L,
           "THQGuFzL87ZqhxkgqYEryRAd7gqFqL5rdc",
@@ -24,7 +31,7 @@ public enum NetType {
   ),
   SHASTA(
       "https://api.shasta.trongrid.io",
-      new Grpc("grpc.shasta.trongrid.io:50051", "grpc.shasta.trongrid.io:50052"),
+      new Grpc(TRONGRID_SHASTA, TRONGRID_SHASTA_SOLIDITY),
       new GasFree(
           2494104990L,
           "TSwCtDum13k1PodgNgTWx5be7k1c6eWaNP",

src/main/java/org/tron/common/enums/NetType.java

@@ -347,9 +347,9 @@ public static String parseMethod(String methodSign, String input, boolean isHex)
     if (isHex) {
       return Hex.toHexString(selector) + input;
     }
-    byte[] encodedParms = encodeInput(methodSign, input);
+    byte[] encodedParams = encodeInput(methodSign, input);
 
-    return Hex.toHexString(selector) + Hex.toHexString(encodedParms);
+    return Hex.toHexString(selector) + Hex.toHexString(encodedParams);
   }
 
   public static byte[] encodeInput(String methodSign, String input) {

src/main/java/org/tron/common/utils/AbiUtil.java

@@ -0,0 +1,86 @@
+package org.tron.common.utils;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class CommandHelpUtil {
+  private static final Map<String, CommandHelp> commandHelps = new HashMap<>();
+
+  static {
+    try {
+      loadCommandExamples();
+    } catch (IOException e) {
+      System.out.println(e.getMessage());
+    }
+  }
+
+  private static class CommandHelp {
+    String syntax;
+    String summary;
+    List<String> examples = new ArrayList<>();
+
+    @Override
+    public String toString() {
+      StringBuilder sb = new StringBuilder();
+      sb.append("Syntax:\n").append(syntax);
+      if (summary != null && !summary.isEmpty()) {
+        sb.append("\nSummary:\n").append(summary);
+      }
+      sb.append("\nUsage examples:");
+      for (String example : examples) {
+        sb.append("\n").append(example);
+      }
+      return sb + "\n";
+    }
+  }
+
+  public static void loadCommandExamples() throws IOException {
+    InputStream inputStream = CommandHelpUtil.class.getResourceAsStream("/commands.txt");
+    if (inputStream == null) {
+      System.err.println("Cannot find commands.txt file");
+      return;
+    }
+    try (BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+      String line;
+      CommandHelp currentHelp = null;
+      String currentSection = null;
+
+      while ((line = reader.readLine()) != null) {
+        if (line.startsWith("Syntax:")) {
+          currentHelp = new CommandHelp();
+          currentSection = "syntax";
+        } else if (line.startsWith("Summary:")) {
+          currentSection = "summary";
+        } else if (line.startsWith("Usage example:")) {
+          currentSection = "example";
+        } else if (line.startsWith("wallet> ") && currentHelp != null) {
+          currentHelp.examples.add(line);
+          if (currentHelp.examples.size() == 1) {
+            String command = line.substring("wallet> ".length()).split("\\s+")[0];
+            commandHelps.put(command.toLowerCase(), currentHelp);
+          }
+        } else if (currentHelp != null && currentSection != null) {
+          switch (currentSection) {
+            case "syntax":
+              currentHelp.syntax = (currentHelp.syntax == null ? "" : currentHelp.syntax + "\n") + line;
+              break;
+            case "summary":
+              currentHelp.summary = (currentHelp.summary == null ? "" : currentHelp.summary + "\n") + line;
+              break;
+          }
+        }
+      }
+    }
+  }
+
+  public static String getCommandHelp(String command) {
+    CommandHelp help = commandHelps.get(command);
+    return help != null ? help.toString() : "No help found for command: " + command;
+  }
+}

src/main/java/org/tron/common/utils/CommandHelpUtil.java

@@ -4,6 +4,8 @@
 import static org.tron.common.utils.Utils.greenBoldHighlight;
 
 import java.io.IOException;
+import java.security.Provider;
+import java.security.Security;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -17,6 +19,14 @@
 
 public class HttpUtils {
 
+  static {
+    Provider sunEc = Security.getProvider("SunEC");
+    if (sunEc != null) {
+      Security.removeProvider("SunEC");
+      Security.insertProviderAt(sunEc, 1);
+    }
+  }
+
   private static final OkHttpClient client = new OkHttpClient.Builder()
       .connectTimeout(10, TimeUnit.SECONDS)
       .readTimeout(15, TimeUnit.SECONDS)

src/main/java/org/tron/common/utils/HttpUtils.java

@@ -16,6 +16,7 @@
 package org.tron.common.utils;
 
 import com.google.protobuf.ByteString;
+import com.google.protobuf.InvalidProtocolBufferException;
 import java.security.SignatureException;
 import java.util.Arrays;
 import java.util.List;
@@ -47,6 +48,7 @@
 import org.tron.protos.contract.VoteAssetContractOuterClass.VoteAssetContract;
 import org.tron.protos.contract.WitnessContract.VoteWitnessContract;
 import org.tron.protos.contract.WitnessContract.WitnessCreateContract;
+import org.tron.trident.proto.Chain;
 
 public class TransactionUtils {
 
@@ -63,7 +65,7 @@ public static byte[] getHash(Transaction transaction) {
     return Sha256Sm3Hash.hash(tmp.build().toByteArray());
   }
 
-  public static Sha256Hash getTransactionId(Transaction transaction) {
+  public static Sha256Hash getTransactionId(Chain.Transaction transaction) {
     return Sha256Hash.of(true, transaction.getRawData().toByteArray());
   }
 
@@ -326,6 +328,12 @@ public static boolean validTransaction(Transaction signedTransaction) {
     return true;
   }
 
+  public static Chain.Transaction sign(Chain.Transaction transaction, SignInterface myKey)
+      throws InvalidProtocolBufferException {
+    return Chain.Transaction.parseFrom(
+        sign(Transaction.parseFrom(transaction.toByteArray()), myKey).toByteArray());
+  }
+
   public static Transaction sign(Transaction transaction, SignInterface myKey) {
     Transaction.Builder transactionBuilderSigned = transaction.toBuilder();
     byte[] hash = Sha256Sm3Hash.hash(transaction.getRawData().toByteArray());
@@ -339,18 +347,28 @@ public static Transaction sign(Transaction transaction, SignInterface myKey) {
   public static Transaction setTimestamp(Transaction transaction) {
     long currentTime = System.currentTimeMillis(); // *1000000 + System.nanoTime()%1000000;
     Transaction.Builder builder = transaction.toBuilder();
-    org.tron.protos.Protocol.Transaction.raw.Builder rowBuilder =
+    Transaction.raw.Builder rowBuilder =
         transaction.getRawData().toBuilder();
     rowBuilder.setTimestamp(currentTime);
     builder.setRawData(rowBuilder.build());
     return builder.build();
   }
 
-  public static Transaction setExpirationTime(Transaction transaction) {
+  public static Chain.Transaction setTimestamp(Chain.Transaction transaction) {
+    long currentTime = System.currentTimeMillis(); // *1000000 + System.nanoTime()%1000000;
+    Chain.Transaction.Builder builder = transaction.toBuilder();
+    Chain.Transaction.raw.Builder rowBuilder =
+        transaction.getRawData().toBuilder();
+    rowBuilder.setTimestamp(currentTime);
+    builder.setRawData(rowBuilder.build());
+    return builder.build();
+  }
+
+  public static Chain.Transaction setExpirationTime(Chain.Transaction transaction) {
     if (transaction.getSignatureCount() == 0) {
       long expirationTime = System.currentTimeMillis() + 6 * 60 * 60 * 1000;
-      Transaction.Builder builder = transaction.toBuilder();
-      org.tron.protos.Protocol.Transaction.raw.Builder rowBuilder =
+      Chain.Transaction.Builder builder = transaction.toBuilder();
+      Chain.Transaction.raw.Builder rowBuilder =
           transaction.getRawData().toBuilder();
       rowBuilder.setExpiration(expirationTime);
       builder.setRawData(rowBuilder.build());
@@ -359,6 +377,12 @@ public static Transaction setExpirationTime(Transaction transaction) {
     return transaction;
   }
 
+  public static Chain.Transaction setPermissionId(Chain.Transaction transaction, String tipString)
+      throws CancelException, InvalidProtocolBufferException {
+    return Chain.Transaction.parseFrom(
+        setPermissionId(Transaction.parseFrom(transaction.toByteArray()), tipString).toByteArray());
+  }
+
   public static Transaction setPermissionId(Transaction transaction, String tipString)
       throws CancelException {
     if (transaction.getSignatureCount() != 0