Extracting an API for the Virtual Machine

src/module-info.java

@@ -11,6 +11,7 @@
     requires protobuf.java;
     requires jsr305;
     requires gson;
+    requires aion.vm.api;
 
     exports org.aion.api;
     exports org.aion.api.type;

src/org/aion/api/IAdmin.java

@@ -2,8 +2,8 @@
 
 import java.util.List;
 import org.aion.api.type.ApiMsg;
-import org.aion.base.type.Address;
 import org.aion.base.type.Hash256;
+import org.aion.vm.api.interfaces.Address;
 
 /**
  * This interface dedicate to contact with Aion kernel for certain purpose.
@@ -134,9 +134,9 @@ public interface IAdmin {
      * Get detailed account information, given a string of addresses.
      *
      * @param addresses list of addresses
-     * @return the interface {@link java.util.List List} of the class {@link
-     *     org.aion.base.type.Address Address} wrapped into ApiMsg. You can retrieve through the
-     *     method {@link ApiMsg#getObject() getObject}.
+     * @return the interface {@link java.util.List List} of the class {@link Address Address}
+     *     wrapped into ApiMsg. You can retrieve through the method {@link ApiMsg#getObject()
+     *     getObject}.
      *     <p>The kernel will only return the first 1000 account details that fit the query
      *     interval.
      */

src/org/aion/api/IChain.java

@@ -4,8 +4,8 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.Block;
 import org.aion.api.type.Transaction;
-import org.aion.base.type.Address;
 import org.aion.base.type.Hash256;
+import org.aion.vm.api.interfaces.Address;
 
 /**
  * This interface provides methods for fetching blockchain specific details such as blocks and

src/org/aion/api/IContract.java

@@ -9,9 +9,9 @@
 import org.aion.api.type.ContractResponse;
 import org.aion.api.type.JsonFmt;
 import org.aion.api.type.TxArgs;
-import org.aion.base.type.Address;
 import org.aion.base.type.Hash256;
 import org.aion.base.util.ByteArrayWrapper;
+import org.aion.vm.api.interfaces.Address;
 
 /**
  * A Contract class that sits above the Aion Java API layer that provides the user with convenient

src/org/aion/api/IContractController.java

@@ -5,7 +5,7 @@
 import java.util.Map;
 import org.aion.api.sol.ISolidityArg;
 import org.aion.api.type.ApiMsg;
-import org.aion.base.type.Address;
+import org.aion.vm.api.interfaces.Address;
 
 /**
  * This interface provides methods for deploy the contract to the Aion blockchain network, store the

src/org/aion/api/ITx.java

@@ -10,9 +10,9 @@
 import org.aion.api.type.MsgRsp;
 import org.aion.api.type.TxArgs;
 import org.aion.api.type.TxReceipt;
-import org.aion.base.type.Address;
 import org.aion.base.type.Hash256;
 import org.aion.base.util.ByteArrayWrapper;
+import org.aion.vm.api.interfaces.Address;
 
 /**
  * ITx is an interface of the class Transaction. ITx assists in providing methods for transaction

src/org/aion/api/IWallet.java

@@ -1,7 +1,7 @@
 package org.aion.api;
 
 import org.aion.api.type.ApiMsg;
-import org.aion.base.type.Address;
+import org.aion.vm.api.interfaces.Address;
 
 /**
  * This interface is an interface for the class Wallet. Assists in account related interactions.

src/org/aion/api/impl/Account.java

@@ -34,11 +34,11 @@
 import org.aion.api.type.Key;
 import org.aion.api.type.KeyExport;
 import org.aion.api.type.core.account.KeystoreFormat;
-import org.aion.base.type.Address;
 import org.aion.base.util.ByteUtil;
 import org.aion.base.util.TypeConverter;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.ECKeyFac;
+import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
 /** Created by Jay Tseng on 19/04/17. */

src/org/aion/api/impl/Admin.java

@@ -24,9 +24,10 @@
 import org.aion.api.type.Block;
 import org.aion.api.type.BlockDetails;
 import org.aion.api.type.BlockSql;
-import org.aion.base.type.Address;
+import org.aion.base.type.AionAddress;
 import org.aion.base.type.Hash256;
 import org.aion.base.util.ByteUtil;
