Merge pull request #851 from aionnetwork/rm-avm-prefix

Removing the AVM prefix
aionnetwork · Mar 19, 2019 · 4ef59ef · 4ef59ef
2 parents bdf2cad + 7c4d198
commit 4ef59ef
Show file tree

Hide file tree

Showing 35 changed files with 426 additions and 440 deletions.
diff --git a/aion_fastvm b/aion_fastvm
diff --git a/aion_vm_api b/aion_vm_api
diff --git a/modAion/build.gradle b/modAion/build.gradle
@@ -3,7 +3,7 @@ ext.moduleName = 'aion.zero'
 test.dependsOn copyNativeLibsForModuleTests
 
 dependencies {
-    compile 'network.aion:vm-api4j:0.4.0'
+    compile project(':aion_vm_api')
     compile 'network.aion:util4j:0.4.0'
     compile 'network.aion:rlp4j:0.4.0'
     compile 'network.aion:crypto4j:0.4.0'

diff --git a/modAion/src/org/aion/zero/db/AionRepositoryCache.java b/modAion/src/org/aion/zero/db/AionRepositoryCache.java
@@ -8,11 +8,11 @@
 import org.aion.interfaces.db.ContractDetails;
 import org.aion.interfaces.db.Repository;
 import org.aion.interfaces.db.RepositoryCache;
-import org.aion.types.Address;
 import org.aion.mcf.core.AccountState;
 import org.aion.mcf.db.AbstractRepositoryCache;
 import org.aion.mcf.db.ContractDetailsCacheImpl;
 import org.aion.mcf.db.IBlockStoreBase;
+import org.aion.types.Address;
 
 public class AionRepositoryCache extends AbstractRepositoryCache<IBlockStoreBase<?, ?>> {
 
@@ -251,4 +251,8 @@ public List<byte[]> getCacheTx() {
         throw new UnsupportedOperationException(
                 "getCachelTx should be called on the tracked repository.");
     }
+
+    public byte getVMUsed(Address contract) {
+        return repository.getVMUsed(contract);
+    }
 }
diff --git a/modAionImpl/build.gradle b/modAionImpl/build.gradle
@@ -11,7 +11,7 @@ sourceSets {
 }
 
 dependencies {
-    compile 'network.aion:vm-api4j:0.4.0'
+    compile project(':aion_vm_api')
     compile 'network.aion:util4j:0.4.0'
     compile 'network.aion:log4j:0.4.0'
     compile 'network.aion:rlp4j:0.4.0'

diff --git a/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java b/modAionImpl/src/org/aion/zero/impl/AionBlockchainImpl.java
@@ -26,13 +26,13 @@
 import java.util.Stack;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.concurrent.atomic.AtomicReference;
-import org.aion.interfaces.db.Repository;
-import org.aion.interfaces.db.RepositoryCache;
 import org.aion.crypto.HashUtil;
 import org.aion.equihash.EquihashMiner;
 import org.aion.evtmgr.IEvent;
 import org.aion.evtmgr.IEventMgr;
 import org.aion.evtmgr.impl.evt.EventBlock;
+import org.aion.interfaces.db.Repository;
+import org.aion.interfaces.db.RepositoryCache;
 import org.aion.log.AionLoggerFactory;
 import org.aion.log.LogEnum;
 import org.aion.mcf.core.ImportResult;
@@ -73,7 +73,9 @@
 import org.aion.zero.impl.types.AionTxInfo;
 import org.aion.zero.impl.types.RetValidPreBlock;
 import org.aion.zero.impl.valid.TXValidator;
+import org.aion.mcf.valid.TransactionTypeRule;
 import org.aion.zero.impl.valid.TransactionTypeValidator;
+import org.aion.mcf.tx.TransactionTypes;
 import org.aion.zero.types.A0BlockHeader;
 import org.aion.zero.types.AionTransaction;
 import org.aion.zero.types.AionTxExecSummary;
@@ -910,6 +912,20 @@ public AionBlockSummary add(AionBlock block, boolean rebuild) {
         // update corresponding account with the new balance
         track.flush();
 
+        // save contract creation data
+        for (AionTxReceipt receipt : receipts) {
+            AionTransaction tx = receipt.getTransaction();
+            if (tx.isContractCreationTransaction()) {
+                repository.saveIndexedContractInformation(
+                        tx.getContractAddress(),
+                        block.getNumber(),
+                        TransactionTypeRule.isValidAVMContractDeployment(tx.getTargetVM())
+                                ? TransactionTypes.AVM_CREATE_CODE
+                                : TransactionTypes.FVM_CREATE_CODE,
+                        true);
+            }
+        }
+
         if (rebuild) {
             for (int i = 0; i < receipts.size(); i++) {
                 transactionStore.putToBatch(new AionTxInfo(receipts.get(i), block.getHash(), i));

diff --git a/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryDummy.java b/modAionImpl/src/org/aion/zero/impl/db/AionRepositoryDummy.java
+1 −1		modFastVM/build.gradle
+5 −0		modFastVM/test/org/aion/vm/DummyRepository.java
+2 −0		src/org/aion/interfaces/db/Repository.java
+0 −8		src/org/aion/interfaces/vm/VirtualMachineSpecs.java