Merge pull request #915 from tronprotocol/develop

merge from develop

Author: zhaohong

src/main/java/org/tron/common/overlay/server/SyncPool.java

@@ -64,6 +64,8 @@ public class SyncPool {
   private NodeManager nodeManager;
 
   @Autowired
+  private ApplicationContext ctx;
+
   private ChannelManager channelManager;
 
   private PeerConnectionDelegate peerDel;
@@ -86,6 +88,8 @@ public SyncPool(PeerClient peerClient) {
   public void init(PeerConnectionDelegate peerDel) {
     this.peerDel = peerDel;
 
+    channelManager = ctx.getBean(ChannelManager.class);
+
     poolLoopExecutor.scheduleWithFixedDelay(() -> {
       try {
         fillUp();

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

@@ -5,14 +5,10 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.tron.api.GrpcAPI.AssetIssueList;
 import org.tron.api.GrpcAPI.TransactionList;
-import org.tron.api.GrpcAPI.WitnessList;
 import org.tron.common.utils.ByteArray;
 import org.tron.core.db.api.StoreAPI;
-import org.tron.protos.Contract.AssetIssueContract;
 import org.tron.protos.Protocol.Transaction;
-import org.tron.protos.Protocol.Witness;
 
 @Slf4j
 @Component
@@ -21,19 +17,6 @@ public class WalletSolidity {
   @Autowired
   private StoreAPI storeAPI;
 
-  public WitnessList getWitnessList() {
-    List<Witness> witnessAll = storeAPI.getWitnessAll();
-    WitnessList witnessList = WitnessList.newBuilder().addAllWitnesses(witnessAll).build();
-    return witnessList;
-  }
-
-  public AssetIssueList getAssetIssueList() {
-    List<AssetIssueContract> assetIssueAll = storeAPI.getAssetIssueAll();
-    AssetIssueList assetIssueList =
-        AssetIssueList.newBuilder().addAllAssetIssue(assetIssueAll).build();
-    return assetIssueList;
-  }
-
   public TransactionList getTransactionsFromThis(ByteString thisAddress, long offset, long limit) {
     List<Transaction> transactionsFromThis = storeAPI
         .getTransactionsFromThis(ByteArray.toHexString(thisAddress.toByteArray()), offset, limit);

src/main/java/org/tron/core/db/Manager.java

@@ -905,6 +905,7 @@ public BlockId getBlockIdByNum(final long num) throws ItemNotFoundException {
   public BlockCapsule getBlockByNum(final long num) throws ItemNotFoundException, BadItemException {
     return getBlockById(getBlockIdByNum(num));
   }
+
   /**
    * Generate a block.
    */
@@ -922,24 +923,22 @@ public synchronized BlockCapsule generateBlock(
       throw new IllegalArgumentException("generate block timestamp is invalid.");
     }
 
-    long currentTrxSize = 0;
     long postponedTrxCount = 0;
 
     final BlockCapsule blockCapsule =
         new BlockCapsule(number + 1, preHash, when, witnessCapsule.getAddress());
-    currentTrxSize = blockCapsule.getInstance().getSerializedSize();
     dialog.reset();
     dialog.setValue(revokingStore.buildDialog());
     Iterator iterator = pendingTransactions.iterator();
     while (iterator.hasNext()) {
       TransactionCapsule trx = (TransactionCapsule) iterator.next();
-      if (DateTime.now().getMillis() - when > ChainConstant.BLOCK_PRODUCED_INTERVAL * 0.5) {
+      if (DateTime.now().getMillis() - when
+          > ChainConstant.BLOCK_PRODUCED_INTERVAL * 0.5 * ChainConstant.BLOCK_PRODUCED_TIME_OUT) {
         logger.debug("Processing transaction time exceeds the 50% producing time。");
         break;
       }
-      currentTrxSize += trx.getSerializedSize() + 2;
       // check the block size
-      if (currentTrxSize  > ChainConstant.BLOCK_SIZE) {
+      if ((blockCapsule.getInstance().getSerializedSize() + trx.getSerializedSize() + 3) > ChainConstant.BLOCK_SIZE) {
         postponedTrxCount++;
         continue;
       }

src/main/java/org/tron/core/db/api/StoreAPI.java

@@ -20,9 +20,7 @@
 import org.springframework.util.StringUtils;
 import org.tron.core.db.api.index.Index;
 import org.tron.core.db.api.index.TransactionIndex;
-import org.tron.protos.Contract.AssetIssueContract;
 import org.tron.protos.Protocol.Transaction;
-import org.tron.protos.Protocol.Witness;
 
 @Component
 @Slf4j
@@ -119,17 +117,17 @@ public List<Transaction> getTransactionsToThis(String address, long offset, long
    *                            witness api                                      *
    *******************************************************************************
    */
-  public List<Witness> getWitnessAll() {
-    Index.Iface<Witness> index = indexHelper.getWitnessIndex();
-    return ImmutableList.copyOf(index);
-  }
+//  public List<Witness> getWitnessAll() {
+//    Index.Iface<Witness> index = indexHelper.getWitnessIndex();
+//    return ImmutableList.copyOf(index);
+//  }
 
   /********************************************************************************
    *                         AssetIssue api                                       *
    ********************************************************************************
    */
-  public List<AssetIssueContract> getAssetIssueAll() {
-    Index.Iface<AssetIssueContract> index = indexHelper.getAssetIssueIndex();
-    return ImmutableList.copyOf(index);
-  }
+//  public List<AssetIssueContract> getAssetIssueAll() {
+//    Index.Iface<AssetIssueContract> index = indexHelper.getAssetIssueIndex();
+//    return ImmutableList.copyOf(index);
+//  }
 }

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

@@ -214,14 +214,14 @@ public void getAccount(Account request, StreamObserver<Account> responseObserver
 
     @Override
     public void listWitnesses(EmptyMessage request, StreamObserver<WitnessList> responseObserver) {
-      responseObserver.onNext(walletSolidity.getWitnessList());
+      responseObserver.onNext(wallet.getWitnessList());
       responseObserver.onCompleted();
     }
 
     @Override
     public void getAssetIssueList(EmptyMessage request,
         StreamObserver<AssetIssueList> responseObserver) {
-      responseObserver.onNext(walletSolidity.getAssetIssueList());
+      responseObserver.onNext(wallet.getAssetIssueList());
       responseObserver.onCompleted();
     }
 

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

@@ -1,6 +1,7 @@
 package org.tron.program;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.tron.common.application.Application;
@@ -27,7 +28,11 @@ public static void main(String[] args) throws InterruptedException {
       return;
     }
 
-    ApplicationContext context = new AnnotationConfigApplicationContext(DefaultConfig.class);
+    DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+    beanFactory.setAllowCircularReferences(false);
+    AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(beanFactory);
+    context.register(DefaultConfig.class);
+    context.refresh();
     Application appT = ApplicationFactory.create(context);
     shutdown(appT);
     //appT.init(cfgArgs);

src/main/protos/api/api.proto

@@ -93,14 +93,14 @@ service Wallet {
   };
 
   rpc CreateWitness (WitnessCreateContract) returns (Transaction) {
-      option (google.api.http) = {
-        post: "/wallet/createwitness"
-        body: "*"
-        additional_bindings {
-          get: "/wallet/createwitness"
-        }
-      };
+    option (google.api.http) = {
+      post: "/wallet/createwitness"
+      body: "*"
+      additional_bindings {
+        get: "/wallet/createwitness"
+      }
     };
+  };
 
   rpc TransferAsset (TransferAssetContract) returns (Transaction) {
     option (google.api.http) = {
@@ -192,14 +192,14 @@ service Wallet {
     };
   }
   rpc GetAccountNet (Account) returns (AccountNetMessage) {
-      option (google.api.http) = {
+    option (google.api.http) = {
         post: "/wallet/getaccountnet"
         body: "*"
         additional_bindings {
           get: "/wallet/getaccountnet"
         }
       };
-    };
+  };
   rpc GetAssetIssueByName (BytesMessage) returns (AssetIssueContract) {
     option (google.api.http) = {
       post: "/wallet/getassetissuebyname"
@@ -333,33 +333,6 @@ service WalletSolidity {
       }
     };
   }
-  rpc GetAssetIssueListByTimestamp (NumberMessage) returns (AssetIssueList) {
-    option (google.api.http) = {
-      post: "/walletsolidity/getassetissuelistbytimestamp"
-      body: "*"
-      additional_bindings {
-        get: "/walletsolidity/getassetissuelistbytimestamp"
-      }
-    };
-  }
-  rpc GetAssetIssueByAccount (Account) returns (AssetIssueList) {
-    option (google.api.http) = {
-      post: "/walletsolidity/getassetissuebyaccount"
-      body: "*"
-      additional_bindings {
-        get: "/walletsolidity/getassetissuebyaccount"
-      }
-    };
-  }
-  rpc GetAssetIssueByName (BytesMessage) returns (AssetIssueContract) {
-    option (google.api.http) = {
-      post: "/walletsolidity/getassetissuebyname"
-      body: "*"
-      additional_bindings {
-        get: "/walletsolidity/getassetissuebyname"
-      }
-    };
-  }
   rpc GetNowBlock (EmptyMessage) returns (Block) {
     option (google.api.http) = {
       post: "/walletsolidity/getnowblock"
@@ -378,46 +351,10 @@ service WalletSolidity {
       }
     };
   }
-  //get transaction
-  rpc TotalTransaction (EmptyMessage) returns (NumberMessage) {
-    option (google.api.http) = {
-      post: "/walletsolidity/totaltransaction"
-      body: "*"
-      additional_bindings {
-        get: "/walletsolidity/totaltransaction"
-      }
-    };
-  }
-  rpc GetTransactionById (BytesMessage) returns (Transaction) {
-    option (google.api.http) = {
-      post: "/walletsolidity/gettransactionbyid"
-      body: "*"
-      additional_bindings {
-        get: "/walletsolidity/gettransactionbyid"
-      }
-    };
-  }
 };
 
 service WalletExtension {
-  rpc GetTransactionsByTimestamp (TimePaginatedMessage) returns (TransactionList) {
-    option (google.api.http) = {
-      post: "/walletextension/gettransactionsbytimestamp"
-      body: "*"
-      additional_bindings {
-        get: "/walletextension/gettransactionsbytimestamp"
-      }
-    };
-  }
-  rpc GetTransactionsByTimestampCount (TimeMessage) returns (NumberMessage) {
-    option (google.api.http) = {
-      post: "/walletextension/gettransactionsbytimestampcount"
-      body: "*"
-      additional_bindings {
-        get: "/walletextension/gettransactionsbytimestampcount"
-      }
-    };
-  }
+
   rpc GetTransactionsFromThis (AccountPaginated) returns (TransactionList) {
     option (google.api.http) = {
       post: "/walletextension/gettransactionsfromthis"
@@ -436,24 +373,6 @@ service WalletExtension {
       }
     };
   }
-  rpc GetTransactionsFromThisCount (Account) returns (NumberMessage) {
-    option (google.api.http) = {
-      post: "/walletextension/gettransactionsfromthiscount"
-      body: "*"
-      additional_bindings {
-        get: "/walletextension/gettransactionsfromthiscount"
-      }
-    };
-  }
-  rpc GetTransactionsToThisCount (Account) returns (NumberMessage) {
-    option (google.api.http) = {
-      post: "/walletextension/gettransactionstothiscount"
-      body: "*"
-      additional_bindings {
-        get: "/walletextension/gettransactionstothiscount"
-      }
-    };
-  }
 };
 
 // the api of tron's db