Merge pull request #211 from semuxgo/core-block-limit

Core: remove block size limit

src/main/java/org/semux/Kernel.java

@@ -76,7 +76,6 @@ public enum State {
 
     protected State state = State.STOPPED;
 
-    protected final ReentrantReadWriteLock stateLock = new ReentrantReadWriteLock();
     protected Config config;
     protected Genesis genesis;
 
@@ -362,7 +361,7 @@ public synchronized void stop() {
         client.close();
 
         // make sure no thread is reading/writing the state
-        ReentrantReadWriteLock.WriteLock lock = stateLock.writeLock();
+        ReentrantReadWriteLock.WriteLock lock = chain.getStateLock().writeLock();
         lock.lock();
         try {
             for (DatabaseName name : DatabaseName.values()) {
@@ -456,15 +455,6 @@ public Config getConfig() {
         return config;
     }
 
-    /**
-     * Returns the state lock.
-     * 
-     * @return
-     */
-    public ReentrantReadWriteLock getStateLock() {
-        return stateLock;
-    }
-
     /**
      * Returns the syncing manager.
      * 

src/main/java/org/semux/api/v2/TypeFactory.java

@@ -157,9 +157,7 @@ public static TransactionType transactionType(Transaction tx) {
 
     public static TransactionResultType transactionResultType(Transaction tx, TransactionResult result, long number) {
         // gas price is in nano sem, not wei
-        boolean isVMTransaction = (tx.getType() == org.semux.core.TransactionType.CREATE
-                || tx.getType() == org.semux.core.TransactionType.CALL);
-        Amount fee = isVMTransaction ? Amount.mul(result.getGasPrice(), result.getGasUsed()) : tx.getFee();
+        Amount fee = tx.isVMTransaction() ? Amount.mul(result.getGasPrice(), result.getGasUsed()) : tx.getFee();
 
         return new TransactionResultType()
                 .blockNumber(Long.toString(number))

src/main/java/org/semux/config/AbstractConfig.java

@@ -52,7 +52,6 @@ public abstract class AbstractConfig implements Config, ChainSpec {
     // Chain spec
     // =========================
     protected long maxBlockGasLimit = 10_000_000L; // 10m gas
-    protected int maxBlockTransactionsSize = 1024 * 1024;
     protected Amount minTransactionFee = MILLI_SEM.of(5);
     protected Amount minDelegateBurnAmount = SEM.of(1000);
     protected long nonVMTransactionGasCost = 21_000L;
@@ -160,11 +159,6 @@ public long maxBlockGasLimit() {
         return maxBlockGasLimit;
     }
 
-    @Override
-    public int maxBlockTransactionsSize() {
-        return maxBlockTransactionsSize;
-    }
-
     @Override
     public int maxTransactionDataSize(TransactionType type) {
         switch (type) {

src/main/java/org/semux/config/ChainSpec.java

@@ -25,14 +25,6 @@ public interface ChainSpec {
      */
     long maxBlockGasLimit();
 
-    /**
-     * Returns the max total size of all transactions in a block, encoding overhead
-     * not counted.
-     *
-     * @return
-     */
-    int maxBlockTransactionsSize();
-
     /**
      * Returns the max data size for the given transaction type.
      *

src/main/java/org/semux/config/TestnetConfig.java

@@ -17,9 +17,6 @@ public class TestnetConfig extends AbstractConfig {
     public TestnetConfig(String dataDir) {
         super(dataDir, Network.TESTNET, Constants.TESTNET_VERSION);
 
-        // testnet allows a much larger block size for performance tuning (8MB)
-        this.maxBlockTransactionsSize = 8 * 1024 * 1024;
-
         this.forkUniformDistributionEnabled = true;
         this.forkVirtualMachineEnabled = true;
     }