fixed deploy contract to an existed account

aionnetwork · Apr 30, 2019 · 5efa293 · 5efa293
1 parent aa88b3e
commit 5efa293
Show file tree

Hide file tree

Showing 7 changed files with 335 additions and 25 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -30,7 +30,7 @@ pipeline {
         stage('Unit test') {
             steps {
                 timeout(60) {
-                    sh "./gradlew ciBuild" 
+                    sh "./gradlew ciBuild " 
                 }
             }
         }

diff --git a/aion_fastvm b/aion_fastvm
diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
 org.gradle.java.home=/usr/lib/jvm/jdk-11.0.1
-org.gradle.daemon=true
+org.gradle.daemon=false
 org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=4g -XX:ReservedCodeCacheSize=1024m
 org.gradle.parallel=false
 

diff --git a/modAionImpl/src/org/aion/zero/impl/StandaloneBlockchain.java b/modAionImpl/src/org/aion/zero/impl/StandaloneBlockchain.java
@@ -1,6 +1,7 @@
 package org.aion.zero.impl;
 
 import java.math.BigInteger;
+import java.security.InvalidParameterException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -40,6 +41,7 @@
 import org.aion.zero.impl.valid.AionExtraDataRule;
 import org.aion.zero.impl.valid.AionHeaderVersionRule;
 import org.aion.zero.impl.valid.EnergyConsumedRule;
+import org.aion.zero.impl.valid.TXValidator;
 import org.aion.zero.types.A0BlockHeader;
 import org.aion.zero.types.AionTransaction;
 import org.apache.commons.lang3.tuple.Pair;
@@ -471,6 +473,12 @@ public AionBlock createBlock(
             boolean waitUntilBlockTime,
             long currTimeSeconds) {
 
+        for (AionTransaction tx : txs) {
+            if (!TXValidator.isValid(tx)) {
+                throw new InvalidParameterException("invalid transaction input! " + tx.toString());
+            }
+        }
+
         return createNewBlockInternal(parent, txs, waitUntilBlockTime, currTimeSeconds).block;
     }
 

diff --git a/modAionImpl/test/org/aion/zero/impl/consensus/BalanceTransferConsensusTest.java b/modAionImpl/test/org/aion/zero/impl/consensus/BalanceTransferConsensusTest.java
@@ -28,12 +28,7 @@
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
 
-/** Consensus tests on balance transfers to regular accounts (not contracts). */
-@RunWith(Parameterized.class)
 public class BalanceTransferConsensusTest {
     private static final byte[] SENDER_KEY =
             org.aion.util.conversions.Hex.decode(
@@ -48,17 +43,6 @@ public class BalanceTransferConsensusTest {
 
     private StandaloneBlockchain blockchain;
 
-    private static byte txType;
-
-    @Parameters
-    public static Object[] data() {
-        return new Object[] {TransactionTypes.DEFAULT, TransactionTypes.AVM_CREATE_CODE};
-    }
-
-    public BalanceTransferConsensusTest(byte _txType) {
-        txType = _txType;
-    }
-
     @Before
     public void setup() {
         Bundle bundle =
@@ -385,8 +369,7 @@ private static AionTransaction makeBalanceTransferTransaction(
                         amount.toByteArray(),
                         new byte[] {0x1, 0x2, 0x3},
                         2_000_000,
-                        ENERGY_PRICE,
-                        txType);
+                        ENERGY_PRICE);
         transaction.sign(key);
         return transaction;
     }