+import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
 public class Admin implements IAdmin {
@@ -160,7 +161,7 @@ private List<Address> parseAddressList(String addresses) {
         String[] parts = addresses.split(",");
         List<Address> addressList = new ArrayList<>();
         for (String part : parts) {
-            addressList.add(new Address(part));
+            addressList.add(new AionAddress(part));
         }
 
         return addressList;

src/org/aion/api/impl/ApiBase.java

@@ -13,8 +13,9 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.Event;
 import org.aion.api.type.MsgRsp;
-import org.aion.base.type.Address;
+import org.aion.base.type.AionAddress;
 import org.aion.base.util.ByteArrayWrapper;
+import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 import org.zeromq.ZMQ;
 
@@ -26,7 +27,7 @@ public class ApiBase {
     AtomicBoolean isInitialized = new AtomicBoolean(false);
     // END PRIVATE MEMBERS --------------------------------------------
     Address minerAddress;
-    Address defaultAccount = Address.EMPTY_ADDRESS();
+    Address defaultAccount = AionAddress.EMPTY_ADDRESS();
     String url;
     boolean nb = false;
     int timeout = 300_000;

src/org/aion/api/impl/Chain.java

@@ -15,10 +15,11 @@
 import org.aion.api.type.ApiMsg;
 import org.aion.api.type.ApiMsg.cast;
 import org.aion.api.type.Block;
-import org.aion.base.type.Address;
+import org.aion.base.type.AionAddress;
 import org.aion.base.type.Hash256;
 import org.aion.base.util.ByteArrayWrapper;
 import org.aion.base.util.ByteUtil;
+import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
 /** Created by Jay Tseng on 14/11/16. */
@@ -531,7 +532,7 @@ private static Block toBlock(Message.rsp_getBlock rsp) {
                 .difficulty(new BigInteger(rsp.getDifficulty().toByteArray()))
                 .extraData(ByteArrayWrapper.wrap(rsp.getExtraData().toByteArray()))
                 .nonce(new BigInteger(rsp.getNonce().toByteArray()))
-                .miner(Address.wrap(rsp.getMinerAddress().toByteArray()))
+                .miner(AionAddress.wrap(rsp.getMinerAddress().toByteArray()))
                 .nrgConsumed(rsp.getNrgConsumed())
                 .nrgLimit(rsp.getNrgLimit())
                 .txTrieRoot(Hash256.wrap(rsp.getTxTrieRoot().toByteArray()))

src/org/aion/api/impl/Contract.java

@@ -38,9 +38,10 @@
 import org.aion.api.type.JsonFmt;
 import org.aion.api.type.MsgRsp;
 import org.aion.api.type.TxArgs;
-import org.aion.base.type.Address;
+import org.aion.base.type.AionAddress;
 import org.aion.base.type.Hash256;
 import org.aion.base.util.ByteArrayWrapper;
+import org.aion.vm.api.interfaces.Address;
 import org.apache.commons.collections4.map.LRUMap;
 import org.slf4j.Logger;
 
@@ -70,7 +71,7 @@ public final class Contract implements IContract {
 
     private final AionAPIImpl api;
     private final String contractName;
-    private final org.aion.base.type.Address contractAddress;
+    private final Address contractAddress;
     private final List<ContractAbiEntry> abiDefinition;
     private final Map<String, List<ContractAbiEntry>> funcParams;
     private final String abiDefStr;
@@ -416,7 +417,7 @@ TxArgs encodeParams(ContractAbiEntry func) {
                         .nrgPrice(this.txNrgPrice)
                         .nrgLimit(this.txNrgLimit)
                         .from(this.from)
-                        .to(isConstructor ? Address.EMPTY_ADDRESS() : this.contractAddress)
+                        .to(isConstructor ? AionAddress.EMPTY_ADDRESS() : this.contractAddress)
                         .data(
                                 isConstructor
                                         ? ByteArrayWrapper.wrap(assembled.toString().getBytes())

src/org/aion/api/impl/ContractController.java

@@ -25,9 +25,9 @@
 import org.aion.api.type.ContractDeploy;
 import org.aion.api.type.DeployResponse;
 import org.aion.api.type.JsonFmt;
-import org.aion.base.type.Address;
 import org.aion.base.type.Hash256;
 import org.aion.base.util.ByteArrayWrapper;
+import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
 public final class ContractController implements IContractController {

src/org/aion/api/impl/MsgExecutor.java

@@ -34,7 +34,7 @@
 import org.aion.api.type.ContractEvent;
 import org.aion.api.type.Event;
 import org.aion.api.type.MsgRsp;
-import org.aion.base.type.Address;
+import org.aion.base.type.AionAddress;
 import org.aion.base.type.Hash256;
 import org.aion.base.util.ByteArrayWrapper;
 import org.aion.base.util.ByteUtil;
@@ -294,7 +294,7 @@ private void updateEvent(ByteArrayWrapper data) {
             for (Message.t_EventCt cte : evt.getEcList()) {
                 ContractEvent.ContractEventBuilder builder =
                         new ContractEvent.ContractEventBuilder()
-                                .address(Address.wrap(cte.getAddress().toByteArray()))
+                                .address(AionAddress.wrap(cte.getAddress().toByteArray()))
                                 .blockHash(Hash256.wrap(cte.getBlockHash().toByteArray()))
                                 .blockNumber(cte.getBlockNumber())
                                 .data(ByteArrayWrapper.wrap(cte.getData().toByteArray()))

src/org/aion/api/impl/Tx.java

@@ -31,13 +31,14 @@
 import org.aion.api.type.TxArgs;
 import org.aion.api.type.TxArgs.TxArgsBuilder;
 import org.aion.api.type.core.tx.AionTransaction;
-import org.aion.base.type.Address;
+import org.aion.base.type.AionAddress;
 import org.aion.base.type.Hash256;
 import org.aion.base.util.ByteArrayWrapper;
 import org.aion.base.util.ByteUtil;
 import org.aion.base.util.Hex;
 import org.aion.crypto.ECKey;
 import org.aion.crypto.ECKeyFac;
+import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
 /** Created by Jay Tseng on 15/11/16. */
@@ -110,7 +111,7 @@ public ApiMsg contractDeploy(ContractDeploy cd) {
                     Message.rsp_contractDeploy.parseFrom(rsp.getTxDeploy().toBytes());
             return new ApiMsg(
                     new DeployResponse(
-                            Address.wrap(msgRsp.getContractAddress().toByteArray()),
+                            AionAddress.wrap(msgRsp.getContractAddress().toByteArray()),
                             Hash256.wrap(msgRsp.getTxHash().toByteArray())),
                     ApiMsg.cast.OTHERS);
 
@@ -688,8 +689,8 @@ public ApiMsg estimateNrg(String code) {
                 new TxArgsBuilder()
                         .data(ByteArrayWrapper.wrap(byteCode))
                         .from(
-                                apiInst.defaultAccount.equals(Address.EMPTY_ADDRESS())
-                                        ? Address.wrap(
+                                apiInst.defaultAccount.equals(AionAddress.EMPTY_ADDRESS())
+                                        ? AionAddress.wrap(
                                                 "0xa000000000000000000000000000000000000000000000000000000000000000")
                                         : apiInst.defaultAccount)
                         .createTxArgs();

src/org/aion/api/impl/Wallet.java

@@ -10,8 +10,9 @@
 import org.aion.api.log.AionLoggerFactory;
 import org.aion.api.log.LogEnum;
 import org.aion.api.type.ApiMsg;
-import org.aion.base.type.Address;
+import org.aion.base.type.AionAddress;
 import org.aion.base.util.ByteUtil;
+import org.aion.vm.api.interfaces.Address;
 import org.slf4j.Logger;
 
 /** Created by Jay Tseng on 14/11/16. */
@@ -45,7 +46,7 @@ public ApiMsg getAccounts() {
 
             List<Address> account = new ArrayList<>();
             for (ByteString bs : accBs) {
-                account.add(Address.wrap(bs.toByteArray()));
+                account.add(AionAddress.wrap(bs.toByteArray()));
             }
 
             if (LOGGER.isDebugEnabled()) {
@@ -134,7 +135,7 @@ public ApiMsg getMinerAccount() {
         try {
             Message.rsp_minerAddress msgRsp =
                     Message.rsp_minerAddress.parseFrom(ApiUtils.parseBody(rsp).getData());
-            this.apiInst.minerAddress = Address.wrap(msgRsp.getMinerAddr().toByteArray());
+            this.apiInst.minerAddress = AionAddress.wrap(msgRsp.getMinerAddr().toByteArray());
             if (LOGGER.isDebugEnabled()) {
                 LOGGER.debug("[getMinerAccount] minerAddress: [{}]", this.apiInst.minerAddress);
             }