Merge pull request #1793 from tronprotocol/soliditynode_use_fullnode_databse

fix

Author: Yrp

build.gradle

@@ -23,6 +23,9 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "jacoco"
 apply plugin: 'maven-publish'
 
+jar.enabled = false
+shadowJar.enabled = false
+
 sourceCompatibility = 1.8
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'
 mainClassName = 'org.tron.program.FullNode'

src/main/java/org/tron/core/Wallet.java

@@ -111,6 +111,7 @@
 import org.tron.core.exception.ValidateSignatureException;
 import org.tron.core.net.message.TransactionMessage;
 import org.tron.core.net.node.NodeImpl;
+import org.tron.core.net.peer.PeerConnection;
 import org.tron.protos.Contract.AssetIssueContract;
 import org.tron.protos.Contract.CreateSmartContract;
 import org.tron.protos.Contract.TransferContract;
@@ -145,6 +146,8 @@ public class Wallet {
   private static String addressPreFixString = Constant.ADD_PRE_FIX_STRING_TESTNET;  //default testnet
   private static byte addressPreFixByte = Constant.ADD_PRE_FIX_BYTE_TESTNET;
 
+  private int minEffectiveConnection = Args.getInstance().getMinEffectiveConnection();
+
   /**
    * Creates a new Wallet with a random ECKey.
    */
@@ -399,22 +402,28 @@ public TransactionCapsule createTransactionCapsule(com.google.protobuf.Message m
    */
   public GrpcAPI.Return broadcastTransaction(Transaction signaturedTransaction) {
     GrpcAPI.Return.Builder builder = GrpcAPI.Return.newBuilder();
-    try {
-      if (p2pNode.getActivePeer().isEmpty()) {
-        logger.info("Broadcast transaction failed, no connection.");
-        return builder.setResult(false).setCode(response_code.OTHER_ERROR)
-            .setMessage(ByteString.copyFromUtf8("no connection"))
-            .build();
-      }
-      if (!p2pNode.getActivePeer().stream()
-          .filter(p -> !p.isNeedSyncFromUs() && !p.isNeedSyncFromPeer())
-          .findFirst()
-          .isPresent()) {
-        logger.info("Broadcast transaction failed, no effective connection.");
-        return builder.setResult(false).setCode(response_code.OTHER_ERROR)
-            .setMessage(ByteString.copyFromUtf8("no effective connection"))
-            .build();
+    try{
+      if (minEffectiveConnection != 0) {
+        if (p2pNode.getActivePeer().isEmpty()) {
+          logger.info("Broadcast transaction failed, no connection.");
+          return builder.setResult(false).setCode(response_code.OTHER_ERROR)
+              .setMessage(ByteString.copyFromUtf8("no connection"))
+              .build();
+        }
+
+        int count = (int) p2pNode.getActivePeer().stream()
+            .filter(p -> !p.isNeedSyncFromUs() && !p.isNeedSyncFromPeer())
+            .count();
+
+        if (count < minEffectiveConnection) {
+          String info = "effective connection:" + count + " lt minEffectiveConnection:" + minEffectiveConnection;
+          logger.info("Broadcast transaction failed, {}", info);
+          return builder.setResult(false).setCode(response_code.OTHER_ERROR)
+              .setMessage(ByteString.copyFromUtf8(info))
+              .build();
+        }
       }
+
       TransactionCapsule trx = new TransactionCapsule(signaturedTransaction);
       Message message = new TransactionMessage(signaturedTransaction);
 

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

@@ -370,6 +370,10 @@ public class Args {
   @Setter
   private String trxReferenceBlock;
 
+  @Getter
+  @Setter
+  private int minEffectiveConnection;
+
   public static void clearParam() {
     INSTANCE.outputDirectory = "output-directory";
     INSTANCE.help = false;
@@ -731,11 +735,16 @@ public static void setParam(final String[] args, final String confFileName) {
     INSTANCE.trxReferenceBlock = config.hasPath("trx.reference.block") ?
         config.getString("trx.reference.block") : "head";
 
+    INSTANCE.minEffectiveConnection = config.hasPath("node.rpc.minEffectiveConnection") ?
+        config.getInt("node.rpc.minEffectiveConnection") : 1;
+
     INSTANCE.vmTrace =
         config.hasPath("vm.vmTrace") ? config
             .getBoolean("vm.vmTrace") : false;
     initBackupProperty(config);
 
+
+
     logConfig();
   }
 

src/main/java/org/tron/program/SolidityNode.java

@@ -59,6 +59,7 @@ public class SolidityNode {
   public SolidityNode(Manager dbManager, Args cfgArgs) {
     this.dbManager = dbManager;
     this.cfgArgs = cfgArgs;
+    resolveCompatibilityIssueIfUsingFullNodeDatabase();
     lastSolidityBlockNum = dbManager.getDynamicPropertiesStore().getLatestSolidifiedBlockNum();
     ID.set(lastSolidityBlockNum);
     databaseGrpcClient = new DatabaseGrpcClient(cfgArgs.getTrustNodeAddr());
@@ -323,7 +324,6 @@ public static void main(String[] args) throws InterruptedException {
     nodeManager.close();
 
     SolidityNode node = new SolidityNode(appT.getDbManager(), cfgArgs);
-    node.resolveCompatibilityIssueIfUsingFullNodeDatabase();
     node.start();
 
     rpcApiService.blockUntilShutdown();

src/main/resources/config.conf

@@ -151,6 +151,9 @@ node {
 
     # The maximum size of header list allowed to be received, default 8192
     # maxHeaderListSize =
+
+    # Transactions can only be broadcast if the number of effective connections is reached.
+    minEffectiveConnection = 1
   }
 
   # Limits the maximum percentage (default 75%) of producing block interval

src/test/java/org/tron/core/net/node/StartFetchSyncBlockTest.java

@@ -243,7 +243,6 @@ public void run() {
   @AfterClass
   public static void destroy() {
     Args.clearParam();
-    peerClient.close();
     handshakeHandlerTest.close();
     context.destroy();
     appT.shutdownServices();