From accaf6a262ba8eca4ffbcd8488c6b14bcc2f43c6 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 16 Jun 2020 13:27:16 -0400
Subject: [PATCH 01/45] Add models to house data

---
 .idea/codeStyles/Project.xml                  | 25 ------
 .../rpcProvider/response/ActionTrace.java     | 81 +++++++++++++++++++
 .../ProcessedTransactionResponse.java         | 50 ++++++++++++
 .../response/PushTransactionResponse.java     | 10 ++-
 .../session/TransactionProcessor.java         |  3 +-
 .../one/block/eosiojava/RpcModelTest.java     | 19 ++++-
 6 files changed, 158 insertions(+), 30 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0dfe6eb..84b449b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,9 +7,7 @@
         <option name="TAB_SIZE" value="2" />
       </value>
     </option>
-    <option name="RIGHT_MARGIN" value="100" />
     <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
       <option name="LAYOUT_SETTINGS">
         <value>
           <option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
@@ -23,9 +21,6 @@
       <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="" withSubpackages="true" static="true" />
@@ -55,25 +50,6 @@
       <option name="SPACE_BEFORE_SUPERCLASS_COLON" value="false" />
     </Objective-C>
     <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
       <extensions>
         <pair source="cc" header="h" fileNamingConvention="NONE" />
         <pair source="c" header="h" fileNamingConvention="NONE" />
@@ -83,7 +59,6 @@
       <option name="INDENT_CHAINED_CALLS" value="false" />
     </TypeScriptCodeStyleSettings>
     <XML>
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <codeStyleSettings language="CSS">
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
new file mode 100644
index 0000000..7f24a99
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -0,0 +1,81 @@
+package one.block.eosiojava.models.rpcProvider.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.io.UnsupportedEncodingException;
+import java.util.Map;
+import one.block.eosiojava.models.rpcProvider.Action;
+import org.bouncycastle.util.encoders.Hex;
+
+public class ActionTrace {
+    private String name;
+    private String data;
+
+    @SerializedName("action_ordinal")
+    private Integer actionOrdinal;
+
+    @SerializedName("creator_action_ordinal")
+    private Integer creatorActionOrdinal;
+
+    @SerializedName("closest_unnotified_ancestor_action_ordinal")
+    private Integer closestUnnotifiedAncestorActionOrdinal;
+
+    @SerializedName("receipt")
+    private Map receipt;
+
+    @SerializedName("receiver")
+    private String receiver;
+
+    @SerializedName("act")
+    private Map act;
+
+    @SerializedName("context_free")
+    private Boolean contextFree;
+
+//    @SerializedName("elapsed")
+//    private Integer elapsed;
+//
+//    @SerializedName("console")
+//    private String console;
+//
+//    @SerializedName("trx_id")
+//    private String transactionId;
+//
+//    @SerializedName("block_num")
+//    private Integer blockNumber;
+//
+//    @SerializedName("block_time")
+//    private String blockTime;
+//
+//    @SerializedName("producer_block_id")
+//    private String producerBlockId;
+//
+//    @SerializedName("account_ram_deltas")
+//    private Map account_ram_deltas;
+//
+//    @SerializedName("account_disk_deltas")
+//    private Map account_disk_deltas;
+//
+//    @SerializedName("except")
+//    private String except;
+//
+//    @SerializedName("error_code")
+//    private String error_code;
+
+    @SerializedName("return_value")
+    private String returnValue;
+
+    public ActionTrace() throws UnsupportedEncodingException {
+        String actionName = "normal"; // Necessary to prepend
+
+        String testReturnValue = "d2040000"; // 1234
+        String testReturnValue2 = "000000000090b1ca"; // "test"
+
+        byte[] bytes = Hex.decode(testReturnValue);
+        String test = new String(bytes, "UTF-8");
+
+        byte[] bytes2 = Hex.decode(testReturnValue2);
+        String test2 = new String(bytes2, "UTF-8");
+
+        String testDerp = "something";
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java
new file mode 100644
index 0000000..d7cafd0
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java
@@ -0,0 +1,50 @@
+package one.block.eosiojava.models.rpcProvider.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import java.util.Map;
+
+public class ProcessedTransactionResponse {
+    @SerializedName("id")
+    private String id;
+
+    @SerializedName("block_num")
+    private Integer blockNumber;
+
+    @SerializedName("block_time")
+    private String blockTime;
+
+    @SerializedName("producer_block_id")
+    private String producerBlockId;
+
+    @SerializedName("receipt")
+    private Map receipt;
+
+    @SerializedName("elapsed")
+    private Integer elapsed;
+
+    @SerializedName("net_usage")
+    private Integer netUsage;
+
+    @SerializedName("scheduled")
+    private Boolean scheduled;
+
+    @SerializedName("account_ram_delta")
+    private String accountRamDelta;
+
+    @SerializedName("except")
+    private String except;
+
+    @SerializedName("error_code")
+    private String errorCode;
+
+    @SerializedName("action_traces")
+    private List<ActionTrace> actionTraces;
+
+//    @SerializedName("action_traces")
+//    private Map traces;
+
+    public String getId() {
+        return this.id;
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
index a55edd1..3394cd7 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
@@ -1,6 +1,7 @@
 package one.block.eosiojava.models.rpcProvider.response;
 
 import com.google.gson.annotations.SerializedName;
+import java.util.List;
 import java.util.Map;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
 
@@ -16,8 +17,11 @@ public class PushTransactionResponse {
     @SerializedName("transaction_id")
     private String transactionId;
 
+//    @SerializedName("processed")
+//    private Map processed;
+
     @SerializedName("processed")
-    private Map processed;
+    private ProcessedTransactionResponse transactionResponse;
 
     /**
      * Gets the transaction id of the successful transaction.
@@ -28,7 +32,7 @@ public String getTransactionId() {
         return transactionId;
     }
 
-    public Map getProcessed() {
-        return processed;
+    public ProcessedTransactionResponse getProcessed() {
+        return transactionResponse;
     }
 }
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 85df911..01a3beb 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -503,7 +503,8 @@ public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroad
         PushTransactionRequest pushTransactionRequest = new PushTransactionRequest(this.signatures,
                 0, "", this.serializedTransaction);
         try {
-            return this.pushTransaction(pushTransactionRequest);
+            PushTransactionResponse response = this.pushTransaction(pushTransactionRequest);
+            return response;
         } catch (TransactionPushTransactionError transactionPushTransactionError) {
             throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
         }
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index 9746ed5..7f67b44 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
@@ -285,7 +285,7 @@ public void PushTransactionResponseTest() {
                 .fromJson(jsonContent, PushTransactionResponse.class);
         assertNotNull(pushTransactionResponse);
         assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
-        assertEquals("dump_id", pushTransactionResponse.getProcessed().get("id"));
+        assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
 
         // ToJSON test
         String toJSON = this.gson.toJson(pushTransactionResponse);
@@ -294,6 +294,23 @@ public void PushTransactionResponseTest() {
         // This test does not do verify toJSON with original json content because they are generated different values due to deep level model which is not defined in the source code.
     }
 
+    @Test
+    public void PushTransactionResponseWithReturnValuesTest() {
+        String jsonContent = "{\"transaction_id\":\"dump_transaction_id\",\"processed\":{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"eosio.token\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[{\"receipt\":{\"receiver\":\"dummy_account\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"dummy_account_2\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",111]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}]}]}}";
+
+        // FromJSON test
+        PushTransactionResponse pushTransactionResponse = this.gson
+                .fromJson(jsonContent, PushTransactionResponse.class);
+        assertNotNull(pushTransactionResponse);
+        assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
+        assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(pushTransactionResponse);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+    }
+
     /**
      * Test GetInfoResponse
      */

From be7d0550ee9978f827dac6215a7e020686792d94 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 23 Jun 2020 13:12:06 -0400
Subject: [PATCH 02/45] Add custom ActionTraceDeserializer to handle conversion
 of deserializedReturnValue

---
 .../block/eosiojava/error/ErrorConstants.java |  2 +-
 .../interfaces/ISerializationProvider.java    |  2 +-
 .../rpcProvider/response/ActionTrace.java     | 92 +++++++++++++++++--
 .../AbiEosSerializationObject.java            |  2 +-
 .../ActionTraceDeserializer.java              | 19 ++++
 .../session/TransactionProcessor.java         |  2 +-
 .../one/block/eosiojava/utilities/Utils.java  |  3 +
 .../one/block/eosiojava/RpcModelTest.java     |  6 +-
 .../NegativeTransactionProcessorTest.java     |  2 +-
 .../session/TransactionProcessorTest.java     |  2 +-
 10 files changed, 118 insertions(+), 14 deletions(-)
 rename eosiojava/src/main/java/one/block/eosiojava/models/{ => serialization}/AbiEosSerializationObject.java (98%)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
index 8bc7421..12b7b39 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.AbiEosSerializationObject;
+import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
diff --git a/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java b/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java
index 48605a0..517529d 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java
@@ -6,7 +6,7 @@
 import one.block.eosiojava.error.serializationProvider.SerializeAbiError;
 import one.block.eosiojava.error.serializationProvider.SerializeError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
-import one.block.eosiojava.models.AbiEosSerializationObject;
+import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
 
 /**
  * Interface of Serialization Provider
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
index 7f24a99..527707c 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -1,8 +1,12 @@
 package one.block.eosiojava.models.rpcProvider.response;
 
+import com.google.common.io.BaseEncoding;
 import com.google.gson.annotations.SerializedName;
 import java.io.UnsupportedEncodingException;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
 import java.util.Map;
+import javax.xml.bind.DatatypeConverter;
 import one.block.eosiojava.models.rpcProvider.Action;
 import org.bouncycastle.util.encoders.Hex;
 
@@ -64,18 +68,92 @@ public class ActionTrace {
     @SerializedName("return_value")
     private String returnValue;
 
+    private String deserializedReturnValue;
+
     public ActionTrace() throws UnsupportedEncodingException {
         String actionName = "normal"; // Necessary to prepend
 
-        String testReturnValue = "d2040000"; // 1234
-        String testReturnValue2 = "000000000090b1ca"; // "test"
+        // returning 10 becomes "0a000000" --- Numbers can be parsed with Integer.parseInt(0000000a, 16)
+        // returning 2 becomes "02000000"
+        // returning 3 becomes "03000000"
+        // returning 16 becomes "10000000"
+        // "a" becomes "0000000000000030"
+        // "b" becomes "0000000000000038"
+        // "c" becomes "0000000000000040"
+        // "d" becomes "0000000000000048"
+        // "1" becomes "0000000000000008"
+        // "2" becomes "0000000000000010"
+        // 1234 becomes "d2040000"
+        // "test" becomes "000000000090b1ca"
+        // "1234" becomes "0000000000408608"
+        // "12" becomes "0000000000008008"
+        // 100 becomes "64000000"
+        // 128 becomes "80000000"
+        // 129 becomes "81000000"
+        // 127 becomes "7f000000"
+        // 255 becomes "ff000000"
+        // 256 becomes "00010000"
+        // 257 becomes "01010000"
+        // 9999999999999999999 becomes "ffffe789" and is truncated to 2313682943 instead
+
+
+//        String testReturnValue = "d2040000"; // 1234
+//        String testReturnValue2 = "000000000090b1ca"; // "test"
+//
+//        ByteBuffer buffer = ByteBuffer.allocate(10);
+//        buffer.put("normal".getBytes());
+//        buffer.put(Hex.decode(testReturnValue));
+//
+//        byte[] bytesTest = buffer.array();
+//        String testStr = new String(bytesTest, "UTF-8");
+//
+//        byte[] bytes = Hex.decode(testReturnValue);
+//        String test = new String(bytes, "UTF-8");
+//
+//        String derp = DatatypeConverter.printBase64Binary(bytes);
+//        byte[] der = DatatypeConverter.parseBase64Binary(testReturnValue);
+//        String gotIt = new String(der);
+//
+//        String result = BaseEncoding.base32Hex().encode(bytes);
+//
+//        byte[] bytes2 = Hex.decode(testReturnValue2);
+//        String test2 = new String(bytes2);
+//
+//        String testDerp = "something";
+//        String returnValueTwo = "00000002";
+//        byte[] bytes = returnValueTwo.getBytes();
+//
+//        String bin = hexToBin("02000000");
+//        String bin2 = hexToBin("00000020");
+//
+//        int charCode = Integer.parseInt("02000000", 2);
+//        int charCode2 = Integer.parseInt("00000020", 2);
+//
+//        String str = new Character((char)charCode).toString();
+//
+//        String result = new String(Hex.decode(returnValueTwo));
+//        String result2 = new String(bytes);
+//
+//        byte[] hexData = hexStringToByteArray(returnValueTwo);
+//
+
+    }
 
-        byte[] bytes = Hex.decode(testReturnValue);
-        String test = new String(bytes, "UTF-8");
+    public void setDeserializedReturnValue() {
+        this.deserializedReturnValue = "something";
+    }
 
-        byte[] bytes2 = Hex.decode(testReturnValue2);
-        String test2 = new String(bytes2, "UTF-8");
+    static String hexToBin(String s) {
+        return new BigInteger(s, 16).toString(2);
+    }
 
-        String testDerp = "something";
+    public static byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                    + Character.digit(s.charAt(i+1), 16));
+        }
+        return data;
     }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java b/eosiojava/src/main/java/one/block/eosiojava/models/serialization/AbiEosSerializationObject.java
similarity index 98%
rename from eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
rename to eosiojava/src/main/java/one/block/eosiojava/models/serialization/AbiEosSerializationObject.java
index 397ed51..6c054cd 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/serialization/AbiEosSerializationObject.java
@@ -1,4 +1,4 @@
-package one.block.eosiojava.models;
+package one.block.eosiojava.models.serialization;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java
new file mode 100644
index 0000000..41b3d7e
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java
@@ -0,0 +1,19 @@
+package one.block.eosiojava.models.serialization;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import java.lang.reflect.Type;
+import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
+
+public class ActionTraceDeserializer implements JsonDeserializer<ActionTrace> {
+    @Override
+    public ActionTrace deserialize(JsonElement json, Type typeOfT,
+            JsonDeserializationContext context) throws JsonParseException {
+        ActionTrace actionTrace = new Gson().fromJson(json.getAsJsonObject(), typeOfT);
+        actionTrace.setDeserializedReturnValue();
+        return actionTrace;
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 01a3beb..c586923 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -43,7 +43,7 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.AbiEosSerializationObject;
+import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
 import one.block.eosiojava.models.rpcProvider.Transaction;
diff --git a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
index e8df846..ece62b1 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
@@ -8,6 +8,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
+import one.block.eosiojava.models.serialization.ActionTraceDeserializer;
 
 /**
  * This class provides generic utility methods
@@ -41,6 +43,7 @@ public static <T extends Serializable> T clone(T object) throws IOException, Cla
      */
     public static Gson getGson(String datePattern) {
         return new GsonBuilder()
+                .registerTypeAdapter(ActionTrace.class, new ActionTraceDeserializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping()
                 .create();
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index 7f67b44..5b2d576 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
@@ -12,11 +12,13 @@
 import one.block.eosiojava.models.rpcProvider.request.GetRawAbiRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
+import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.rpcProvider.response.GetBlockResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRawAbiResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
+import one.block.eosiojava.models.serialization.ActionTraceDeserializer;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -29,7 +31,9 @@ public class RpcModelTest {
 
     @Before
     public void setUpGSON() {
-        this.gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'hh:mm:ss zzz")
+        this.gson = new GsonBuilder()
+                .registerTypeAdapter(ActionTrace.class, new ActionTraceDeserializer())
+                .setDateFormat("yyyy-MM-dd'T'hh:mm:ss zzz")
                 .disableHtmlEscaping().create();
     }
 
diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
index caa3248..cbdf2ef 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
@@ -38,7 +38,7 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.AbiEosSerializationObject;
+import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
 import one.block.eosiojava.models.rpcProvider.Authorization;
diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
index 409dac4..0be07ab 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
@@ -37,7 +37,7 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.AbiEosSerializationObject;
+import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
 import one.block.eosiojava.models.rpcProvider.Authorization;

From 573ad31bea6833d7526eccf9d35b531ccd1778cc Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 25 Jun 2020 10:29:37 -0400
Subject: [PATCH 03/45] provider updates

---
 .../implementations/WasmABIProviderImpl.java  | 17 +++++++++
 .../rpcProvider/response/ActionTrace.java     | 13 +++++++
 .../models/wasmAbiProvider/WasmABI.java       | 36 +++++++++++++++++++
 .../one/block/eosiojava/RpcModelTest.java     |  7 ++++
 4 files changed, 73 insertions(+)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/implementations/WasmABIProviderImpl.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/wasmAbiProvider/WasmABI.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/implementations/WasmABIProviderImpl.java b/eosiojava/src/main/java/one/block/eosiojava/implementations/WasmABIProviderImpl.java
new file mode 100644
index 0000000..5a6d494
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/implementations/WasmABIProviderImpl.java
@@ -0,0 +1,17 @@
+package one.block.eosiojava.implementations;
+
+import java.util.List;
+import java.util.Map;
+import one.block.eosiojava.models.wasmAbiProvider.WasmABI;
+
+public class WasmABIProviderImpl {
+    public Map wasmAbis;
+
+    public void setWasmAbis(List<WasmABI> wasmAbis) {
+        wasmAbis.forEach(wasmABI -> {
+            wasmABI.reset();
+
+            this.wasmAbis.put(wasmABI.account, wasmABI);
+        });
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
index 527707c..d1fc64a 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -140,6 +140,19 @@ public ActionTrace() throws UnsupportedEncodingException {
     }
 
     public void setDeserializedReturnValue() {
+
+        ByteBuffer buffer = ByteBuffer.allocate(100);
+        buffer.put(Hex.encode("normal".getBytes()));
+
+        byte[] array1 = buffer.array();
+        String testStr1 = new String(Hex.decode(array1));
+
+        buffer.put(this.returnValue.getBytes());
+
+        byte[] array = buffer.array();
+
+        byte[] test = Hex.decode(array);
+        String testStr = new String(test);
         this.deserializedReturnValue = "something";
     }
 
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/wasmAbiProvider/WasmABI.java b/eosiojava/src/main/java/one/block/eosiojava/models/wasmAbiProvider/WasmABI.java
new file mode 100644
index 0000000..018f17e
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/wasmAbiProvider/WasmABI.java
@@ -0,0 +1,36 @@
+package one.block.eosiojava.models.wasmAbiProvider;
+
+public class WasmABI {
+    public String account;
+
+    public byte[] inputData;
+    public byte[] ouputData0;
+    public byte[] outputData1;
+
+    // any
+    public Object mod;
+    public Object inst;
+    public Object primitives;
+    public Object actions;
+
+    public WasmABI(String account, Object mod) {
+        this.account = account;
+        this.mod = mod;
+    }
+
+    public void reset() {
+
+    }
+
+    public void action_args_json_to_bin(String action) {
+
+    }
+
+    public void action_args_bin_to_json(String action, byte[] bin) {
+
+    }
+
+    public void action_ret_bin_to_json(String action, byte[] bin) {
+
+    }
+}
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index 5b2d576..5beeea6 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
@@ -7,6 +7,10 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import java.lang.reflect.Type;
 import java.math.BigInteger;
 import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRawAbiRequest;
@@ -19,6 +23,7 @@
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
 import one.block.eosiojava.models.serialization.ActionTraceDeserializer;
+import org.bouncycastle.util.encoders.Base64;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -305,6 +310,8 @@ public void PushTransactionResponseWithReturnValuesTest() {
         // FromJSON test
         PushTransactionResponse pushTransactionResponse = this.gson
                 .fromJson(jsonContent, PushTransactionResponse.class);
+        Base64.decode("000000000090b1ca");
+        Base64.decode("000000000090b1ca");
         assertNotNull(pushTransactionResponse);
         assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
         assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());

From bdccde9a9be1fbaf8938bae3550290a792fb73ed Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 12:41:14 -0400
Subject: [PATCH 04/45] Deserialization properly

---
 .../implementations/WasmABIProviderImpl.java  |  17 --
 .../eosiojava/models/abiProvider/Abi.java     |  47 +++
 .../models/abiProvider/ActionResult.java      |  22 ++
 .../rpcProvider/response/ActionTrace.java     |  97 +++----
 .../ProcessedTransactionResponse.java         |   5 +-
 .../response/PushTransactionResponse.java     |  10 +-
 .../ActionTraceDeserializer.java              |  57 +++-
 .../models/wasmAbiProvider/WasmABI.java       |  36 ---
 .../session/TransactionProcessor.java         |  61 +++-
 .../session/TransactionProcessorTest.java     | 274 +++++++++++++++++-
 10 files changed, 497 insertions(+), 129 deletions(-)
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/implementations/WasmABIProviderImpl.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/wasmAbiProvider/WasmABI.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/implementations/WasmABIProviderImpl.java b/eosiojava/src/main/java/one/block/eosiojava/implementations/WasmABIProviderImpl.java
deleted file mode 100644
index 5a6d494..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/implementations/WasmABIProviderImpl.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package one.block.eosiojava.implementations;
-
-import java.util.List;
-import java.util.Map;
-import one.block.eosiojava.models.wasmAbiProvider.WasmABI;
-
-public class WasmABIProviderImpl {
-    public Map wasmAbis;
-
-    public void setWasmAbis(List<WasmABI> wasmAbis) {
-        wasmAbis.forEach(wasmABI -> {
-            wasmABI.reset();
-
-            this.wasmAbis.put(wasmABI.account, wasmABI);
-        });
-    }
-}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
new file mode 100644
index 0000000..87d0fb7
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -0,0 +1,47 @@
+package one.block.eosiojava.models.abiProvider;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import java.util.Map;
+
+public class Abi {
+    @SerializedName("____comment")
+    private String comment;
+
+    @SerializedName("version")
+    private String version;
+
+    @SerializedName("types")
+    private List<Map> types;
+
+    @SerializedName("structs")
+    private List<Map> structs;
+
+    @SerializedName("actions")
+    private List<Map> actions;
+
+    @SerializedName("tables")
+    private List<Map> tables;
+
+    @SerializedName("ricardian_clauses")
+    private List<Map> ricardianClauses;
+
+    @SerializedName("variants")
+    private List<Map> variants;
+
+    @SerializedName("action_results")
+    private List<ActionResult> actionResults;
+
+    public String getActionReturnType(String actionName) {
+        if (this.actionResults.isEmpty()) {
+            return null;
+        }
+
+        ActionResult actionResult = this.actionResults.stream()
+                                                      .filter(ar -> ar.hasActionName(actionName))
+                                                      .findFirst()
+                                                      .orElse(null);
+
+        return actionResult != null ? actionResult.getReturnType() : null;
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
new file mode 100644
index 0000000..b658f44
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
@@ -0,0 +1,22 @@
+package one.block.eosiojava.models.abiProvider;
+
+import com.google.gson.annotations.SerializedName;
+import org.jetbrains.annotations.NotNull;
+
+public class ActionResult {
+    @NotNull
+    @SerializedName("name")
+    private String name;
+
+    @NotNull
+    @SerializedName("result_type")
+    private String resultType;
+
+    public Boolean hasActionName(String actionName) {
+        return this.name.equals(actionName);
+    }
+
+    public String getReturnType() {
+        return this.resultType;
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
index d1fc64a..45723a4 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -11,9 +11,6 @@
 import org.bouncycastle.util.encoders.Hex;
 
 public class ActionTrace {
-    private String name;
-    private String data;
-
     @SerializedName("action_ordinal")
     private Integer actionOrdinal;
 
@@ -35,42 +32,42 @@ public class ActionTrace {
     @SerializedName("context_free")
     private Boolean contextFree;
 
-//    @SerializedName("elapsed")
-//    private Integer elapsed;
-//
-//    @SerializedName("console")
-//    private String console;
-//
-//    @SerializedName("trx_id")
-//    private String transactionId;
-//
-//    @SerializedName("block_num")
-//    private Integer blockNumber;
-//
-//    @SerializedName("block_time")
-//    private String blockTime;
-//
-//    @SerializedName("producer_block_id")
-//    private String producerBlockId;
-//
-//    @SerializedName("account_ram_deltas")
-//    private Map account_ram_deltas;
-//
-//    @SerializedName("account_disk_deltas")
-//    private Map account_disk_deltas;
-//
-//    @SerializedName("except")
-//    private String except;
-//
-//    @SerializedName("error_code")
-//    private String error_code;
+    @SerializedName("elapsed")
+    private Integer elapsed;
+
+    @SerializedName("console")
+    private String console;
+
+    @SerializedName("trx_id")
+    private String transactionId;
+
+    @SerializedName("block_num")
+    private Integer blockNumber;
+
+    @SerializedName("block_time")
+    private String blockTime;
+
+    @SerializedName("producer_block_id")
+    private String producerBlockId;
+
+    @SerializedName("account_ram_deltas")
+    private Map account_ram_deltas;
+
+    @SerializedName("account_disk_deltas")
+    private Map account_disk_deltas;
+
+    @SerializedName("except")
+    private String except;
+
+    @SerializedName("error_code")
+    private String error_code;
 
     @SerializedName("return_value")
     private String returnValue;
 
     private String deserializedReturnValue;
 
-    public ActionTrace() throws UnsupportedEncodingException {
+    public ActionTrace() {
         String actionName = "normal"; // Necessary to prepend
 
         // returning 10 becomes "0a000000" --- Numbers can be parsed with Integer.parseInt(0000000a, 16)
@@ -136,37 +133,21 @@ public ActionTrace() throws UnsupportedEncodingException {
 //
 //        byte[] hexData = hexStringToByteArray(returnValueTwo);
 //
-
     }
 
-    public void setDeserializedReturnValue() {
-
-        ByteBuffer buffer = ByteBuffer.allocate(100);
-        buffer.put(Hex.encode("normal".getBytes()));
-
-        byte[] array1 = buffer.array();
-        String testStr1 = new String(Hex.decode(array1));
-
-        buffer.put(this.returnValue.getBytes());
-
-        byte[] array = buffer.array();
+    public String getHexReturnValue() {
+        return this.returnValue;
+    }
 
-        byte[] test = Hex.decode(array);
-        String testStr = new String(test);
-        this.deserializedReturnValue = "something";
+    public String getAccountName() {
+        return (String)this.act.get("account");
     }
 
-    static String hexToBin(String s) {
-        return new BigInteger(s, 16).toString(2);
+    public String getActionName() {
+        return (String)this.act.get("name");
     }
 
-    public static byte[] hexStringToByteArray(String s) {
-        int len = s.length();
-        byte[] data = new byte[len / 2];
-        for (int i = 0; i < len; i += 2) {
-            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
-                    + Character.digit(s.charAt(i+1), 16));
-        }
-        return data;
+    public void setDeserializedReturnValue(String deserializedReturnValue) {
+        this.deserializedReturnValue = deserializedReturnValue;
     }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java
index d7cafd0..07a2598 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java
@@ -41,10 +41,9 @@ public class ProcessedTransactionResponse {
     @SerializedName("action_traces")
     private List<ActionTrace> actionTraces;
 
-//    @SerializedName("action_traces")
-//    private Map traces;
-
     public String getId() {
         return this.id;
     }
+
+    public List<ActionTrace> getActionTraces() { return this.actionTraces; }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
index 3394cd7..b205734 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
@@ -1,6 +1,7 @@
 package one.block.eosiojava.models.rpcProvider.response;
 
 import com.google.gson.annotations.SerializedName;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
@@ -17,9 +18,6 @@ public class PushTransactionResponse {
     @SerializedName("transaction_id")
     private String transactionId;
 
-//    @SerializedName("processed")
-//    private Map processed;
-
     @SerializedName("processed")
     private ProcessedTransactionResponse transactionResponse;
 
@@ -35,4 +33,10 @@ public String getTransactionId() {
     public ProcessedTransactionResponse getProcessed() {
         return transactionResponse;
     }
+
+    public List<ActionTrace> getActionTraces() { return transactionResponse != null ? transactionResponse.getActionTraces() : new ArrayList<ActionTrace>(); }
+
+    public void setActionTraces(List<ActionTrace> actionTraces) {
+        // reset
+    }
 }
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java
index 41b3d7e..ab1ecfd 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java
@@ -6,14 +6,69 @@
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParseException;
 import java.lang.reflect.Type;
+import one.block.eosiojava.error.ErrorConstants;
+import one.block.eosiojava.error.abiProvider.GetAbiError;
+import one.block.eosiojava.error.serializationProvider.DeserializeError;
+import one.block.eosiojava.error.session.TransactionCreateSignatureRequestAbiError;
+import one.block.eosiojava.error.session.TransactionCreateSignatureRequestError;
+import one.block.eosiojava.error.session.TransactionCreateSignatureRequestSerializationError;
+import one.block.eosiojava.interfaces.IABIProvider;
+import one.block.eosiojava.interfaces.ISerializationProvider;
+import one.block.eosiojava.models.EOSIOName;
+import one.block.eosiojava.models.rpcProvider.Action;
 import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 
 public class ActionTraceDeserializer implements JsonDeserializer<ActionTrace> {
+    private ISerializationProvider serializationProvider;
+
     @Override
     public ActionTrace deserialize(JsonElement json, Type typeOfT,
             JsonDeserializationContext context) throws JsonParseException {
         ActionTrace actionTrace = new Gson().fromJson(json.getAsJsonObject(), typeOfT);
-        actionTrace.setDeserializedReturnValue();
+//        String type = "test"; // How do we get this?
+//        try {
+//            AbiEosSerializationObject test = new AbiEosSerializationObject("cfhello", "complex", "studentType", "");
+//            serializationProvider.deserialize(test);
+//            actionTrace.setDeserializedReturnValue(test.getJson());
+//        } catch (DeserializeError deserializeError) {
+//            deserializeError.printStackTrace();
+//        }
+
         return actionTrace;
     }
+
+    private AbiEosSerializationObject deserializeActionTraceReturnValue(Action action, String chainId, IABIProvider abiProvider)
+            throws TransactionCreateSignatureRequestError {
+        String actionAbiJSON;
+        try {
+            actionAbiJSON = abiProvider
+                    .getAbi(chainId, new EOSIOName(action.getAccount()));
+        } catch (GetAbiError getAbiError) {
+            throw new TransactionCreateSignatureRequestAbiError(
+                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_GET_ABI_ERROR,
+                            action.getAccount()), getAbiError);
+        }
+
+        AbiEosSerializationObject actionAbiEosSerializationObject = new AbiEosSerializationObject(
+                action.getAccount(), action.getName(),
+                null, actionAbiJSON);
+        actionAbiEosSerializationObject.setHex("d2040000");
+
+        // !!! At this step, the data field of the action is still in JSON format.
+        //actionAbiEosSerializationObject.setJson(action.getData());
+
+        try {
+            this.serializationProvider.deserialize(actionAbiEosSerializationObject);
+            if (actionAbiEosSerializationObject.getHex().isEmpty()) {
+                throw new TransactionCreateSignatureRequestSerializationError(
+                        ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_WORKED_BUT_EMPTY_RESULT);
+            }
+        } catch (TransactionCreateSignatureRequestSerializationError | DeserializeError serializeError) {
+            throw new TransactionCreateSignatureRequestSerializationError(
+                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_ERROR,
+                            action.getAccount()), serializeError);
+        }
+
+        return actionAbiEosSerializationObject;
+    }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/wasmAbiProvider/WasmABI.java b/eosiojava/src/main/java/one/block/eosiojava/models/wasmAbiProvider/WasmABI.java
deleted file mode 100644
index 018f17e..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/wasmAbiProvider/WasmABI.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package one.block.eosiojava.models.wasmAbiProvider;
-
-public class WasmABI {
-    public String account;
-
-    public byte[] inputData;
-    public byte[] ouputData0;
-    public byte[] outputData1;
-
-    // any
-    public Object mod;
-    public Object inst;
-    public Object primitives;
-    public Object actions;
-
-    public WasmABI(String account, Object mod) {
-        this.account = account;
-        this.mod = mod;
-    }
-
-    public void reset() {
-
-    }
-
-    public void action_args_json_to_bin(String action) {
-
-    }
-
-    public void action_args_bin_to_json(String action, byte[] bin) {
-
-    }
-
-    public void action_ret_bin_to_json(String action, byte[] bin) {
-
-    }
-}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index c586923..e6ef12f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1,6 +1,7 @@
 package one.block.eosiojava.session;
 
 import com.google.common.base.Strings;
+import com.google.gson.Gson;
 import java.io.IOException;
 import java.io.Serializable;
 import java.math.BigInteger;
@@ -13,6 +14,7 @@
 import one.block.eosiojava.error.rpcProvider.GetInfoRpcError;
 import one.block.eosiojava.error.rpcProvider.GetRequiredKeysRpcError;
 import one.block.eosiojava.error.rpcProvider.PushTransactionRpcError;
+import one.block.eosiojava.error.serializationProvider.DeserializeError;
 import one.block.eosiojava.error.serializationProvider.DeserializeTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
@@ -43,6 +45,8 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
+import one.block.eosiojava.models.abiProvider.Abi;
+import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
@@ -191,6 +195,10 @@ public class TransactionProcessor {
      */
     private boolean isTransactionModificationAllowed;
 
+    public IABIProvider getAbiProvider() {
+        return this.abiProvider;
+    }
+
     /**
      * Constructor with all provider references from {@link TransactionSession}
      * @param serializationProvider the serialization provider.
@@ -503,13 +511,25 @@ public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroad
         PushTransactionRequest pushTransactionRequest = new PushTransactionRequest(this.signatures,
                 0, "", this.serializedTransaction);
         try {
-            PushTransactionResponse response = this.pushTransaction(pushTransactionRequest);
-            return response;
+            return getPushTransactionResponse(this.pushTransaction(pushTransactionRequest));
         } catch (TransactionPushTransactionError transactionPushTransactionError) {
             throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
         }
     }
 
+    private PushTransactionResponse getPushTransactionResponse(PushTransactionResponse response) {
+        List<ActionTrace> actionTraces = response.getActionTraces();
+        for (ActionTrace actionTrace : actionTraces) {
+            try {
+                AbiEosSerializationObject deserializationObject = deserializeActionTraceReturnValue(actionTrace, chainId, abiProvider);
+                actionTrace.setDeserializedReturnValue(deserializationObject.getJson());
+            } catch (TransactionCreateSignatureRequestError transactionCreateSignatureRequestError) {
+                transactionCreateSignatureRequestError.printStackTrace();
+            }
+        }
+        return response;
+    }
+
     /**
      * Return transaction in JSON string format.
      *
@@ -888,6 +908,43 @@ private AbiEosSerializationObject serializeAction(Action action, String chainId,
         return actionAbiEosSerializationObject;
     }
 
+    public AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace actionTrace, String chainId, IABIProvider abiProvider)
+            throws TransactionCreateSignatureRequestError {
+        String actionAbiJSON;
+        try {
+            actionAbiJSON = abiProvider
+                    .getAbi(chainId, new EOSIOName(actionTrace.getAccountName()));
+        } catch (GetAbiError getAbiError) {
+            throw new TransactionCreateSignatureRequestAbiError(
+                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_GET_ABI_ERROR,
+                            actionTrace.getAccountName()), getAbiError);
+        }
+
+        Abi abi = new Gson().fromJson(actionAbiJSON, Abi.class);
+        String returnType = abi.getActionReturnType(actionTrace.getActionName());
+
+        AbiEosSerializationObject actionAbiEosSerializationObject = new AbiEosSerializationObject(
+                actionTrace.getAccountName(), actionTrace.getActionName(),
+                returnType, actionAbiJSON);
+
+        // !!! At this step, the data field of the action is still in HEX format.
+        actionAbiEosSerializationObject.setHex(actionTrace.getHexReturnValue());
+
+        try {
+            this.serializationProvider.deserialize(actionAbiEosSerializationObject);
+            if (actionAbiEosSerializationObject.getJson().isEmpty()) {
+                throw new TransactionCreateSignatureRequestSerializationError(
+                        ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_WORKED_BUT_EMPTY_RESULT);
+            }
+        } catch (TransactionCreateSignatureRequestSerializationError | DeserializeError serializeError) {
+            throw new TransactionCreateSignatureRequestSerializationError(
+                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_ERROR,
+                            actionTrace.getAccountName()), serializeError);
+        }
+
+        return actionAbiEosSerializationObject;
+    }
+
     /**
      * Getting deep clone of the transaction
      */
diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
index 0be07ab..a141ff9 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
@@ -2,7 +2,6 @@
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -12,6 +11,8 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
+import com.google.gson.Gson;
+import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -21,10 +22,12 @@
 import one.block.eosiojava.error.rpcProvider.GetInfoRpcError;
 import one.block.eosiojava.error.rpcProvider.GetRequiredKeysRpcError;
 import one.block.eosiojava.error.rpcProvider.PushTransactionRpcError;
+import one.block.eosiojava.error.serializationProvider.DeserializeError;
 import one.block.eosiojava.error.serializationProvider.DeserializeTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
 import one.block.eosiojava.error.session.TransactionBroadCastError;
+import one.block.eosiojava.error.session.TransactionCreateSignatureRequestError;
 import one.block.eosiojava.error.session.TransactionCreateSignatureRequestRequiredKeysEmptyError;
 import one.block.eosiojava.error.session.TransactionPrepareError;
 import one.block.eosiojava.error.session.TransactionProcessorConstructorInputError;
@@ -37,6 +40,7 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
+import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
@@ -348,8 +352,8 @@ public void isAllowTransactionToBeModified() {
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(MOCKED_PUSHTRANSACTION_RESPONE_JSON, PushTransactionResponse.class));
 
-        this.mockAbiProvider(EOSIOTOKENABIJSON);
-        this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction);
+        this.mockAbiProvider(EOSIOABIJSON);
+        this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction, MOCKED_RETURN_VALUE_JSON);
         this.mockSignatureProvider(Arrays.asList("Key1", "Key2"),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN)
                         .fromJson(mockedEosioTransactionSignatureResponseModifiedTransactionJSON, EosioTransactionSignatureResponse.class));
@@ -516,6 +520,25 @@ public void testContextFreeActionPrepare() {
         }
     }
 
+    @Test
+    public void testDeserialize() throws UnsupportedEncodingException {
+        this.mockDefaultSuccessData();
+        List<Action> actions = this.defaultActions();
+        TransactionProcessor processor = createAndPrepareTransaction(actions);
+
+        String expectedJson = "{\"id\":1234,\"name\":\"test\"}";
+
+        ActionTrace actionTrace = new Gson().fromJson(MOCKED_PROCESSED_ACTION_TRACE, ActionTrace.class);
+
+        try {
+            AbiEosSerializationObject serializationObject = processor.deserializeActionTraceReturnValue(actionTrace, MOCKED_CHAIN_ID, processor.getAbiProvider());
+            assertEquals(expectedJson, serializationObject.getJson());
+        } catch (TransactionCreateSignatureRequestError transactionCreateSignatureRequestError) {
+            transactionCreateSignatureRequestError.printStackTrace();
+            fail("Exception should not be thrown here for calling deserialize.");
+        }
+    }
+
     private void mockDefaultSuccessData() {
         this.mockRPC(
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetInfoResponse, GetInfoResponse.class),
@@ -523,8 +546,8 @@ private void mockDefaultSuccessData() {
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(MOCKED_PUSHTRANSACTION_RESPONE_JSON, PushTransactionResponse.class));
 
-        this.mockAbiProvider(EOSIOTOKENABIJSON);
-        this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction);
+        this.mockAbiProvider(EOSIOABIJSON);
+        this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction, MOCKED_RETURN_VALUE_JSON);
         this.mockSignatureProvider(Arrays.asList("Key1", "Key2"),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedEosioTransactionSignatureResponseJSON, EosioTransactionSignatureResponse.class));
     }
@@ -612,7 +635,8 @@ private void mockAbiProvider(String abiJSON) {
     private void mockSerializationProvider(
             @Nullable final String mockedActionHex,
             @Nullable String mockedTransactionHex,
-            @Nullable String mockedDeserializedTransaction) {
+            @Nullable String mockedDeserializedTransaction,
+            @Nullable String mockedReturnValueJson) {
 
         if (mockedActionHex != null) {
             try {
@@ -647,6 +671,22 @@ public Object answer(InvocationOnMock invocationOnMock) {
                 fail("Exception should not be thrown here for mocking deserializeTransaction");
             }
         }
+
+        if (mockedReturnValueJson != null) {
+            try {
+                doAnswer(new Answer() {
+                    @Override
+                    public Object answer(InvocationOnMock invocationOnMock) {
+                        Object[] args = invocationOnMock.getArguments();
+                        ((AbiEosSerializationObject) args[0]).setJson(mockedReturnValueJson);
+                        return null;
+                    }
+                }).when(this.mockedSerializationProvider).deserialize(any(AbiEosSerializationObject.class));
+            } catch (DeserializeError deserializeTransactionError) {
+                deserializeTransactionError.printStackTrace();
+                fail("Exception should not be thrown here for mocking deserializeTransaction");
+            }
+        }
     }
 
     private void mockSignatureProvider(List<String> mockedAvaialbleKeys, EosioTransactionSignatureResponse mockedResponse) {
@@ -665,10 +705,226 @@ private void mockSignatureProvider(List<String> mockedAvaialbleKeys, EosioTransa
         }
     }
 
-    private static final String EOSIOTOKENABIJSON = "{\"version\":\"eosio::abi/1.0\",\"types\":[{\"new_type_name\":\"account_name\",\"type\":\"name\"}],\"structs\":[{\"name\":\"transfer\",\"base\":\"\",\"fields\":[{\"name\":\"from\",\"type\":\"account_name\"},{\"name\":\"to\",\"type\":\"account_name\"},{\"name\":\"quantity\",\"type\":\"asset\"},{\"name\":\"memo\",\"type\":\"string\"}]},{\"name\":\"create\",\"base\":\"\",\"fields\":[{\"name\":\"issuer\",\"type\":\"account_name\"},{\"name\":\"maximum_supply\",\"type\":\"asset\"}]},{\"name\":\"issue\",\"base\":\"\",\"fields\":[{\"name\":\"to\",\"type\":\"account_name\"},{\"name\":\"quantity\",\"type\":\"asset\"},{\"name\":\"memo\",\"type\":\"string\"}]},{\"name\":\"account\",\"base\":\"\",\"fields\":[{\"name\":\"balance\",\"type\":\"asset\"}]},{\"name\":\"currency_stats\",\"base\":\"\",\"fields\":[{\"name\":\"supply\",\"type\":\"asset\"},{\"name\":\"max_supply\",\"type\":\"asset\"},{\"name\":\"issuer\",\"type\":\"account_name\"}]}],\"actions\":[{\"name\":\"transfer\",\"type\":\"transfer\",\"ricardian_contract\":\"---\\ntitle: Token Transfer\\nsummary: Transfer tokens from one account to another.\\nicon: https://cdn.testnet.dev.b1ops.net/token-transfer.png#ce51ef9f9eeca3434e85507e0ed49e76fff1265422bded0255f3196ea59c8b0c\\n---\\n\\n## Transfer Terms & Conditions\\n\\nI, {{from}}, certify the following to be true to the best of my knowledge:\\n\\n1. I certify that {{quantity}} is not the proceeds of fraudulent or violent activities.\\n2. I certify that, to the best of my knowledge, {{to}} is not supporting initiation of violence against others.\\n3. I have disclosed any contractual terms & conditions with respect to {{quantity}} to {{to}}.\\n\\nI understand that funds transfers are not reversible after the {{$transaction.delay_sec}} seconds or other delay as configured by {{from}}'s permissions.\\n\\nIf this action fails to be irreversibly confirmed after receiving goods or services from '{{to}}', I agree to either return the goods or services or resend {{quantity}} in a timely manner.\"},{\"name\":\"issue\",\"type\":\"issue\",\"ricardian_contract\":\"\"},{\"name\":\"create\",\"type\":\"create\",\"ricardian_contract\":\"\"}],\"tables\":[{\"name\":\"accounts\",\"index_type\":\"i64\",\"key_names\":[\"currency\"],\"key_types\":[\"uint64\"],\"type\":\"account\"},{\"name\":\"stat\",\"index_type\":\"i64\",\"key_names\":[\"currency\"],\"key_types\":[\"uint64\"],\"type\":\"currency_stats\"}],\"ricardian_clauses\":[],\"error_messages\":[],\"abi_extensions\":[],\"variants\":[]}";
+    private static final String EOSIOABIJSON = "{\n"
+            + "   \"version\":\"eosio::abi/1.2\",\n"
+            + "   \"types\":[\n"
+            + "      {\n"
+            + "         \"new_type_name\":\"account_name\",\n"
+            + "         \"type\":\"name\"\n"
+            + "      }\n"
+            + "   ],\n"
+            + "   \"structs\":[\n"
+            + "      {\n"
+            + "         \"name\":\"transfer\",\n"
+            + "         \"base\":\"\",\n"
+            + "         \"fields\":[\n"
+            + "            {\n"
+            + "               \"name\":\"from\",\n"
+            + "               \"type\":\"account_name\"\n"
+            + "            },\n"
+            + "            {\n"
+            + "               \"name\":\"to\",\n"
+            + "               \"type\":\"account_name\"\n"
+            + "            },\n"
+            + "            {\n"
+            + "               \"name\":\"quantity\",\n"
+            + "               \"type\":\"asset\"\n"
+            + "            },\n"
+            + "            {\n"
+            + "               \"name\":\"memo\",\n"
+            + "               \"type\":\"string\"\n"
+            + "            }\n"
+            + "         ]\n"
+            + "      },\n"
+            + "      {\n"
+            + "         \"name\":\"create\",\n"
+            + "         \"base\":\"\",\n"
+            + "         \"fields\":[\n"
+            + "            {\n"
+            + "               \"name\":\"issuer\",\n"
+            + "               \"type\":\"account_name\"\n"
+            + "            },\n"
+            + "            {\n"
+            + "               \"name\":\"maximum_supply\",\n"
+            + "               \"type\":\"asset\"\n"
+            + "            }\n"
+            + "         ]\n"
+            + "      },\n"
+            + "      {\n"
+            + "         \"name\":\"issue\",\n"
+            + "         \"base\":\"\",\n"
+            + "         \"fields\":[\n"
+            + "            {\n"
+            + "               \"name\":\"to\",\n"
+            + "               \"type\":\"account_name\"\n"
+            + "            },\n"
+            + "            {\n"
+            + "               \"name\":\"quantity\",\n"
+            + "               \"type\":\"asset\"\n"
+            + "            },\n"
+            + "            {\n"
+            + "               \"name\":\"memo\",\n"
+            + "               \"type\":\"string\"\n"
+            + "            }\n"
+            + "         ]\n"
+            + "      },\n"
+            + "      {\n"
+            + "         \"name\":\"account\",\n"
+            + "         \"base\":\"\",\n"
+            + "         \"fields\":[\n"
+            + "            {\n"
+            + "               \"name\":\"balance\",\n"
+            + "               \"type\":\"asset\"\n"
+            + "            }\n"
+            + "         ]\n"
+            + "      },\n"
+            + "      {\n"
+            + "         \"name\":\"currency_stats\",\n"
+            + "         \"base\":\"\",\n"
+            + "         \"fields\":[\n"
+            + "            {\n"
+            + "               \"name\":\"supply\",\n"
+            + "               \"type\":\"asset\"\n"
+            + "            },\n"
+            + "            {\n"
+            + "               \"name\":\"max_supply\",\n"
+            + "               \"type\":\"asset\"\n"
+            + "            },\n"
+            + "            {\n"
+            + "               \"name\":\"issuer\",\n"
+            + "               \"type\":\"account_name\"\n"
+            + "            }\n"
+            + "         ]\n"
+            + "      },\n"
+            + "      {\n"
+            + "          \"name\": \"retval_test\",\n"
+            + "          \"base\": \"\",\n"
+            + "          \"fields\": [\n"
+            + "              {\n"
+            + "                  \"name\": \"user\",\n"
+            + "                  \"type\": \"name\"\n"
+            + "              }\n"
+            + "          ]\n"
+            + "      },\n"
+            + "      {\n"
+            + "          \"name\": \"returnValue\",\n"
+            + "          \"base\": \"\",\n"
+            + "          \"fields\": [\n"
+            + "              {\n"
+            + "                  \"name\": \"id\",\n"
+            + "                  \"type\": \"uint32\"\n"
+            + "              },\n"
+            + "              {\n"
+            + "                  \"name\": \"name\",\n"
+            + "                  \"type\": \"name\"\n"
+            + "              }\n"
+            + "          ]\n"
+            + "      }\n"
+            + "   ],\n"
+            + "   \"actions\":[\n"
+            + "      {\n"
+            + "         \"name\":\"transfer\",\n"
+            + "         \"type\":\"transfer\",\n"
+            + "         \"ricardian_contract\":\"---\\ntitle: Token Transfer\\nsummary: Transfer tokens from one account to another.\\nicon: https://cdn.testnet.dev.b1ops.net/token-transfer.png#ce51ef9f9eeca3434e85507e0ed49e76fff1265422bded0255f3196ea59c8b0c\\n---\\n\\n## Transfer Terms & Conditions\\n\\nI, {{from}}, certify the following to be true to the best of my knowledge:\\n\\n1. I certify that {{quantity}} is not the proceeds of fraudulent or violent activities.\\n2. I certify that, to the best of my knowledge, {{to}} is not supporting initiation of violence against others.\\n3. I have disclosed any contractual terms & conditions with respect to {{quantity}} to {{to}}.\\n\\nI understand that funds transfers are not reversible after the {{$transaction.delay_sec}} seconds or other delay as configured by {{from}}'s permissions.\\n\\nIf this action fails to be irreversibly confirmed after receiving goods or services from '{{to}}', I agree to either return the goods or services or resend {{quantity}} in a timely manner.\"\n"
+            + "      },\n"
+            + "      {\n"
+            + "         \"name\":\"issue\",\n"
+            + "         \"type\":\"issue\",\n"
+            + "         \"ricardian_contract\":\"\"\n"
+            + "      },\n"
+            + "      {\n"
+            + "         \"name\":\"create\",\n"
+            + "         \"type\":\"create\",\n"
+            + "         \"ricardian_contract\":\"\"\n"
+            + "      },\n"
+            + "      {\n"
+            + "          \"name\": \"retval_test\",\n"
+            + "          \"type\": \"retval_test\",\n"
+            + "          \"ricardian_contract\": \"\"\n"
+            + "      }\n"
+            + "   ],\n"
+            + "   \"tables\":[\n"
+            + "      {\n"
+            + "         \"name\":\"accounts\",\n"
+            + "         \"index_type\":\"i64\",\n"
+            + "         \"key_names\":[\n"
+            + "            \"currency\"\n"
+            + "         ],\n"
+            + "         \"key_types\":[\n"
+            + "            \"uint64\"\n"
+            + "         ],\n"
+            + "         \"type\":\"account\"\n"
+            + "      },\n"
+            + "      {\n"
+            + "         \"name\":\"stat\",\n"
+            + "         \"index_type\":\"i64\",\n"
+            + "         \"key_names\":[\n"
+            + "            \"currency\"\n"
+            + "         ],\n"
+            + "         \"key_types\":[\n"
+            + "            \"uint64\"\n"
+            + "         ],\n"
+            + "         \"type\":\"currency_stats\"\n"
+            + "      }\n"
+            + "   ],\n"
+            + "   \"ricardian_clauses\":[],\n"
+            + "   \"error_messages\":[],\n"
+            + "   \"abi_extensions\":[],\n"
+            + "   \"variants\":[],\n"
+            + "   \"action_results\": [\n"
+            + "     {\n"
+            + "         \"name\": \"retval_test\",\n"
+            + "         \"result_type\": \"returnValue\"\n"
+            + "     }\n"
+            + "   ]\n"
+            + "}";
 
     private static final String DUMP_TRANSACTION_ID = "17335a29eae22e531966f3775e44f8b02173e780c9549881e01e470ff0ab46ce";
-    private static final String MOCKED_PUSHTRANSACTION_RESPONE_JSON = "{\"transaction_id\":\"" + DUMP_TRANSACTION_ID + "\"}";
+    private static final String MOCKED_PROCESSED_ACTION_TRACE = "{\n"
+            + "        \"action_ordinal\": 1,\n"
+            + "        \"creator_action_ordinal\": 0,\n"
+            + "        \"closest_unnotified_ancestor_action_ordinal\": 0,\n"
+            + "        \"receipt\": {\n"
+            + "          \"receiver\": \"account\",\n"
+            + "          \"act_digest\": \"8f6c4be57658986020e3fc61294d339965a4491ddfae0ceacf598fcaf9955da0\",\n"
+            + "          \"global_sequence\": 275242,\n"
+            + "          \"recv_sequence\": 48,\n"
+            + "          \"auth_sequence\": [[\n"
+            + "              \"actor\",\n"
+            + "              40\n"
+            + "            ]\n"
+            + "          ],\n"
+            + "          \"code_sequence\": 14,\n"
+            + "          \"abi_sequence\": 14\n"
+            + "        },\n"
+            + "        \"receiver\": \"account\",\n"
+            + "        \"act\": {\n"
+            + "          \"account\": \"account\",\n"
+            + "          \"name\": \"retval_test\",\n"
+            + "          \"authorization\": [{\n"
+            + "              \"actor\": \"actor\",\n"
+            + "              \"permission\": \"active\"\n"
+            + "            }\n"
+            + "          ],\n"
+            + "          \"data\": {\n"
+            + "            \"user\": \"test\"\n"
+            + "          },\n"
+            + "          \"hex_data\": \"d2040000000000000090b1ca\"\n"
+            + "        },\n"
+            + "        \"context_free\": false,\n"
+            + "        \"elapsed\": 760,\n"
+            + "        \"console\": \"Hi, test\",\n"
+            + "        \"trx_id\": \"7f2ccf898efcb08dd64cadf4ca2bcd61f2577f40162928283038a6a6950e6683\",\n"
+            + "        \"block_num\": 275159,\n"
+            + "        \"block_time\": \"2020-06-25T17:24:18.000\",\n"
+            + "        \"producer_block_id\": null,\n"
+            + "        \"account_ram_deltas\": [],\n"
+            + "        \"account_disk_deltas\": [],\n"
+            + "        \"except\": null,\n"
+            + "        \"error_code\": null,\n"
+            + "        \"return_value\": \"d2040000000000000090b1ca\"\n"
+            + "      }";
+    private static final String MOCKED_PUSHTRANSACTION_RESPONE_JSON = "{\"transaction_id\":\"" + DUMP_TRANSACTION_ID + "\", \"processed\": { \"action_traces\": [" + MOCKED_PROCESSED_ACTION_TRACE + "]}}";
 
     private static final BigInteger headBlockNum = BigInteger.valueOf(31984402L);
     private static final String headBlockTime = "2019-04-01T22:08:40.000";
@@ -679,6 +935,7 @@ private void mockSignatureProvider(List<String> mockedAvaialbleKeys, EosioTransa
     private static final String MOCKED_SIGNATURE = "SIG_R1_KsHAyy6EvQq2E6c7oxzxCtus5Jd4wP8KZkSxuhZUfxprU56okEWFjopjwy7wGH4fAjJKgTcceG4iUhZGRsWfYiDaTK5X5y";
     private static final String MOCKED_CHAIN_ID = "Mocked chain id";
     private static final String MOCKED_TRANSACTION_HEX_MODIFIED = "1ec3a35c1a706e886c51000000000100a6823403ea3055000000572d3ccdcd01000000000000c03400000000a8ed32322a000000000000c034000000000000a682a08601000000000004454f530000000009536f6d657468696e6700";
+    private static final String MOCKED_RETURN_VALUE_JSON = "{\"id\":1234,\"name\":\"test\"}";
 
     // Expectation
     // headBlockTime + default 5 minutes
@@ -762,5 +1019,4 @@ private void mockSignatureProvider(List<String> mockedAvaialbleKeys, EosioTransa
             ",\n" +
             "\"transaction_extensions\" : []\n" +
             "}";
-
 }
\ No newline at end of file

From 6ae7882782bc027fa0388269325455b2d3da457d Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 13:25:53 -0400
Subject: [PATCH 05/45] Update tests

---
 .../rpcProvider/response/ActionTrace.java     |  72 +-----
 .../session/TransactionProcessor.java         |   2 +-
 .../session/TransactionProcessorTest.java     | 221 ++++++++++++------
 3 files changed, 158 insertions(+), 137 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
index 45723a4..0369a3f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -67,77 +67,9 @@ public class ActionTrace {
 
     private String deserializedReturnValue;
 
-    public ActionTrace() {
-        String actionName = "normal"; // Necessary to prepend
-
-        // returning 10 becomes "0a000000" --- Numbers can be parsed with Integer.parseInt(0000000a, 16)
-        // returning 2 becomes "02000000"
-        // returning 3 becomes "03000000"
-        // returning 16 becomes "10000000"
-        // "a" becomes "0000000000000030"
-        // "b" becomes "0000000000000038"
-        // "c" becomes "0000000000000040"
-        // "d" becomes "0000000000000048"
-        // "1" becomes "0000000000000008"
-        // "2" becomes "0000000000000010"
-        // 1234 becomes "d2040000"
-        // "test" becomes "000000000090b1ca"
-        // "1234" becomes "0000000000408608"
-        // "12" becomes "0000000000008008"
-        // 100 becomes "64000000"
-        // 128 becomes "80000000"
-        // 129 becomes "81000000"
-        // 127 becomes "7f000000"
-        // 255 becomes "ff000000"
-        // 256 becomes "00010000"
-        // 257 becomes "01010000"
-        // 9999999999999999999 becomes "ffffe789" and is truncated to 2313682943 instead
-
-
-//        String testReturnValue = "d2040000"; // 1234
-//        String testReturnValue2 = "000000000090b1ca"; // "test"
-//
-//        ByteBuffer buffer = ByteBuffer.allocate(10);
-//        buffer.put("normal".getBytes());
-//        buffer.put(Hex.decode(testReturnValue));
-//
-//        byte[] bytesTest = buffer.array();
-//        String testStr = new String(bytesTest, "UTF-8");
-//
-//        byte[] bytes = Hex.decode(testReturnValue);
-//        String test = new String(bytes, "UTF-8");
-//
-//        String derp = DatatypeConverter.printBase64Binary(bytes);
-//        byte[] der = DatatypeConverter.parseBase64Binary(testReturnValue);
-//        String gotIt = new String(der);
-//
-//        String result = BaseEncoding.base32Hex().encode(bytes);
-//
-//        byte[] bytes2 = Hex.decode(testReturnValue2);
-//        String test2 = new String(bytes2);
-//
-//        String testDerp = "something";
-//        String returnValueTwo = "00000002";
-//        byte[] bytes = returnValueTwo.getBytes();
-//
-//        String bin = hexToBin("02000000");
-//        String bin2 = hexToBin("00000020");
-//
-//        int charCode = Integer.parseInt("02000000", 2);
-//        int charCode2 = Integer.parseInt("00000020", 2);
-//
-//        String str = new Character((char)charCode).toString();
-//
-//        String result = new String(Hex.decode(returnValueTwo));
-//        String result2 = new String(bytes);
-//
-//        byte[] hexData = hexStringToByteArray(returnValueTwo);
-//
-    }
+    public String getHexReturnValue() { return this.returnValue; }
 
-    public String getHexReturnValue() {
-        return this.returnValue;
-    }
+    public String getDeserializedReturnValue() { return this.deserializedReturnValue; }
 
     public String getAccountName() {
         return (String)this.act.get("account");
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index e6ef12f..3c2c3f3 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -908,7 +908,7 @@ private AbiEosSerializationObject serializeAction(Action action, String chainId,
         return actionAbiEosSerializationObject;
     }
 
-    public AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace actionTrace, String chainId, IABIProvider abiProvider)
+    private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace actionTrace, String chainId, IABIProvider abiProvider)
             throws TransactionCreateSignatureRequestError {
         String actionAbiJSON;
         try {
diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
index a141ff9..c19fdf2 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
@@ -11,8 +11,6 @@
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
-import com.google.gson.Gson;
-import java.io.UnsupportedEncodingException;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,7 +25,6 @@
 import one.block.eosiojava.error.serializationProvider.SerializeError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
 import one.block.eosiojava.error.session.TransactionBroadCastError;
-import one.block.eosiojava.error.session.TransactionCreateSignatureRequestError;
 import one.block.eosiojava.error.session.TransactionCreateSignatureRequestRequiredKeysEmptyError;
 import one.block.eosiojava.error.session.TransactionPrepareError;
 import one.block.eosiojava.error.session.TransactionProcessorConstructorInputError;
@@ -40,7 +37,6 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
@@ -350,7 +346,7 @@ public void isAllowTransactionToBeModified() {
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetInfoResponse, GetInfoResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetBlockResponse, GetBlockResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class),
-                Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(MOCKED_PUSHTRANSACTION_RESPONE_JSON, PushTransactionResponse.class));
+                Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(getMockedPushTransactionResponseJson(), PushTransactionResponse.class));
 
         this.mockAbiProvider(EOSIOABIJSON);
         this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction, MOCKED_RETURN_VALUE_JSON);
@@ -521,33 +517,137 @@ public void testContextFreeActionPrepare() {
     }
 
     @Test
-    public void testDeserialize() throws UnsupportedEncodingException {
-        this.mockDefaultSuccessData();
-        List<Action> actions = this.defaultActions();
-        TransactionProcessor processor = createAndPrepareTransaction(actions);
+    public void testDeserializeActionTraceWithNoReturnValue() {
+        String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace("", "retval_null");
+        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String expectedJson = null;
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson);
+
+        TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
+        assertNotNull(processor);
 
+        try {
+            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
+            assertNotNull(pushTransactionResponse);
+            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+        } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
+            transactionSignAndBroadCastError.printStackTrace();
+            fail("Exception should not be thrown here for calling signAndBroadcast");
+        }
+    }
+
+    @Test
+    public void testDeserializeActionTraceWithSimpleReturnValue() {
+        String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace("0a000000", "retval_simple");
+        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String expectedJson = "10";
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson);
+
+        TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
+        assertNotNull(processor);
+
+        try {
+            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
+            assertNotNull(pushTransactionResponse);
+            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+        } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
+            transactionSignAndBroadCastError.printStackTrace();
+            fail("Exception should not be thrown here for calling signAndBroadcast");
+        }
+    }
+
+    @Test
+    public void testDeserializeActionTraceWithComplexReturnValue() {
+        String mockedActionTraceWithComplexReturnValue = getMockedProcessedActionTrace("d2040000000000000090b1ca", "retval_complex");
+        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithComplexReturnValue);
         String expectedJson = "{\"id\":1234,\"name\":\"test\"}";
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson);
 
-        ActionTrace actionTrace = new Gson().fromJson(MOCKED_PROCESSED_ACTION_TRACE, ActionTrace.class);
+        TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
+        assertNotNull(processor);
 
         try {
-            AbiEosSerializationObject serializationObject = processor.deserializeActionTraceReturnValue(actionTrace, MOCKED_CHAIN_ID, processor.getAbiProvider());
-            assertEquals(expectedJson, serializationObject.getJson());
-        } catch (TransactionCreateSignatureRequestError transactionCreateSignatureRequestError) {
-            transactionCreateSignatureRequestError.printStackTrace();
-            fail("Exception should not be thrown here for calling deserialize.");
+            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
+            assertNotNull(pushTransactionResponse);
+            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+        } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
+            transactionSignAndBroadCastError.printStackTrace();
+            fail("Exception should not be thrown here for calling signAndBroadcast");
         }
     }
 
+    private String getMockedProcessedActionTrace(String returnValueHex, String actionName) {
+        return "{\n"
+                + "        \"action_ordinal\": 1,\n"
+                + "        \"creator_action_ordinal\": 0,\n"
+                + "        \"closest_unnotified_ancestor_action_ordinal\": 0,\n"
+                + "        \"receipt\": {\n"
+                + "          \"receiver\": \"account\",\n"
+                + "          \"act_digest\": \"8f6c4be57658986020e3fc61294d339965a4491ddfae0ceacf598fcaf9955da0\",\n"
+                + "          \"global_sequence\": 275242,\n"
+                + "          \"recv_sequence\": 48,\n"
+                + "          \"auth_sequence\": [[\n"
+                + "              \"actor\",\n"
+                + "              40\n"
+                + "            ]\n"
+                + "          ],\n"
+                + "          \"code_sequence\": 14,\n"
+                + "          \"abi_sequence\": 14\n"
+                + "        },\n"
+                + "        \"receiver\": \"account\",\n"
+                + "        \"act\": {\n"
+                + "          \"account\": \"account\",\n"
+                + "          \"name\": \"" + actionName + "\",\n"
+                + "          \"authorization\": [{\n"
+                + "              \"actor\": \"actor\",\n"
+                + "              \"permission\": \"active\"\n"
+                + "            }\n"
+                + "          ],\n"
+                + "          \"data\": {\n"
+                + "            \"user\": \"test\"\n"
+                + "          },\n"
+                + "          \"hex_data\": \"000000000090b1ca\"\n"
+                + "        },\n"
+                + "        \"context_free\": false,\n"
+                + "        \"elapsed\": 760,\n"
+                + "        \"console\": \"Hi, test\",\n"
+                + "        \"trx_id\": \"7f2ccf898efcb08dd64cadf4ca2bcd61f2577f40162928283038a6a6950e6683\",\n"
+                + "        \"block_num\": 275159,\n"
+                + "        \"block_time\": \"2020-06-25T17:24:18.000\",\n"
+                + "        \"producer_block_id\": null,\n"
+                + "        \"account_ram_deltas\": [],\n"
+                + "        \"account_disk_deltas\": [],\n"
+                + "        \"except\": null,\n"
+                + "        \"error_code\": null,\n"
+                + "        \"return_value\": \"" + returnValueHex + "\"\n"
+                + "      }";
+    }
+
+    private String getMockedPushTransactionResponseJson() {
+        return getMockedPushTransactionResponseJson(null);
+    }
+
+    private String getMockedPushTransactionResponseJson(@Nullable String mockedProcessedActionTrace) {
+        if (mockedProcessedActionTrace != null) {
+            return "{\"transaction_id\":\"" + DUMP_TRANSACTION_ID + "\", \"processed\": { \"action_traces\": [" + mockedProcessedActionTrace + "]}}";
+        }
+
+        return "{\"transaction_id\":\"" + DUMP_TRANSACTION_ID + "\"}";
+    }
+
     private void mockDefaultSuccessData() {
+        mockDefaultSuccessData(getMockedPushTransactionResponseJson(), MOCKED_RETURN_VALUE_JSON);
+    }
+
+    private void mockDefaultSuccessData(String mockedPushTransactionResponseJson, String mockedReturnValueJson) {
         this.mockRPC(
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetInfoResponse, GetInfoResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetBlockResponse, GetBlockResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class),
-                Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(MOCKED_PUSHTRANSACTION_RESPONE_JSON, PushTransactionResponse.class));
+                Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedPushTransactionResponseJson, PushTransactionResponse.class));
 
         this.mockAbiProvider(EOSIOABIJSON);
-        this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction, MOCKED_RETURN_VALUE_JSON);
+        this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction, mockedReturnValueJson);
         this.mockSignatureProvider(Arrays.asList("Key1", "Key2"),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedEosioTransactionSignatureResponseJSON, EosioTransactionSignatureResponse.class));
     }
@@ -797,7 +897,27 @@ private void mockSignatureProvider(List<String> mockedAvaialbleKeys, EosioTransa
             + "         ]\n"
             + "      },\n"
             + "      {\n"
-            + "          \"name\": \"retval_test\",\n"
+            + "          \"name\": \"retval_complex\",\n"
+            + "          \"base\": \"\",\n"
+            + "          \"fields\": [\n"
+            + "              {\n"
+            + "                  \"name\": \"user\",\n"
+            + "                  \"type\": \"name\"\n"
+            + "              }\n"
+            + "          ]\n"
+            + "      },\n"
+            + "      {\n"
+            + "          \"name\": \"retval_simple\",\n"
+            + "          \"base\": \"\",\n"
+            + "          \"fields\": [\n"
+            + "              {\n"
+            + "                  \"name\": \"user\",\n"
+            + "                  \"type\": \"name\"\n"
+            + "              }\n"
+            + "          ]\n"
+            + "      },\n"
+            + "      {\n"
+            + "          \"name\": \"retval_null\",\n"
             + "          \"base\": \"\",\n"
             + "          \"fields\": [\n"
             + "              {\n"
@@ -838,8 +958,18 @@ private void mockSignatureProvider(List<String> mockedAvaialbleKeys, EosioTransa
             + "         \"ricardian_contract\":\"\"\n"
             + "      },\n"
             + "      {\n"
-            + "          \"name\": \"retval_test\",\n"
-            + "          \"type\": \"retval_test\",\n"
+            + "          \"name\": \"retval_complex\",\n"
+            + "          \"type\": \"retval_complex\",\n"
+            + "          \"ricardian_contract\": \"\"\n"
+            + "      },\n"
+            + "      {\n"
+            + "          \"name\": \"retval_simple\",\n"
+            + "          \"type\": \"retval_simple\",\n"
+            + "          \"ricardian_contract\": \"\"\n"
+            + "      },\n"
+            + "      {\n"
+            + "          \"name\": \"retval_null\",\n"
+            + "          \"type\": \"retval_null\",\n"
             + "          \"ricardian_contract\": \"\"\n"
             + "      }\n"
             + "   ],\n"
@@ -873,58 +1003,17 @@ private void mockSignatureProvider(List<String> mockedAvaialbleKeys, EosioTransa
             + "   \"variants\":[],\n"
             + "   \"action_results\": [\n"
             + "     {\n"
-            + "         \"name\": \"retval_test\",\n"
+            + "         \"name\": \"retval_complex\",\n"
             + "         \"result_type\": \"returnValue\"\n"
+            + "     },\n"
+            + "     {\n"
+            + "         \"name\": \"retval_simple\",\n"
+            + "         \"result_type\": \"uint32\"\n"
             + "     }\n"
             + "   ]\n"
             + "}";
 
     private static final String DUMP_TRANSACTION_ID = "17335a29eae22e531966f3775e44f8b02173e780c9549881e01e470ff0ab46ce";
-    private static final String MOCKED_PROCESSED_ACTION_TRACE = "{\n"
-            + "        \"action_ordinal\": 1,\n"
-            + "        \"creator_action_ordinal\": 0,\n"
-            + "        \"closest_unnotified_ancestor_action_ordinal\": 0,\n"
-            + "        \"receipt\": {\n"
-            + "          \"receiver\": \"account\",\n"
-            + "          \"act_digest\": \"8f6c4be57658986020e3fc61294d339965a4491ddfae0ceacf598fcaf9955da0\",\n"
-            + "          \"global_sequence\": 275242,\n"
-            + "          \"recv_sequence\": 48,\n"
-            + "          \"auth_sequence\": [[\n"
-            + "              \"actor\",\n"
-            + "              40\n"
-            + "            ]\n"
-            + "          ],\n"
-            + "          \"code_sequence\": 14,\n"
-            + "          \"abi_sequence\": 14\n"
-            + "        },\n"
-            + "        \"receiver\": \"account\",\n"
-            + "        \"act\": {\n"
-            + "          \"account\": \"account\",\n"
-            + "          \"name\": \"retval_test\",\n"
-            + "          \"authorization\": [{\n"
-            + "              \"actor\": \"actor\",\n"
-            + "              \"permission\": \"active\"\n"
-            + "            }\n"
-            + "          ],\n"
-            + "          \"data\": {\n"
-            + "            \"user\": \"test\"\n"
-            + "          },\n"
-            + "          \"hex_data\": \"d2040000000000000090b1ca\"\n"
-            + "        },\n"
-            + "        \"context_free\": false,\n"
-            + "        \"elapsed\": 760,\n"
-            + "        \"console\": \"Hi, test\",\n"
-            + "        \"trx_id\": \"7f2ccf898efcb08dd64cadf4ca2bcd61f2577f40162928283038a6a6950e6683\",\n"
-            + "        \"block_num\": 275159,\n"
-            + "        \"block_time\": \"2020-06-25T17:24:18.000\",\n"
-            + "        \"producer_block_id\": null,\n"
-            + "        \"account_ram_deltas\": [],\n"
-            + "        \"account_disk_deltas\": [],\n"
-            + "        \"except\": null,\n"
-            + "        \"error_code\": null,\n"
-            + "        \"return_value\": \"d2040000000000000090b1ca\"\n"
-            + "      }";
-    private static final String MOCKED_PUSHTRANSACTION_RESPONE_JSON = "{\"transaction_id\":\"" + DUMP_TRANSACTION_ID + "\", \"processed\": { \"action_traces\": [" + MOCKED_PROCESSED_ACTION_TRACE + "]}}";
 
     private static final BigInteger headBlockNum = BigInteger.valueOf(31984402L);
     private static final String headBlockTime = "2019-04-01T22:08:40.000";

From 035e6862682a25f8b6545d8612f5fb2afe8fd53c Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 14:25:06 -0400
Subject: [PATCH 06/45] Move abieosserializationobject back. Remove custom
 deserializer

---
 .../block/eosiojava/error/ErrorConstants.java |  2 +-
 .../interfaces/ISerializationProvider.java    |  2 +-
 .../AbiEosSerializationObject.java            |  2 +-
 .../ActionTraceDeserializer.java              | 74 -------------------
 .../session/TransactionProcessor.java         |  2 +-
 .../NegativeTransactionProcessorTest.java     |  2 +-
 .../session/TransactionProcessorTest.java     |  2 +-
 7 files changed, 6 insertions(+), 80 deletions(-)
 rename eosiojava/src/main/java/one/block/eosiojava/models/{serialization => }/AbiEosSerializationObject.java (98%)
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
index 12b7b39..8bc7421 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
+import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
diff --git a/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java b/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java
index 517529d..48605a0 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java
@@ -6,7 +6,7 @@
 import one.block.eosiojava.error.serializationProvider.SerializeAbiError;
 import one.block.eosiojava.error.serializationProvider.SerializeError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
-import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
+import one.block.eosiojava.models.AbiEosSerializationObject;
 
 /**
  * Interface of Serialization Provider
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/serialization/AbiEosSerializationObject.java b/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
similarity index 98%
rename from eosiojava/src/main/java/one/block/eosiojava/models/serialization/AbiEosSerializationObject.java
rename to eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
index 6c054cd..397ed51 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/serialization/AbiEosSerializationObject.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
@@ -1,4 +1,4 @@
-package one.block.eosiojava.models.serialization;
+package one.block.eosiojava.models;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java
deleted file mode 100644
index ab1ecfd..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/serialization/ActionTraceDeserializer.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package one.block.eosiojava.models.serialization;
-
-import com.google.gson.Gson;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import java.lang.reflect.Type;
-import one.block.eosiojava.error.ErrorConstants;
-import one.block.eosiojava.error.abiProvider.GetAbiError;
-import one.block.eosiojava.error.serializationProvider.DeserializeError;
-import one.block.eosiojava.error.session.TransactionCreateSignatureRequestAbiError;
-import one.block.eosiojava.error.session.TransactionCreateSignatureRequestError;
-import one.block.eosiojava.error.session.TransactionCreateSignatureRequestSerializationError;
-import one.block.eosiojava.interfaces.IABIProvider;
-import one.block.eosiojava.interfaces.ISerializationProvider;
-import one.block.eosiojava.models.EOSIOName;
-import one.block.eosiojava.models.rpcProvider.Action;
-import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
-
-public class ActionTraceDeserializer implements JsonDeserializer<ActionTrace> {
-    private ISerializationProvider serializationProvider;
-
-    @Override
-    public ActionTrace deserialize(JsonElement json, Type typeOfT,
-            JsonDeserializationContext context) throws JsonParseException {
-        ActionTrace actionTrace = new Gson().fromJson(json.getAsJsonObject(), typeOfT);
-//        String type = "test"; // How do we get this?
-//        try {
-//            AbiEosSerializationObject test = new AbiEosSerializationObject("cfhello", "complex", "studentType", "");
-//            serializationProvider.deserialize(test);
-//            actionTrace.setDeserializedReturnValue(test.getJson());
-//        } catch (DeserializeError deserializeError) {
-//            deserializeError.printStackTrace();
-//        }
-
-        return actionTrace;
-    }
-
-    private AbiEosSerializationObject deserializeActionTraceReturnValue(Action action, String chainId, IABIProvider abiProvider)
-            throws TransactionCreateSignatureRequestError {
-        String actionAbiJSON;
-        try {
-            actionAbiJSON = abiProvider
-                    .getAbi(chainId, new EOSIOName(action.getAccount()));
-        } catch (GetAbiError getAbiError) {
-            throw new TransactionCreateSignatureRequestAbiError(
-                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_GET_ABI_ERROR,
-                            action.getAccount()), getAbiError);
-        }
-
-        AbiEosSerializationObject actionAbiEosSerializationObject = new AbiEosSerializationObject(
-                action.getAccount(), action.getName(),
-                null, actionAbiJSON);
-        actionAbiEosSerializationObject.setHex("d2040000");
-
-        // !!! At this step, the data field of the action is still in JSON format.
-        //actionAbiEosSerializationObject.setJson(action.getData());
-
-        try {
-            this.serializationProvider.deserialize(actionAbiEosSerializationObject);
-            if (actionAbiEosSerializationObject.getHex().isEmpty()) {
-                throw new TransactionCreateSignatureRequestSerializationError(
-                        ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_WORKED_BUT_EMPTY_RESULT);
-            }
-        } catch (TransactionCreateSignatureRequestSerializationError | DeserializeError serializeError) {
-            throw new TransactionCreateSignatureRequestSerializationError(
-                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_ERROR,
-                            action.getAccount()), serializeError);
-        }
-
-        return actionAbiEosSerializationObject;
-    }
-}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 3c2c3f3..f4eb82d 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -47,7 +47,7 @@
 import one.block.eosiojava.interfaces.ISignatureProvider;
 import one.block.eosiojava.models.abiProvider.Abi;
 import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
-import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
+import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
 import one.block.eosiojava.models.rpcProvider.Transaction;
diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
index cbdf2ef..caa3248 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
@@ -38,7 +38,7 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
+import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
 import one.block.eosiojava.models.rpcProvider.Authorization;
diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
index c19fdf2..05163ec 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
@@ -37,7 +37,7 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.serialization.AbiEosSerializationObject;
+import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
 import one.block.eosiojava.models.rpcProvider.Authorization;

From b5c9df175f33021db42d59e9fe8860dbbefa0871 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 14:26:21 -0400
Subject: [PATCH 07/45] Revert Project.xml

---
 .idea/codeStyles/Project.xml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 84b449b..0dfe6eb 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,7 +7,9 @@
         <option name="TAB_SIZE" value="2" />
       </value>
     </option>
+    <option name="RIGHT_MARGIN" value="100" />
     <AndroidXmlCodeStyleSettings>
+      <option name="USE_CUSTOM_SETTINGS" value="true" />
       <option name="LAYOUT_SETTINGS">
         <value>
           <option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
@@ -21,6 +23,9 @@
       <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
+        <value />
+      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="" withSubpackages="true" static="true" />
@@ -50,6 +55,25 @@
       <option name="SPACE_BEFORE_SUPERCLASS_COLON" value="false" />
     </Objective-C>
     <Objective-C-extensions>
+      <file>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
+      </file>
+      <class>
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
+        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
+      </class>
       <extensions>
         <pair source="cc" header="h" fileNamingConvention="NONE" />
         <pair source="c" header="h" fileNamingConvention="NONE" />
@@ -59,6 +83,7 @@
       <option name="INDENT_CHAINED_CALLS" value="false" />
     </TypeScriptCodeStyleSettings>
     <XML>
+      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <codeStyleSettings language="CSS">

From d4243721da2b2c5e2517f73840bc7d6c53023fd5 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 14:34:13 -0400
Subject: [PATCH 08/45] Use getGson instead of creating new gson object

---
 .../one/block/eosiojava/session/TransactionProcessor.java  | 2 +-
 .../src/main/java/one/block/eosiojava/utilities/Utils.java | 3 ---
 .../src/test/java/one/block/eosiojava/RpcModelTest.java    | 7 -------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index f4eb82d..b4c4521 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -920,7 +920,7 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
                             actionTrace.getAccountName()), getAbiError);
         }
 
-        Abi abi = new Gson().fromJson(actionAbiJSON, Abi.class);
+        Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
         String returnType = abi.getActionReturnType(actionTrace.getActionName());
 
         AbiEosSerializationObject actionAbiEosSerializationObject = new AbiEosSerializationObject(
diff --git a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
index ece62b1..e8df846 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
@@ -8,8 +8,6 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
-import one.block.eosiojava.models.serialization.ActionTraceDeserializer;
 
 /**
  * This class provides generic utility methods
@@ -43,7 +41,6 @@ public static <T extends Serializable> T clone(T object) throws IOException, Cla
      */
     public static Gson getGson(String datePattern) {
         return new GsonBuilder()
-                .registerTypeAdapter(ActionTrace.class, new ActionTraceDeserializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping()
                 .create();
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index 5beeea6..fc8d029 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
@@ -7,22 +7,16 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-import com.google.gson.JsonSerializationContext;
-import java.lang.reflect.Type;
 import java.math.BigInteger;
 import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRawAbiRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
-import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.rpcProvider.response.GetBlockResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRawAbiResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
-import one.block.eosiojava.models.serialization.ActionTraceDeserializer;
 import org.bouncycastle.util.encoders.Base64;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,7 +31,6 @@ public class RpcModelTest {
     @Before
     public void setUpGSON() {
         this.gson = new GsonBuilder()
-                .registerTypeAdapter(ActionTrace.class, new ActionTraceDeserializer())
                 .setDateFormat("yyyy-MM-dd'T'hh:mm:ss zzz")
                 .disableHtmlEscaping().create();
     }

From 656b393d03e2a8653fd648ad8dce4505633c4c85 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 14:49:19 -0400
Subject: [PATCH 09/45] Add error types and refactor

---
 .../block/eosiojava/error/ErrorConstants.java | 12 +++++++-
 .../DeserializeReturnValueError.java          | 26 +++++++++++++++++
 .../response/PushTransactionResponse.java     |  6 +---
 .../session/TransactionProcessor.java         | 28 ++++++++-----------
 4 files changed, 50 insertions(+), 22 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializeReturnValueError.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
index 8bc7421..3e6d9ea 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
@@ -10,6 +10,7 @@
 import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
+import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureRequest;
 import one.block.eosiojava.session.TransactionProcessor;
@@ -320,8 +321,17 @@ private ErrorConstants(){
     public static final String TRANSACTION_PROCESSOR_BROADCAST_SIGN_EMPTY = "Can't call broadcast because Signature is empty. Make sure of calling sign before calling broadcast.";
 
     /**
-     * Error message get thrown if {@link TransactionProcessor#getSignatures()} is empty during process of {@link TransactionProcessor#signAndBroadcast()} ()}
+     * Error message get thrown if {@link TransactionProcessor#getSignatures()} is empty during process of {@link TransactionProcessor#signAndBroadcast()}
      */
     public static final String TRANSACTION_PROCESSOR_SIGN_BROADCAST_SIGN_EMPTY = "Can't call sign and broadcast because Signature is empty. Make sure of calling sign before calling sign and broadcast.";
 
+    /**
+     * Error message get thrown if return value's deserialization process gets an error by calling {@link ISerializationProvider#deserialize(AbiEosSerializationObject)}}
+     */
+    public static final String TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_ERROR = "Error happened on deserializing return value [%s]";
+
+    /**
+     * Error message thrown if deserializeActionTraceReturnValue is empty after process of {@link TransactionProcessor#signAndBroadcast()}
+     */
+    public static final String TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_EMPTY = "Deserialization of return value expected result, but was empty.";
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializeReturnValueError.java b/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializeReturnValueError.java
new file mode 100644
index 0000000..9ed5464
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializeReturnValueError.java
@@ -0,0 +1,26 @@
+package one.block.eosiojava.error.serializationProvider;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Error class is used when there is an exception while attempting to call deserializeAbi() of
+ * Serialization Provider
+ */
+public class DeserializeReturnValueError extends SerializationProviderError {
+
+    public DeserializeReturnValueError() {
+    }
+
+    public DeserializeReturnValueError(@NotNull String message) {
+        super(message);
+    }
+
+    public DeserializeReturnValueError(@NotNull String message,
+            @NotNull Exception exception) {
+        super(message, exception);
+    }
+
+    public DeserializeReturnValueError(@NotNull Exception exception) {
+        super(exception);
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
index b205734..d980f50 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
@@ -34,9 +34,5 @@ public ProcessedTransactionResponse getProcessed() {
         return transactionResponse;
     }
 
-    public List<ActionTrace> getActionTraces() { return transactionResponse != null ? transactionResponse.getActionTraces() : new ArrayList<ActionTrace>(); }
-
-    public void setActionTraces(List<ActionTrace> actionTraces) {
-        // reset
-    }
+    public List<ActionTrace> getActionTraces() { return transactionResponse != null ? transactionResponse.getActionTraces() : new ArrayList<>(); }
 }
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index b4c4521..ca0479b 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1,7 +1,6 @@
 package one.block.eosiojava.session;
 
 import com.google.common.base.Strings;
-import com.google.gson.Gson;
 import java.io.IOException;
 import java.io.Serializable;
 import java.math.BigInteger;
@@ -15,6 +14,7 @@
 import one.block.eosiojava.error.rpcProvider.GetRequiredKeysRpcError;
 import one.block.eosiojava.error.rpcProvider.PushTransactionRpcError;
 import one.block.eosiojava.error.serializationProvider.DeserializeError;
+import one.block.eosiojava.error.serializationProvider.DeserializeReturnValueError;
 import one.block.eosiojava.error.serializationProvider.DeserializeTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
@@ -195,10 +195,6 @@ public class TransactionProcessor {
      */
     private boolean isTransactionModificationAllowed;
 
-    public IABIProvider getAbiProvider() {
-        return this.abiProvider;
-    }
-
     /**
      * Constructor with all provider references from {@link TransactionSession}
      * @param serializationProvider the serialization provider.
@@ -511,19 +507,19 @@ public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroad
         PushTransactionRequest pushTransactionRequest = new PushTransactionRequest(this.signatures,
                 0, "", this.serializedTransaction);
         try {
-            return getPushTransactionResponse(this.pushTransaction(pushTransactionRequest));
+            return formatPushTransactionResponse(this.pushTransaction(pushTransactionRequest));
         } catch (TransactionPushTransactionError transactionPushTransactionError) {
             throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
         }
     }
 
-    private PushTransactionResponse getPushTransactionResponse(PushTransactionResponse response) {
+    private PushTransactionResponse formatPushTransactionResponse(PushTransactionResponse response) {
         List<ActionTrace> actionTraces = response.getActionTraces();
         for (ActionTrace actionTrace : actionTraces) {
             try {
                 AbiEosSerializationObject deserializationObject = deserializeActionTraceReturnValue(actionTrace, chainId, abiProvider);
                 actionTrace.setDeserializedReturnValue(deserializationObject.getJson());
-            } catch (TransactionCreateSignatureRequestError transactionCreateSignatureRequestError) {
+            } catch (DeserializeReturnValueError transactionCreateSignatureRequestError) {
                 transactionCreateSignatureRequestError.printStackTrace();
             }
         }
@@ -909,13 +905,13 @@ private AbiEosSerializationObject serializeAction(Action action, String chainId,
     }
 
     private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace actionTrace, String chainId, IABIProvider abiProvider)
-            throws TransactionCreateSignatureRequestError {
+            throws DeserializeReturnValueError {
         String actionAbiJSON;
         try {
             actionAbiJSON = abiProvider
                     .getAbi(chainId, new EOSIOName(actionTrace.getAccountName()));
         } catch (GetAbiError getAbiError) {
-            throw new TransactionCreateSignatureRequestAbiError(
+            throw new DeserializeReturnValueError(
                     String.format(ErrorConstants.TRANSACTION_PROCESSOR_GET_ABI_ERROR,
                             actionTrace.getAccountName()), getAbiError);
         }
@@ -933,13 +929,13 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
         try {
             this.serializationProvider.deserialize(actionAbiEosSerializationObject);
             if (actionAbiEosSerializationObject.getJson().isEmpty()) {
-                throw new TransactionCreateSignatureRequestSerializationError(
-                        ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_WORKED_BUT_EMPTY_RESULT);
+                throw new DeserializeReturnValueError(
+                        ErrorConstants.TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_EMPTY);
             }
-        } catch (TransactionCreateSignatureRequestSerializationError | DeserializeError serializeError) {
-            throw new TransactionCreateSignatureRequestSerializationError(
-                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_ERROR,
-                            actionTrace.getAccountName()), serializeError);
+        } catch (DeserializeError | DeserializeReturnValueError deserializeError) {
+            throw new DeserializeReturnValueError(
+                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_ERROR,
+                            actionTrace.getAccountName()), deserializeError);
         }
 
         return actionAbiEosSerializationObject;

From 1b73c861c405de7c91177920c29895d077ad4462 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 16:27:43 -0400
Subject: [PATCH 10/45] Add tests and refactor

---
 .../eosiojava/models/abiProvider/Abi.java     |   2 +-
 .../session/TransactionProcessor.java         |   2 +-
 .../one/block/eosiojava/AbiModelTest.java     | 354 ++++++++++++++++++
 .../one/block/eosiojava/RpcModelTest.java     |  60 ++-
 4 files changed, 413 insertions(+), 5 deletions(-)
 create mode 100644 eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
index 87d0fb7..aa8c228 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -32,7 +32,7 @@ public class Abi {
     @SerializedName("action_results")
     private List<ActionResult> actionResults;
 
-    public String getActionReturnType(String actionName) {
+    public String getActionReturnTypeByActionName(String actionName) {
         if (this.actionResults.isEmpty()) {
             return null;
         }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index ca0479b..65c8cb3 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -917,7 +917,7 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
         }
 
         Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
-        String returnType = abi.getActionReturnType(actionTrace.getActionName());
+        String returnType = abi.getActionReturnTypeByActionName(actionTrace.getActionName());
 
         AbiEosSerializationObject actionAbiEosSerializationObject = new AbiEosSerializationObject(
                 actionTrace.getAccountName(), actionTrace.getActionName(),
diff --git a/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
new file mode 100644
index 0000000..a47ce25
--- /dev/null
+++ b/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
@@ -0,0 +1,354 @@
+package one.block.eosiojava;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.math.BigInteger;
+import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
+import one.block.eosiojava.models.rpcProvider.request.GetRawAbiRequest;
+import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
+import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
+import one.block.eosiojava.models.rpcProvider.response.GetBlockResponse;
+import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
+import one.block.eosiojava.models.rpcProvider.response.GetRawAbiResponse;
+import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
+import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
+import org.bouncycastle.util.encoders.Base64;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * Test JSON serialization/Deserialization for All models in RPC Provider
+ */
+public class AbiModelTest {
+
+    private Gson gson;
+
+    @Before
+    public void setUpGSON() {
+        this.gson = new GsonBuilder()
+                .setDateFormat("yyyy-MM-dd'T'hh:mm:ss zzz")
+                .disableHtmlEscaping().create();
+    }
+
+    //region Request Models
+
+    /**
+     * Test GetBlockRequest model
+     */
+    @Test
+    public void GetBlockRequestTest() {
+        String jsonContent = "{"
+                + "\"block_num_or_id\":\"20430951\""
+                + "}";
+
+        // FromJSON test
+        GetBlockRequest getBlockRequest = this.gson.fromJson(jsonContent, GetBlockRequest.class);
+        assertNotNull(getBlockRequest);
+        assertEquals("20430951", getBlockRequest.getBlockNumOrId());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(getBlockRequest);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        assertEquals(jsonContent, toJSON);
+    }
+
+    /**
+     * Test GetRawAbiRequest
+     */
+    @Test
+    public void GetRawAbiRequestTest() {
+        String jsonContent = "{"
+                + "\"account_name\":\"eosio.token\""
+                + "}";
+
+        // FromJSON test
+        GetRawAbiRequest getRawAbiRequest = this.gson.fromJson(jsonContent, GetRawAbiRequest.class);
+        assertNotNull(getRawAbiRequest);
+        assertEquals("eosio.token", getRawAbiRequest.getAccountName());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(getRawAbiRequest);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        assertEquals(jsonContent, toJSON);
+    }
+
+    /**
+     * Test GetRequiredKeysRequest
+     */
+    @Test
+    public void GetRequiredKeysRequestTest() {
+        String jsonContent = "{\"available_keys\":[\"dummy key\"],\"transaction\":{\"expiration\":\"2019-01-25T22:13:55\",\"ref_block_num\":123456,\"ref_block_prefix\":123456789,\"max_net_usage_words\":0,\"max_cpu_usage_ms\":0,\"delay_sec\":0,\"context_free_actions\":[],\"actions\":[{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":\"hex data\"}],\"transaction_extensions\":[]}}";
+
+        // FromJSON test
+        GetRequiredKeysRequest getRequiredKeysRequest = this.gson
+                .fromJson(jsonContent, GetRequiredKeysRequest.class);
+
+        // Checking available key field
+        assertNotNull(getRequiredKeysRequest);
+        assertNotNull(getRequiredKeysRequest.getAvailableKeys());
+        assertEquals(1, getRequiredKeysRequest.getAvailableKeys().size());
+        assertEquals("dummy key",
+                getRequiredKeysRequest.getAvailableKeys().get(0));
+
+        // Checking transaction field
+        assertNotNull(getRequiredKeysRequest.getTransaction());
+        assertEquals("2019-01-25T22:13:55",
+                getRequiredKeysRequest.getTransaction().getExpiration());
+        assertEquals(BigInteger.valueOf(123456),
+                getRequiredKeysRequest.getTransaction().getRefBlockNum());
+        assertEquals(BigInteger.valueOf(123456789),
+                getRequiredKeysRequest.getTransaction().getRefBlockPrefix());
+        assertEquals(BigInteger.valueOf(0),
+                getRequiredKeysRequest.getTransaction().getMaxNetUsageWords());
+        assertEquals(BigInteger.valueOf(0),
+                getRequiredKeysRequest.getTransaction().getMaxCpuUsageMs());
+        assertEquals(BigInteger.valueOf(0), getRequiredKeysRequest.getTransaction().getDelaySec());
+        assertNotNull(getRequiredKeysRequest.getTransaction().getContextFreeActions());
+        assertEquals(0, getRequiredKeysRequest.getTransaction().getContextFreeActions().size());
+
+        // Checking actions field inside transaction
+        assertNotNull(getRequiredKeysRequest.getTransaction().getActions());
+        assertEquals(1, getRequiredKeysRequest.getTransaction().getActions().size());
+        assertEquals("eosio.token",
+                getRequiredKeysRequest.getTransaction().getActions().get(0).getAccount());
+        assertEquals("transfer",
+                getRequiredKeysRequest.getTransaction().getActions().get(0).getName());
+
+        // Checking authorizations field inside action
+        assertNotNull(
+                getRequiredKeysRequest.getTransaction().getActions().get(0).getAuthorization());
+        assertEquals(1,
+                getRequiredKeysRequest.getTransaction().getActions().get(0).getAuthorization()
+                        .size());
+        assertEquals("dummy_account",
+                getRequiredKeysRequest.getTransaction().getActions().get(0).getAuthorization()
+                        .get(0).getActor());
+        assertEquals("active",
+                getRequiredKeysRequest.getTransaction().getActions().get(0).getAuthorization()
+                        .get(0).getPermission());
+
+        assertEquals(
+                "hex data",
+                getRequiredKeysRequest.getTransaction().getActions().get(0).getData());
+
+        assertNotNull(getRequiredKeysRequest.getTransaction().getTransactionExtensions());
+        assertEquals(0, getRequiredKeysRequest.getTransaction().getTransactionExtensions().size());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(getRequiredKeysRequest);
+
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        assertEquals(jsonContent, toJSON);
+    }
+
+    /**
+     * Test PushTransactionRequest
+     */
+    @Test
+    public void PushTransactionRequestTest() {
+        String jsonContent = "{\"signatures\":[\"signature in EOS format\"],\"compression\":0,\"packed_context_free_data\":\"\",\"packed_trx\":\"packed transaction\"}";
+
+        // FromJSON test
+        PushTransactionRequest pushTransactionRequest = this.gson
+                .fromJson(jsonContent, PushTransactionRequest.class);
+        assertNotNull(pushTransactionRequest);
+        assertEquals(0, pushTransactionRequest.getCompression());
+        assertEquals(
+                "packed transaction",
+                pushTransactionRequest.getPackTrx());
+        assertEquals("", pushTransactionRequest.getPackagedContextFreeData());
+        assertNotNull(pushTransactionRequest.getSignatures());
+        assertEquals(1, pushTransactionRequest.getSignatures().size());
+        assertEquals(
+                "signature in EOS format",
+                pushTransactionRequest.getSignatures().get(0));
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(pushTransactionRequest);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        assertEquals(jsonContent, toJSON);
+    }
+
+    //endregion
+
+    //region Response models
+
+    /**
+     * Test GetBlockResponse
+     */
+    @Test
+    public void GetBlockResponseTest() {
+        //region bigString
+        String jsonContent = "{\"timestamp\":\"2019-03-25T06:08:05.000\",\"producer\":\"eosnewyorkio\",\"confirmed\":0,\"previous\":\"02f217198bda8b9f88b0d7bd5450ce39c90352a01f896cdb64b8a4c88a9e7f3c\",\"transaction_mroot\":\"405a5daeb4510dc12cb4d90890b44a956178382fe4d80c22a7f80446e5a32d75\",\"action_mroot\":\"d83920d9e596ffc478480ede9a18a7bd8289a2edabc9c39396d1d5f9a2e0a184\",\"schedule_version\":737,\"new_producers\":null,\"header_extensions\":[],\"producer_signature\":\"SIG_K1_KZ3SwH4yW2oYaiRzRy8uVxV9QxZsZYp39hY7DWDjFqLtBp9QjFgKizzAgRgp5y5GkYyhci59SwSVNcGasiW6J6tVZ1zMZx\",\"transactions\":[{\"status\":\"executed\",\"cpu_usage_us\":123,\"net_usage_words\":0,\"trx\":\"dff93d1c318b5a71c85eab9473f2fbc20ddda98c686ac34dc7b28cf6f2e7d531\"},{\"status\":\"executed\",\"cpu_usage_us\":1526,\"net_usage_words\":28,\"trx\":{\"id\":\"0f7719461a2205279a86e30cd4f4eae2d4f5586301f9d00aac8ac59230d3ebe2\",\"signatures\":[\"SIG_K1_K5hVUFB4iVNs8WcvcvMpioM7RBECDRDmAnGN6h9qJvNABWvXn3fzfEkjHhnUL32oxy7T2317hgMUvjGnM56jQPcuLs9utg\"],\"compression\":\"none\",\"packed_context_free_data\":\"\",\"context_free_data\":[],\"packed_trx\":\"7f70985ccb15550e81720000000001309d4c462197b23a0000004044a3b6ba015035bd4c2197b23a00c055fb2aac904b8201f1e7c23e9d45306ebf9f955b311f5898c763a4a680a4852cc8d957c20a28b8ec00204943b014ddc858c7ed40f5fa2f4fc09bda22a76616ffc0f9ba212130fb972f573ce08e9639d6af11366160a713cbec41453683f70c3774a62a31d781d054ae69ceb96bdf5bf59ff13b98d59c8f4d9402cc1f036abc97797d9d92da09a1ac708900\",\"transaction\":{\"expiration\":\"2019-03-25T06:09:03\",\"ref_block_num\":5579,\"ref_block_prefix\":1921060437,\"max_net_usage_words\":0,\"max_cpu_usage_ms\":0,\"delay_sec\":0,\"context_free_actions\":[],\"actions\":[{\"account\":\"betdiceadmin\",\"name\":\"reveal2\",\"authorization\":[{\"actor\":\"betdicegroup\",\"permission\":\"diceserver\"}],\"data\":{\"hashSeedHash\":\"f1e7c23e9d45306ebf9f955b311f5898c763a4a680a4852cc8d957c20a28b8ec\",\"signature\":\"SIG_K1_KeLFYguv3Su8SnnkGZ6jzm27NQ7Ca9nS3c4TZX9UMGmfE4N8jKKgSfK2aZpUy7Yp12R8QKA8opj9hXec76fkCtK6JncKcb\",\"numberHash\":\"ceb96bdf5bf59ff13b98d59c8f4d9402cc1f036abc97797d9d92da09a1ac7089\"},\"hex_data\":\"f1e7c23e9d45306ebf9f955b311f5898c763a4a680a4852cc8d957c20a28b8ec00204943b014ddc858c7ed40f5fa2f4fc09bda22a76616ffc0f9ba212130fb972f573ce08e9639d6af11366160a713cbec41453683f70c3774a62a31d781d054ae69ceb96bdf5bf59ff13b98d59c8f4d9402cc1f036abc97797d9d92da09a1ac7089\"}],\"transaction_extensions\":[]}}}],\"block_extensions\":[],\"id\":\"02f2171af934752f7b39943ddfdfcd55341b02b1818161ae94399ab911052e0a\",\"block_num\":49420058,\"ref_block_prefix\":1033124219}";
+        //endregion
+
+        // FromJSON test
+        GetBlockResponse getBlockRequest = this.gson.fromJson(jsonContent, GetBlockResponse.class);
+        assertNotNull(getBlockRequest);
+
+        assertEquals("2019-03-25T06:08:05.000", getBlockRequest.getTimestamp());
+        assertEquals("eosnewyorkio", getBlockRequest.getProducer());
+        assertEquals(BigInteger.valueOf(0), getBlockRequest.getConfirmed());
+        assertEquals("02f217198bda8b9f88b0d7bd5450ce39c90352a01f896cdb64b8a4c88a9e7f3c",
+                getBlockRequest.getPrevious());
+        assertEquals("405a5daeb4510dc12cb4d90890b44a956178382fe4d80c22a7f80446e5a32d75",
+                getBlockRequest.getTransactionMroot());
+        assertEquals("d83920d9e596ffc478480ede9a18a7bd8289a2edabc9c39396d1d5f9a2e0a184",
+                getBlockRequest.getActionMroot());
+        assertEquals(BigInteger.valueOf(737), getBlockRequest.getScheduleVersion());
+        assertNull(getBlockRequest.getNewProducers());
+        assertEquals(0, getBlockRequest.getHeaderExtensions().size());
+        assertEquals(
+                "SIG_K1_KZ3SwH4yW2oYaiRzRy8uVxV9QxZsZYp39hY7DWDjFqLtBp9QjFgKizzAgRgp5y5GkYyhci59SwSVNcGasiW6J6tVZ1zMZx",
+                getBlockRequest.getProducerSignature());
+        assertEquals(2, getBlockRequest.getTransactions().size());
+        assertEquals("dff93d1c318b5a71c85eab9473f2fbc20ddda98c686ac34dc7b28cf6f2e7d531",
+                getBlockRequest.getTransactions().get(0).get("trx"));
+        assertEquals(0, getBlockRequest.getBlockExtensions().size());
+        assertEquals("02f2171af934752f7b39943ddfdfcd55341b02b1818161ae94399ab911052e0a",
+                getBlockRequest.getId());
+        assertEquals(BigInteger.valueOf(49420058), getBlockRequest.getBlockNum());
+        assertEquals(BigInteger.valueOf(1033124219), getBlockRequest.getRefBlockPrefix());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(getBlockRequest);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        // This test does not do verify toJSON with original json content because they are generated different values due to deep level model which is not defined in the source code.
+    }
+
+    /**
+     * Test GetRawAbiResponse
+     */
+    @Test
+    public void GetRawAbiResponseTest() {
+        String jsonContent = "{\"account_name\":\"eosio.token\",\"code_hash\":\"01bd013c4f8be142b9cadf511f007c6ac201c068d529f01ed5661803c575befa\",\"abi_hash\":\"f8f677996a8ca68388bc41cf55e727949c161b624a47e497e3b2f71a0e635dad\",\"abi\":\"DmVvc2lvOjphYmkvMS4wAQxhY2NvdW50X25hbWUEbmFtZQcIdHJhbnNmZXIABARmcm9tDGFjY291bnRfbmFtZQJ0bwxhY2NvdW50X25hbWUIcXVhbnRpdHkFYXNzZXQEbWVtbwZzdHJpbmcGY3JlYXRlAAIGaXNzdWVyDGFjY291bnRfbmFtZQ5tYXhpbXVtX3N1cHBseQVhc3NldAVpc3N1ZQADAnRvDGFjY291bnRfbmFtZQhxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwZyZXRpcmUAAghxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwVjbG9zZQACBW93bmVyDGFjY291bnRfbmFtZQZzeW1ib2wGc3ltYm9sB2FjY291bnQAAQdiYWxhbmNlBWFzc2V0DmN1cnJlbmN5X3N0YXRzAAMGc3VwcGx5BWFzc2V0Cm1heF9zdXBwbHkFYXNzZXQGaXNzdWVyDGFjY291bnRfbmFtZQUAAABXLTzNzQh0cmFuc2ZlcucFIyMgVHJhbnNmZXIgVGVybXMgJiBDb25kaXRpb25zCgpJLCB7e2Zyb219fSwgY2VydGlmeSB0aGUgZm9sbG93aW5nIHRvIGJlIHRydWUgdG8gdGhlIGJlc3Qgb2YgbXkga25vd2xlZGdlOgoKMS4gSSBjZXJ0aWZ5IHRoYXQge3txdWFudGl0eX19IGlzIG5vdCB0aGUgcHJvY2VlZHMgb2YgZnJhdWR1bGVudCBvciB2aW9sZW50IGFjdGl2aXRpZXMuCjIuIEkgY2VydGlmeSB0aGF0LCB0byB0aGUgYmVzdCBvZiBteSBrbm93bGVkZ2UsIHt7dG99fSBpcyBub3Qgc3VwcG9ydGluZyBpbml0aWF0aW9uIG9mIHZpb2xlbmNlIGFnYWluc3Qgb3RoZXJzLgozLiBJIGhhdmUgZGlzY2xvc2VkIGFueSBjb250cmFjdHVhbCB0ZXJtcyAmIGNvbmRpdGlvbnMgd2l0aCByZXNwZWN0IHRvIHt7cXVhbnRpdHl9fSB0byB7e3RvfX0uCgpJIHVuZGVyc3RhbmQgdGhhdCBmdW5kcyB0cmFuc2ZlcnMgYXJlIG5vdCByZXZlcnNpYmxlIGFmdGVyIHRoZSB7e3RyYW5zYWN0aW9uLmRlbGF5fX0gc2Vjb25kcyBvciBvdGhlciBkZWxheSBhcyBjb25maWd1cmVkIGJ5IHt7ZnJvbX19J3MgcGVybWlzc2lvbnMuCgpJZiB0aGlzIGFjdGlvbiBmYWlscyB0byBiZSBpcnJldmVyc2libHkgY29uZmlybWVkIGFmdGVyIHJlY2VpdmluZyBnb29kcyBvciBzZXJ2aWNlcyBmcm9tICd7e3RvfX0nLCBJIGFncmVlIHRvIGVpdGhlciByZXR1cm4gdGhlIGdvb2RzIG9yIHNlcnZpY2VzIG9yIHJlc2VuZCB7e3F1YW50aXR5fX0gaW4gYSB0aW1lbHkgbWFubmVyLgoAAAAAAKUxdgVpc3N1ZQAAAAAAqGzURQZjcmVhdGUAAAAAAKjrsroGcmV0aXJlAAAAAAAAhWlEBWNsb3NlAAIAAAA4T00RMgNpNjQBCGN1cnJlbmN5AQZ1aW50NjQHYWNjb3VudAAAAAAAkE3GA2k2NAEIY3VycmVuY3kBBnVpbnQ2NA5jdXJyZW5jeV9zdGF0cwAAAA===\"}";
+
+        // FromJSON test
+        GetRawAbiResponse getRawAbiResponse = this.gson
+                .fromJson(jsonContent, GetRawAbiResponse.class);
+        assertNotNull(getRawAbiResponse);
+        assertEquals("eosio.token", getRawAbiResponse.getAccountName());
+        assertEquals("01bd013c4f8be142b9cadf511f007c6ac201c068d529f01ed5661803c575befa",
+                getRawAbiResponse.getCodeHash());
+        assertEquals("f8f677996a8ca68388bc41cf55e727949c161b624a47e497e3b2f71a0e635dad",
+                getRawAbiResponse.getAbiHash());
+        assertEquals(
+                "DmVvc2lvOjphYmkvMS4wAQxhY2NvdW50X25hbWUEbmFtZQcIdHJhbnNmZXIABARmcm9tDGFjY291bnRfbmFtZQJ0bwxhY2NvdW50X25hbWUIcXVhbnRpdHkFYXNzZXQEbWVtbwZzdHJpbmcGY3JlYXRlAAIGaXNzdWVyDGFjY291bnRfbmFtZQ5tYXhpbXVtX3N1cHBseQVhc3NldAVpc3N1ZQADAnRvDGFjY291bnRfbmFtZQhxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwZyZXRpcmUAAghxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwVjbG9zZQACBW93bmVyDGFjY291bnRfbmFtZQZzeW1ib2wGc3ltYm9sB2FjY291bnQAAQdiYWxhbmNlBWFzc2V0DmN1cnJlbmN5X3N0YXRzAAMGc3VwcGx5BWFzc2V0Cm1heF9zdXBwbHkFYXNzZXQGaXNzdWVyDGFjY291bnRfbmFtZQUAAABXLTzNzQh0cmFuc2ZlcucFIyMgVHJhbnNmZXIgVGVybXMgJiBDb25kaXRpb25zCgpJLCB7e2Zyb219fSwgY2VydGlmeSB0aGUgZm9sbG93aW5nIHRvIGJlIHRydWUgdG8gdGhlIGJlc3Qgb2YgbXkga25vd2xlZGdlOgoKMS4gSSBjZXJ0aWZ5IHRoYXQge3txdWFudGl0eX19IGlzIG5vdCB0aGUgcHJvY2VlZHMgb2YgZnJhdWR1bGVudCBvciB2aW9sZW50IGFjdGl2aXRpZXMuCjIuIEkgY2VydGlmeSB0aGF0LCB0byB0aGUgYmVzdCBvZiBteSBrbm93bGVkZ2UsIHt7dG99fSBpcyBub3Qgc3VwcG9ydGluZyBpbml0aWF0aW9uIG9mIHZpb2xlbmNlIGFnYWluc3Qgb3RoZXJzLgozLiBJIGhhdmUgZGlzY2xvc2VkIGFueSBjb250cmFjdHVhbCB0ZXJtcyAmIGNvbmRpdGlvbnMgd2l0aCByZXNwZWN0IHRvIHt7cXVhbnRpdHl9fSB0byB7e3RvfX0uCgpJIHVuZGVyc3RhbmQgdGhhdCBmdW5kcyB0cmFuc2ZlcnMgYXJlIG5vdCByZXZlcnNpYmxlIGFmdGVyIHRoZSB7e3RyYW5zYWN0aW9uLmRlbGF5fX0gc2Vjb25kcyBvciBvdGhlciBkZWxheSBhcyBjb25maWd1cmVkIGJ5IHt7ZnJvbX19J3MgcGVybWlzc2lvbnMuCgpJZiB0aGlzIGFjdGlvbiBmYWlscyB0byBiZSBpcnJldmVyc2libHkgY29uZmlybWVkIGFmdGVyIHJlY2VpdmluZyBnb29kcyBvciBzZXJ2aWNlcyBmcm9tICd7e3RvfX0nLCBJIGFncmVlIHRvIGVpdGhlciByZXR1cm4gdGhlIGdvb2RzIG9yIHNlcnZpY2VzIG9yIHJlc2VuZCB7e3F1YW50aXR5fX0gaW4gYSB0aW1lbHkgbWFubmVyLgoAAAAAAKUxdgVpc3N1ZQAAAAAAqGzURQZjcmVhdGUAAAAAAKjrsroGcmV0aXJlAAAAAAAAhWlEBWNsb3NlAAIAAAA4T00RMgNpNjQBCGN1cnJlbmN5AQZ1aW50NjQHYWNjb3VudAAAAAAAkE3GA2k2NAEIY3VycmVuY3kBBnVpbnQ2NA5jdXJyZW5jeV9zdGF0cwAAAA===",
+                getRawAbiResponse.getAbi());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(getRawAbiResponse);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        assertEquals(jsonContent, toJSON);
+    }
+
+    /**
+     * Test GetRequiredKeysResponse
+     */
+    @Test
+    public void GetRequiredKeysResponseTest() {
+        String jsonContent = "{\"required_keys\":[\"dummy_key\"]}";
+
+        // FromJSON test
+        GetRequiredKeysResponse getRequiredKeysResponse = this.gson
+                .fromJson(jsonContent, GetRequiredKeysResponse.class);
+        assertNotNull(getRequiredKeysResponse);
+        assertNotNull(getRequiredKeysResponse.getRequiredKeys());
+        assertEquals(1, getRequiredKeysResponse.getRequiredKeys().size());
+        assertEquals("dummy_key", getRequiredKeysResponse.getRequiredKeys().get(0));
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(getRequiredKeysResponse);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        assertEquals(jsonContent, toJSON);
+    }
+
+    /**
+     * Test PushTransactionResponse
+     */
+    @Test
+    public void PushTransactionResponseTest() {
+        String jsonContent = "{\"transaction_id\":\"dump_transaction_id\",\"processed\":{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[]},{\"receipt\":{\"receiver\":\"eosio.token\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[{\"receipt\":{\"receiver\":\"dummy_account\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[]},{\"receipt\":{\"receiver\":\"dummy_account_2\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",111]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[]}]}]}}";
+
+        // FromJSON test
+        PushTransactionResponse pushTransactionResponse = this.gson
+                .fromJson(jsonContent, PushTransactionResponse.class);
+        assertNotNull(pushTransactionResponse);
+        assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
+        assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(pushTransactionResponse);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        // This test does not do verify toJSON with original json content because they are generated different values due to deep level model which is not defined in the source code.
+    }
+
+    @Test
+    public void PushTransactionResponseWithReturnValuesTest() {
+        String jsonContent = "{\"transaction_id\":\"dump_transaction_id\",\"processed\":{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"eosio.token\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[{\"receipt\":{\"receiver\":\"dummy_account\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"dummy_account_2\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",111]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}]}]}}";
+
+        // FromJSON test
+        PushTransactionResponse pushTransactionResponse = this.gson
+                .fromJson(jsonContent, PushTransactionResponse.class);
+        Base64.decode("000000000090b1ca");
+        Base64.decode("000000000090b1ca");
+        assertNotNull(pushTransactionResponse);
+        assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
+        assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(pushTransactionResponse);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+    }
+
+    /**
+     * Test GetInfoResponse
+     */
+    @Test
+    public void GetInfoResponseTest() {
+        String jsonContent = "{\"server_version\":\"1a14e9cd\",\"chain_id\":\"aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906\",\"head_block_num\":49675371,\"last_irreversible_block_num\":49675040,\"last_irreversible_block_id\":\"02f5fb2074e613769d56079fefbaa46b8fbfa813f4da1395043e3358ccabbb19\",\"head_block_id\":\"02f5fc6b3a3921573eacbd43615af133b5b09071a74bece17f7f9807db3251aa\",\"head_block_time\":\"2019-03-26T17:36:45.000\",\"head_block_producer\":\"eoscannonchn\",\"virtual_block_cpu_limit\":200000000,\"virtual_block_net_limit\":1048576000,\"block_cpu_limit\":185578,\"block_net_limit\":1046440,\"server_version_string\":\"v1.6.1\"}";
+
+        // FromJSON test
+        GetInfoResponse getInfoResponse = this.gson
+                .fromJson(jsonContent, GetInfoResponse.class);
+        assertNotNull(getInfoResponse);
+        assertEquals("1a14e9cd", getInfoResponse.getServerVersion());
+        assertEquals("aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906",
+                getInfoResponse.getChainId());
+        assertEquals(BigInteger.valueOf(49675371), getInfoResponse.getHeadBlockNum());
+        assertEquals(BigInteger.valueOf(49675040), getInfoResponse.getLastIrreversibleBlockNum());
+        assertEquals("02f5fb2074e613769d56079fefbaa46b8fbfa813f4da1395043e3358ccabbb19",
+                getInfoResponse.getLastIrreversibleBlockId());
+        assertEquals("02f5fc6b3a3921573eacbd43615af133b5b09071a74bece17f7f9807db3251aa",
+                getInfoResponse.getHeadBlockId());
+        assertEquals("2019-03-26T17:36:45.000", getInfoResponse.getHeadBlockTime());
+        assertEquals("eoscannonchn", getInfoResponse.getHeadBlockProducer());
+        assertEquals(BigInteger.valueOf(200000000), getInfoResponse.getVirtualBlockCpuLimit());
+        assertEquals(BigInteger.valueOf(1048576000), getInfoResponse.getVirtualBlockNetLimit());
+        assertEquals(BigInteger.valueOf(185578), getInfoResponse.getBlockCpuLimit());
+        assertEquals(BigInteger.valueOf(1046440), getInfoResponse.getBlockNetLimit());
+        assertEquals("v1.6.1", getInfoResponse.getServerVersionString());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(getInfoResponse);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        assertEquals(jsonContent, toJSON);
+    }
+
+    //endregion
+}
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index fc8d029..b817551 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
@@ -12,10 +12,12 @@
 import one.block.eosiojava.models.rpcProvider.request.GetRawAbiRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
+import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.rpcProvider.response.GetBlockResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRawAbiResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
+import one.block.eosiojava.models.rpcProvider.response.ProcessedTransactionResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
 import org.bouncycastle.util.encoders.Base64;
 import org.junit.Before;
@@ -288,6 +290,7 @@ public void PushTransactionResponseTest() {
         assertNotNull(pushTransactionResponse);
         assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
         assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
+        assertEquals(2, pushTransactionResponse.getActionTraces().size());
 
         // ToJSON test
         String toJSON = this.gson.toJson(pushTransactionResponse);
@@ -298,16 +301,19 @@ public void PushTransactionResponseTest() {
 
     @Test
     public void PushTransactionResponseWithReturnValuesTest() {
-        String jsonContent = "{\"transaction_id\":\"dump_transaction_id\",\"processed\":{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"eosio.token\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[{\"receipt\":{\"receiver\":\"dummy_account\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"dummy_account_2\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",111]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}]}]}}";
+        String jsonContent = "{\"transaction_id\":\"dump_transaction_id\",\"processed\":{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"0000000000408608\"}]}}";
 
         // FromJSON test
         PushTransactionResponse pushTransactionResponse = this.gson
                 .fromJson(jsonContent, PushTransactionResponse.class);
-        Base64.decode("000000000090b1ca");
-        Base64.decode("000000000090b1ca");
         assertNotNull(pushTransactionResponse);
         assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
         assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
+        assertEquals(2, pushTransactionResponse.getActionTraces().size());
+        assertEquals("000000000090b1ca", pushTransactionResponse.getActionTraces().get(0).getHexReturnValue());
+        assertEquals(null, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+        assertEquals("0000000000408608", pushTransactionResponse.getActionTraces().get(1).getHexReturnValue());
+        assertEquals(null, pushTransactionResponse.getActionTraces().get(1).getDeserializedReturnValue());
 
         // ToJSON test
         String toJSON = this.gson.toJson(pushTransactionResponse);
@@ -350,5 +356,53 @@ public void GetInfoResponseTest() {
         assertEquals(jsonContent, toJSON);
     }
 
+    /**
+     * Test ProcessedTransactionResponse
+     */
+    @Test
+    public void ProcessedTransactionResponseTest() {
+        String jsonContent = "{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"0000000000408608\"}]}";
+
+        // FromJSON test
+        ProcessedTransactionResponse processedTransactionResponse = this.gson
+                .fromJson(jsonContent, ProcessedTransactionResponse.class);
+        assertNotNull(processedTransactionResponse);
+        assertEquals("dump_id", processedTransactionResponse.getId());
+        assertEquals(2, processedTransactionResponse.getActionTraces().size());
+        assertEquals("000000000090b1ca", processedTransactionResponse.getActionTraces().get(0).getHexReturnValue());
+        assertEquals("0000000000408608", processedTransactionResponse.getActionTraces().get(1).getHexReturnValue());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(processedTransactionResponse);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+    }
+
+    /**
+     * Test ActionTrace
+     */
+    @Test
+    public void ActionTraceTest() {
+        String jsonContent = "{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}";
+        String deserializedReturnValue = "test";
+
+        // FromJSON test
+        ActionTrace actionTrace = this.gson
+                .fromJson(jsonContent, ActionTrace.class);
+        actionTrace.setDeserializedReturnValue(deserializedReturnValue);
+
+        assertNotNull(actionTrace);
+        assertEquals("000000000090b1ca", actionTrace.getHexReturnValue());
+        assertEquals(deserializedReturnValue, actionTrace.getDeserializedReturnValue());
+        assertEquals("eosio.assert", actionTrace.getAccountName());
+        assertEquals("require", actionTrace.getActionName());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(actionTrace);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+    }
+
+
     //endregion
 }

From a74f0434c618cbc1c9ee201feed86ed6f71d61af Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 16:29:36 -0400
Subject: [PATCH 11/45] Error message rename

---
 .../main/java/one/block/eosiojava/error/ErrorConstants.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
index 3e6d9ea..ca03f0f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
@@ -326,12 +326,12 @@ private ErrorConstants(){
     public static final String TRANSACTION_PROCESSOR_SIGN_BROADCAST_SIGN_EMPTY = "Can't call sign and broadcast because Signature is empty. Make sure of calling sign before calling sign and broadcast.";
 
     /**
-     * Error message get thrown if return value's deserialization process gets an error by calling {@link ISerializationProvider#deserialize(AbiEosSerializationObject)}}
+     * Error message get thrown if return value's deserialization process gets an error after calling {@link ISerializationProvider#deserialize(AbiEosSerializationObject)}
      */
     public static final String TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_ERROR = "Error happened on deserializing return value [%s]";
 
     /**
-     * Error message thrown if deserializeActionTraceReturnValue is empty after process of {@link TransactionProcessor#signAndBroadcast()}
+     * Error message thrown if return value's deserialization process is empty after calling {@link ISerializationProvider#deserialize(AbiEosSerializationObject)}
      */
     public static final String TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_EMPTY = "Deserialization of return value expected result, but was empty.";
 }

From 5b44493fcc134dda10b3623f787a458dd00c66b1 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 29 Jun 2020 18:19:52 -0400
Subject: [PATCH 12/45] Add comments and update tests

---
 .../DeserializeReturnValueError.java          |   2 +-
 .../eosiojava/models/abiProvider/Abi.java     |  85 +++++
 .../models/abiProvider/ActionResult.java      |  32 +-
 .../rpcProvider/response/ActionTrace.java     | 208 +++++++++--
 .../ProcessedTransactionResponse.java         | 109 +++++-
 .../response/PushTransactionResponse.java     |  13 +
 .../session/TransactionProcessor.java         |   2 +-
 .../one/block/eosiojava/AbiModelTest.java     | 339 ++----------------
 .../one/block/eosiojava/RpcModelTest.java     |  41 ++-
 9 files changed, 488 insertions(+), 343 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializeReturnValueError.java b/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializeReturnValueError.java
index 9ed5464..15a2ace 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializeReturnValueError.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializeReturnValueError.java
@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Error class is used when there is an exception while attempting to call deserializeAbi() of
+ * Error class is used when there is an exception while attempting to call deserialize() of
  * Serialization Provider
  */
 public class DeserializeReturnValueError extends SerializationProviderError {
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
index aa8c228..2b23c7f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -5,33 +5,118 @@
 import java.util.Map;
 
 public class Abi {
+    /**
+     * The comment
+     */
     @SerializedName("____comment")
     private String comment;
 
+    /**
+     * The version
+     */
     @SerializedName("version")
     private String version;
 
+    /**
+     * The types
+     */
     @SerializedName("types")
     private List<Map> types;
 
+    /**
+     * The structs
+     */
     @SerializedName("structs")
     private List<Map> structs;
 
+    /**
+     * The actions
+     */
     @SerializedName("actions")
     private List<Map> actions;
 
+    /**
+     * The tables
+     */
     @SerializedName("tables")
     private List<Map> tables;
 
+    /**
+     * The ricardian clauses
+     */
     @SerializedName("ricardian_clauses")
     private List<Map> ricardianClauses;
 
+    /**
+     * The variants
+     */
     @SerializedName("variants")
     private List<Map> variants;
 
+    /**
+     * The action results
+     */
     @SerializedName("action_results")
     private List<ActionResult> actionResults;
 
+    /**
+     * Gets the comment
+     * @return the comment
+     */
+    public String getComment() { return this.comment; }
+
+    /**
+     * Gets the version
+     * @return the version
+     */
+    public String getVersion() { return this.version; }
+
+    /**
+     * Gets the types
+     * @return the types
+     */
+    public List<Map> getTypes() { return this.types; }
+
+    /**
+     * Gets the structs
+     * @return the structs
+     */
+    public List<Map> getStructs() { return this.structs; }
+
+    /**
+     * Gets the actions
+     * @return the actions
+     */
+    public List<Map> getActions() { return this.actions; }
+
+    /**
+     * Gets the tables
+     * @return the tables
+     */
+    public List<Map> getTables() { return this.tables; }
+
+    /**
+     * Gets the ricardianClauses
+     * @return the ricardianClauses
+     */
+    public List<Map> getRicardianClauses() { return this.ricardianClauses; }
+
+    /**
+     * Gets the variants
+     * @return the variants
+     */
+    public List<Map> getVariants() { return this.variants; }
+
+    /**
+     * Gets the actionResults
+     * @return the actionResults
+     */
+    public List<ActionResult> getActionResults() { return this.actionResults; }
+
+    /**
+     * Gets the return type of the specified action
+     * @param actionName - action to check for return type
+     */
     public String getActionReturnTypeByActionName(String actionName) {
         if (this.actionResults.isEmpty()) {
             return null;
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
index b658f44..a415f76 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
@@ -1,22 +1,36 @@
 package one.block.eosiojava.models.abiProvider;
 
 import com.google.gson.annotations.SerializedName;
-import org.jetbrains.annotations.NotNull;
 
 public class ActionResult {
-    @NotNull
+
+    /**
+     * The name
+     */
     @SerializedName("name")
     private String name;
 
-    @NotNull
+    /**
+     * The return value type
+     */
     @SerializedName("result_type")
     private String resultType;
 
-    public Boolean hasActionName(String actionName) {
-        return this.name.equals(actionName);
-    }
+    /**
+     * Gets the name
+     * @return the name
+     */
+    public String getName() { return this.name; }
+
+    /**
+     * Gets the return value type
+     * @return the return value type
+     */
+    public String getReturnType() { return this.resultType; }
 
-    public String getReturnType() {
-        return this.resultType;
-    }
+    /**
+     * Determines if this action's name matches
+     * @return true if action name matches; false otherwise
+     */
+    public Boolean hasActionName(String actionName) { return this.name.equals(actionName); }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
index 0369a3f..d5b5324 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -1,84 +1,252 @@
 package one.block.eosiojava.models.rpcProvider.response;
 
-import com.google.common.io.BaseEncoding;
 import com.google.gson.annotations.SerializedName;
-import java.io.UnsupportedEncodingException;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
 import java.util.Map;
-import javax.xml.bind.DatatypeConverter;
-import one.block.eosiojava.models.rpcProvider.Action;
-import org.bouncycastle.util.encoders.Hex;
 
 public class ActionTrace {
+    /**
+     * The actionOrdinal
+     */
     @SerializedName("action_ordinal")
     private Integer actionOrdinal;
 
+    /**
+     * The creatorActionOrdinal
+     */
     @SerializedName("creator_action_ordinal")
     private Integer creatorActionOrdinal;
 
+    /**
+     * The closestUnnotifiedAncestorActionOrdinal
+     */
     @SerializedName("closest_unnotified_ancestor_action_ordinal")
     private Integer closestUnnotifiedAncestorActionOrdinal;
 
+    /**
+     * The receipt
+     */
     @SerializedName("receipt")
     private Map receipt;
 
+    /**
+     * The receiver
+     */
     @SerializedName("receiver")
     private String receiver;
 
+    /**
+     * The act
+     */
     @SerializedName("act")
     private Map act;
 
+    /**
+     * The contextFree
+     */
     @SerializedName("context_free")
     private Boolean contextFree;
 
+    /**
+     * The elapsed
+     */
     @SerializedName("elapsed")
     private Integer elapsed;
 
+    /**
+     * The console
+     */
     @SerializedName("console")
     private String console;
 
+    /**
+     * The transactionId
+     */
     @SerializedName("trx_id")
     private String transactionId;
 
+    /**
+     * The blockNumber
+     */
     @SerializedName("block_num")
     private Integer blockNumber;
 
+    /**
+     * The blockTime
+     */
     @SerializedName("block_time")
     private String blockTime;
 
+    /**
+     * The producerBlockId
+     */
     @SerializedName("producer_block_id")
     private String producerBlockId;
 
+    /**
+     * The accountRamDeltas
+     */
     @SerializedName("account_ram_deltas")
-    private Map account_ram_deltas;
+    private Map accountRamDeltas;
 
+    /**
+     * The accountDiskDeltas
+     */
     @SerializedName("account_disk_deltas")
-    private Map account_disk_deltas;
+    private Map accountDiskDeltas;
 
+    /**
+     * The except
+     */
     @SerializedName("except")
     private String except;
 
+    /**
+     * The errorCode
+     */
     @SerializedName("error_code")
-    private String error_code;
+    private String errorCode;
 
+    /**
+     * The returnValue
+     */
     @SerializedName("return_value")
     private String returnValue;
 
+    /**
+     * The deserialized return value
+     */
     private String deserializedReturnValue;
 
-    public String getHexReturnValue() { return this.returnValue; }
-
+    /**
+     * Gets the actionOrdinal
+     * @return the actionOrdinal
+     */
+    public Integer getActionOrdinal() { return this.actionOrdinal; }
+
+    /**
+     * Gets the creatorActionOrdinal
+     * @return the creatorActionOrdinal
+     */
+    public Integer getCreatorActionOrdinal() { return this.creatorActionOrdinal; }
+
+    /**
+     * Gets the closestUnnotifiedAncestorActionOrdinal
+     * @return the closestUnnotifiedAncestorActionOrdinal
+     */
+    public Integer getClosestUnnotifiedAncestorActionOrdinal() { return this.closestUnnotifiedAncestorActionOrdinal; }
+
+    /**
+     * Gets the receipt
+     * @return the receipt
+     */
+    public Map getReceipt() { return this.receipt; }
+
+    /**
+     * Gets the receiver
+     * @return the receiver
+     */
+    public String getReceiver() { return this.receiver; }
+
+    /**
+     * Gets the act
+     * @return the act
+     */
+    public Map getAct() { return this.act; }
+
+    /**
+     * Gets the contextFree
+     * @return the contextFree
+     */
+    public Boolean getContextFree() { return this.contextFree; }
+
+    /**
+     * Gets the elapsed
+     * @return the elapsed
+     */
+    public Integer getElapsed() { return this.elapsed; }
+
+    /**
+     * Gets the console
+     * @return the console
+     */
+    public String getConsole() { return this.console; }
+
+    /**
+     * Gets the transactionId
+     * @return the transactionId
+     */
+    public String getTransactionId() { return this.transactionId; }
+
+    /**
+     * Gets the blockNumber
+     * @return the blockNumber
+     */
+    public Integer getBlockNumber() { return this.blockNumber; }
+
+    /**
+     * Gets the blockTime
+     * @return the blockTime
+     */
+    public String getBlockTime() { return this.blockTime; }
+
+    /**
+     * Gets the producerBlockId
+     * @return the producerBlockId
+     */
+    public String getProducerBlockId() { return this.producerBlockId; }
+
+    /**
+     * Gets the accountRamDeltas
+     * @return the accountRamDeltas
+     */
+    public Map getAccountRamDeltas() { return this.accountRamDeltas; }
+
+    /**
+     * Gets the accountDiskDeltas
+     * @return the accountDiskDeltas
+     */
+    public Map getAccountDiskDeltas() { return this.accountDiskDeltas; }
+
+    /**
+     * Gets the except
+     * @return the except
+     */
+    public String getExcept() { return this.except; }
+
+    /**
+     * Gets the errorCode
+     * @return the errorCode
+     */
+    public String getErrorCode() { return this.errorCode; }
+
+    /**
+     * Gets the returnValue
+     * @return the returnValue
+     */
+    public String getReturnValue() { return this.returnValue; }
+
+    /**
+     * Gets the deserializedReturnValue
+     * @return the deserializedReturnValue
+     */
     public String getDeserializedReturnValue() { return this.deserializedReturnValue; }
 
-    public String getAccountName() {
-        return (String)this.act.get("account");
-    }
-
-    public String getActionName() {
-        return (String)this.act.get("name");
-    }
-
+    /**
+     * Gets the account name
+     * @return the account name
+     */
+    public String getAccountName() { return (String)this.act.get("account"); }
+
+    /**
+     * Gets the action name
+     * @return the action name
+     */
+    public String getActionName() { return (String)this.act.get("name"); }
+
+    /**
+     * Sets the deserialized return value
+     * @param deserializedReturnValue - the value to set to
+     */
     public void setDeserializedReturnValue(String deserializedReturnValue) {
         this.deserializedReturnValue = deserializedReturnValue;
     }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java
index 07a2598..30778d4 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ProcessedTransactionResponse.java
@@ -5,45 +5,148 @@
 import java.util.Map;
 
 public class ProcessedTransactionResponse {
+
+    /**
+     * The transaction id
+     */
     @SerializedName("id")
     private String id;
 
+    /**
+     * The blockNumber
+     */
     @SerializedName("block_num")
     private Integer blockNumber;
 
+    /**
+     * The blockTime
+     */
     @SerializedName("block_time")
     private String blockTime;
 
+    /**
+     * The producerBlockId
+     */
     @SerializedName("producer_block_id")
     private String producerBlockId;
 
+    /**
+     * The receipt
+     */
     @SerializedName("receipt")
     private Map receipt;
 
+    /**
+     * The elapsed
+     */
     @SerializedName("elapsed")
     private Integer elapsed;
 
+    /**
+     * The netUsage
+     */
     @SerializedName("net_usage")
     private Integer netUsage;
 
+    /**
+     * The scheduled
+     */
     @SerializedName("scheduled")
     private Boolean scheduled;
 
+    /**
+     * The accountRamDelta
+     */
     @SerializedName("account_ram_delta")
     private String accountRamDelta;
 
+    /**
+     * The except
+     */
     @SerializedName("except")
     private String except;
 
+    /**
+     * The errorCode
+     */
     @SerializedName("error_code")
     private String errorCode;
 
+    /**
+     * The actionTraces
+     */
     @SerializedName("action_traces")
     private List<ActionTrace> actionTraces;
 
-    public String getId() {
-        return this.id;
-    }
+    /**
+     * Gets the transaction id
+     * @return the transaction id
+     */
+    public String getId() { return this.id; }
+
+    /**
+     * Gets the blockNumber
+     * @return the blockNumber
+     */
+    public Integer getBlockNumber() { return this.blockNumber; }
+
+    /**
+     * Gets the blockTime
+     * @return the blockTime
+     */
+    public String getBlockTime() { return this.blockTime; }
+
+    /**
+     * Gets the producerBlockId
+     * @return the producerBlockId
+     */
+    public String getProducerBlockId() { return this.producerBlockId; }
+
+    /**
+     * Gets the receipt
+     * @return the receipt
+     */
+    public Map getReceipt() { return this.receipt; }
+
+    /**
+     * Gets the elapsed
+     * @return the elapsed
+     */
+    public Integer getElapsed() { return this.elapsed; }
+
+    /**
+     * Gets the netUsage
+     * @return the netUsage
+     */
+    public Integer getNetUsage() { return this.netUsage; }
+
+    /**
+     * Gets the scheduled
+     * @return the scheduled
+     */
+    public Boolean getScheduled() { return this.scheduled; }
+
+    /**
+     * Gets the accountRamDelta
+     * @return the accountRamDelta
+     */
+    public String getAccountRamDelta() { return this.accountRamDelta; }
+
+    /**
+     * Gets the except
+     * @return the except
+     */
+    public String getExcept() { return this.except; }
+
+    /**
+     * Gets the errorCode
+     * @return the errorCode
+     */
+    public String getErrorCode() { return this.errorCode; }
 
+    /**
+     * Gets the action traces
+     * @return the action traces
+     */
     public List<ActionTrace> getActionTraces() { return this.actionTraces; }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
index d980f50..cc7184f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
@@ -18,6 +18,9 @@ public class PushTransactionResponse {
     @SerializedName("transaction_id")
     private String transactionId;
 
+    /**
+     * The processed transaction
+     */
     @SerializedName("processed")
     private ProcessedTransactionResponse transactionResponse;
 
@@ -30,9 +33,19 @@ public String getTransactionId() {
         return transactionId;
     }
 
+    /**
+     * Gets the processed transaction
+     *
+     * @return the processed transaction
+     */
     public ProcessedTransactionResponse getProcessed() {
         return transactionResponse;
     }
 
+    /**
+     * Gets the processed transaction's action traces
+     *
+     * @return the processed transaction's action traces
+     */
     public List<ActionTrace> getActionTraces() { return transactionResponse != null ? transactionResponse.getActionTraces() : new ArrayList<>(); }
 }
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 65c8cb3..b12ce5f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -924,7 +924,7 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
                 returnType, actionAbiJSON);
 
         // !!! At this step, the data field of the action is still in HEX format.
-        actionAbiEosSerializationObject.setHex(actionTrace.getHexReturnValue());
+        actionAbiEosSerializationObject.setHex(actionTrace.getReturnValue());
 
         try {
             this.serializationProvider.deserialize(actionAbiEosSerializationObject);
diff --git a/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
index a47ce25..56a00fa 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
@@ -3,21 +3,12 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import java.math.BigInteger;
-import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
-import one.block.eosiojava.models.rpcProvider.request.GetRawAbiRequest;
-import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
-import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
-import one.block.eosiojava.models.rpcProvider.response.GetBlockResponse;
-import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
-import one.block.eosiojava.models.rpcProvider.response.GetRawAbiResponse;
-import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
-import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
-import org.bouncycastle.util.encoders.Base64;
+import one.block.eosiojava.models.abiProvider.Abi;
+import one.block.eosiojava.models.abiProvider.ActionResult;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -38,313 +29,59 @@ public void setUpGSON() {
     //region Request Models
 
     /**
-     * Test GetBlockRequest model
+     * Test Abi
      */
     @Test
-    public void GetBlockRequestTest() {
-        String jsonContent = "{"
-                + "\"block_num_or_id\":\"20430951\""
-                + "}";
+    public void AbiTest() {
+        String jsonContent = "{\"____comment\":\"Test comment\",\"version\":\"eosio::abi/1.2\",\"types\":[{\"new_type_name\":\"account_name\",\"type\":\"name\"}],\"structs\":[{\"name\":\"transfer\",\"base\":\"\",\"fields\":[{\"name\":\"from\",\"type\":\"account_name\"},{\"name\":\"to\",\"type\":\"account_name\"},{\"name\":\"quantity\",\"type\":\"asset\"},{\"name\":\"memo\",\"type\":\"string\"}]},{\"name\":\"create\",\"base\":\"\",\"fields\":[{\"name\":\"issuer\",\"type\":\"account_name\"},{\"name\":\"maximum_supply\",\"type\":\"asset\"}]},{\"name\":\"issue\",\"base\":\"\",\"fields\":[{\"name\":\"to\",\"type\":\"account_name\"},{\"name\":\"quantity\",\"type\":\"asset\"},{\"name\":\"memo\",\"type\":\"string\"}]},{\"name\":\"account\",\"base\":\"\",\"fields\":[{\"name\":\"balance\",\"type\":\"asset\"}]},{\"name\":\"currency_stats\",\"base\":\"\",\"fields\":[{\"name\":\"supply\",\"type\":\"asset\"},{\"name\":\"max_supply\",\"type\":\"asset\"},{\"name\":\"issuer\",\"type\":\"account_name\"}]},{\"name\":\"retval_test\",\"base\":\"\",\"fields\":[{\"name\":\"user\",\"type\":\"name\"}]},{\"name\":\"returnValue\",\"base\":\"\",\"fields\":[{\"name\":\"id\",\"type\":\"uint32\"},{\"name\":\"name\",\"type\":\"name\"}]}],\"actions\":[{\"name\":\"transfer\",\"type\":\"transfer\",\"ricardian_contract\":\"---\\ntitle: Token Transfer\\nsummary: Transfer tokens from one account to another.\\nicon: https://cdn.testnet.dev.b1ops.net/token-transfer.png#ce51ef9f9eeca3434e85507e0ed49e76fff1265422bded0255f3196ea59c8b0c\\n---\\n\\n## Transfer Terms & Conditions\\n\\nI, {{from}}, certify the following to be true to the best of my knowledge:\\n\\n1. I certify that {{quantity}} is not the proceeds of fraudulent or violent activities.\\n2. I certify that, to the best of my knowledge, {{to}} is not supporting initiation of violence against others.\\n3. I have disclosed any contractual terms & conditions with respect to {{quantity}} to {{to}}.\\n\\nI understand that funds transfers are not reversible after the {{$transaction.delay_sec}} seconds or other delay as configured by {{from}}'s permissions.\\n\\nIf this action fails to be irreversibly confirmed after receiving goods or services from '{{to}}', I agree to either return the goods or services or resend {{quantity}} in a timely manner.\"},{\"name\":\"issue\",\"type\":\"issue\",\"ricardian_contract\":\"\"},{\"name\":\"create\",\"type\":\"create\",\"ricardian_contract\":\"\"},{\"name\":\"retval_test\",\"type\":\"retval_test\",\"ricardian_contract\":\"\"}],\"tables\":[{\"name\":\"accounts\",\"index_type\":\"i64\",\"key_names\":[\"currency\"],\"key_types\":[\"uint64\"],\"type\":\"account\"},{\"name\":\"stat\",\"index_type\":\"i64\",\"key_names\":[\"currency\"],\"key_types\":[\"uint64\"],\"type\":\"currency_stats\"}],\"ricardian_clauses\":[],\"variants\":[],\"action_results\":[{\"name\":\"retval_test\",\"result_type\":\"returnValue\"}]}";
 
         // FromJSON test
-        GetBlockRequest getBlockRequest = this.gson.fromJson(jsonContent, GetBlockRequest.class);
-        assertNotNull(getBlockRequest);
-        assertEquals("20430951", getBlockRequest.getBlockNumOrId());
+        Abi abi = this.gson
+                .fromJson(jsonContent, Abi.class);
+        assertNotNull(abi);
+        assertNotNull(abi.getComment());
+        assertNotNull(abi.getVersion());
+        assertNotNull(abi.getTypes());
+        assertEquals(1, abi.getTypes().size());
+        assertNotNull(abi.getStructs());
+        assertEquals(7, abi.getStructs().size());
+        assertNotNull(abi.getActions());
+        assertEquals(4, abi.getActions().size());
+        assertNotNull(abi.getTables());
+        assertEquals(2, abi.getTables().size());
+        assertNotNull(abi.getRicardianClauses());
+        assertEquals(0, abi.getRicardianClauses().size());
+        assertNotNull(abi.getVariants());
+        assertEquals(0, abi.getVariants().size());
+        assertNotNull(abi.getActionResults());
+        assertEquals(1, abi.getActionResults().size());
 
         // ToJSON test
-        String toJSON = this.gson.toJson(getBlockRequest);
+        String toJSON = this.gson.toJson(abi);
         assertNotNull(toJSON);
         assertNotEquals("", toJSON);
         assertEquals(jsonContent, toJSON);
     }
 
     /**
-     * Test GetRawAbiRequest
+     * Test ActionResult
      */
     @Test
-    public void GetRawAbiRequestTest() {
-        String jsonContent = "{"
-                + "\"account_name\":\"eosio.token\""
-                + "}";
+    public void ActionResultTest() {
+        String actionName = "test_action";
+        String returnType = "testReturnType";
+        String jsonContent = "{\"name\":\"" + actionName + "\",\"result_type\":\"" + returnType + "\"}";
 
         // FromJSON test
-        GetRawAbiRequest getRawAbiRequest = this.gson.fromJson(jsonContent, GetRawAbiRequest.class);
-        assertNotNull(getRawAbiRequest);
-        assertEquals("eosio.token", getRawAbiRequest.getAccountName());
+        ActionResult actionResult = this.gson
+                .fromJson(jsonContent, ActionResult.class);
+        assertNotNull(actionResult);
+        assertEquals(actionName, actionResult.getName());
+        assertTrue(actionResult.hasActionName(actionName));
+        assertEquals(returnType, actionResult.getReturnType());
 
         // ToJSON test
-        String toJSON = this.gson.toJson(getRawAbiRequest);
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-        assertEquals(jsonContent, toJSON);
-    }
-
-    /**
-     * Test GetRequiredKeysRequest
-     */
-    @Test
-    public void GetRequiredKeysRequestTest() {
-        String jsonContent = "{\"available_keys\":[\"dummy key\"],\"transaction\":{\"expiration\":\"2019-01-25T22:13:55\",\"ref_block_num\":123456,\"ref_block_prefix\":123456789,\"max_net_usage_words\":0,\"max_cpu_usage_ms\":0,\"delay_sec\":0,\"context_free_actions\":[],\"actions\":[{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":\"hex data\"}],\"transaction_extensions\":[]}}";
-
-        // FromJSON test
-        GetRequiredKeysRequest getRequiredKeysRequest = this.gson
-                .fromJson(jsonContent, GetRequiredKeysRequest.class);
-
-        // Checking available key field
-        assertNotNull(getRequiredKeysRequest);
-        assertNotNull(getRequiredKeysRequest.getAvailableKeys());
-        assertEquals(1, getRequiredKeysRequest.getAvailableKeys().size());
-        assertEquals("dummy key",
-                getRequiredKeysRequest.getAvailableKeys().get(0));
-
-        // Checking transaction field
-        assertNotNull(getRequiredKeysRequest.getTransaction());
-        assertEquals("2019-01-25T22:13:55",
-                getRequiredKeysRequest.getTransaction().getExpiration());
-        assertEquals(BigInteger.valueOf(123456),
-                getRequiredKeysRequest.getTransaction().getRefBlockNum());
-        assertEquals(BigInteger.valueOf(123456789),
-                getRequiredKeysRequest.getTransaction().getRefBlockPrefix());
-        assertEquals(BigInteger.valueOf(0),
-                getRequiredKeysRequest.getTransaction().getMaxNetUsageWords());
-        assertEquals(BigInteger.valueOf(0),
-                getRequiredKeysRequest.getTransaction().getMaxCpuUsageMs());
-        assertEquals(BigInteger.valueOf(0), getRequiredKeysRequest.getTransaction().getDelaySec());
-        assertNotNull(getRequiredKeysRequest.getTransaction().getContextFreeActions());
-        assertEquals(0, getRequiredKeysRequest.getTransaction().getContextFreeActions().size());
-
-        // Checking actions field inside transaction
-        assertNotNull(getRequiredKeysRequest.getTransaction().getActions());
-        assertEquals(1, getRequiredKeysRequest.getTransaction().getActions().size());
-        assertEquals("eosio.token",
-                getRequiredKeysRequest.getTransaction().getActions().get(0).getAccount());
-        assertEquals("transfer",
-                getRequiredKeysRequest.getTransaction().getActions().get(0).getName());
-
-        // Checking authorizations field inside action
-        assertNotNull(
-                getRequiredKeysRequest.getTransaction().getActions().get(0).getAuthorization());
-        assertEquals(1,
-                getRequiredKeysRequest.getTransaction().getActions().get(0).getAuthorization()
-                        .size());
-        assertEquals("dummy_account",
-                getRequiredKeysRequest.getTransaction().getActions().get(0).getAuthorization()
-                        .get(0).getActor());
-        assertEquals("active",
-                getRequiredKeysRequest.getTransaction().getActions().get(0).getAuthorization()
-                        .get(0).getPermission());
-
-        assertEquals(
-                "hex data",
-                getRequiredKeysRequest.getTransaction().getActions().get(0).getData());
-
-        assertNotNull(getRequiredKeysRequest.getTransaction().getTransactionExtensions());
-        assertEquals(0, getRequiredKeysRequest.getTransaction().getTransactionExtensions().size());
-
-        // ToJSON test
-        String toJSON = this.gson.toJson(getRequiredKeysRequest);
-
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-        assertEquals(jsonContent, toJSON);
-    }
-
-    /**
-     * Test PushTransactionRequest
-     */
-    @Test
-    public void PushTransactionRequestTest() {
-        String jsonContent = "{\"signatures\":[\"signature in EOS format\"],\"compression\":0,\"packed_context_free_data\":\"\",\"packed_trx\":\"packed transaction\"}";
-
-        // FromJSON test
-        PushTransactionRequest pushTransactionRequest = this.gson
-                .fromJson(jsonContent, PushTransactionRequest.class);
-        assertNotNull(pushTransactionRequest);
-        assertEquals(0, pushTransactionRequest.getCompression());
-        assertEquals(
-                "packed transaction",
-                pushTransactionRequest.getPackTrx());
-        assertEquals("", pushTransactionRequest.getPackagedContextFreeData());
-        assertNotNull(pushTransactionRequest.getSignatures());
-        assertEquals(1, pushTransactionRequest.getSignatures().size());
-        assertEquals(
-                "signature in EOS format",
-                pushTransactionRequest.getSignatures().get(0));
-
-        // ToJSON test
-        String toJSON = this.gson.toJson(pushTransactionRequest);
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-        assertEquals(jsonContent, toJSON);
-    }
-
-    //endregion
-
-    //region Response models
-
-    /**
-     * Test GetBlockResponse
-     */
-    @Test
-    public void GetBlockResponseTest() {
-        //region bigString
-        String jsonContent = "{\"timestamp\":\"2019-03-25T06:08:05.000\",\"producer\":\"eosnewyorkio\",\"confirmed\":0,\"previous\":\"02f217198bda8b9f88b0d7bd5450ce39c90352a01f896cdb64b8a4c88a9e7f3c\",\"transaction_mroot\":\"405a5daeb4510dc12cb4d90890b44a956178382fe4d80c22a7f80446e5a32d75\",\"action_mroot\":\"d83920d9e596ffc478480ede9a18a7bd8289a2edabc9c39396d1d5f9a2e0a184\",\"schedule_version\":737,\"new_producers\":null,\"header_extensions\":[],\"producer_signature\":\"SIG_K1_KZ3SwH4yW2oYaiRzRy8uVxV9QxZsZYp39hY7DWDjFqLtBp9QjFgKizzAgRgp5y5GkYyhci59SwSVNcGasiW6J6tVZ1zMZx\",\"transactions\":[{\"status\":\"executed\",\"cpu_usage_us\":123,\"net_usage_words\":0,\"trx\":\"dff93d1c318b5a71c85eab9473f2fbc20ddda98c686ac34dc7b28cf6f2e7d531\"},{\"status\":\"executed\",\"cpu_usage_us\":1526,\"net_usage_words\":28,\"trx\":{\"id\":\"0f7719461a2205279a86e30cd4f4eae2d4f5586301f9d00aac8ac59230d3ebe2\",\"signatures\":[\"SIG_K1_K5hVUFB4iVNs8WcvcvMpioM7RBECDRDmAnGN6h9qJvNABWvXn3fzfEkjHhnUL32oxy7T2317hgMUvjGnM56jQPcuLs9utg\"],\"compression\":\"none\",\"packed_context_free_data\":\"\",\"context_free_data\":[],\"packed_trx\":\"7f70985ccb15550e81720000000001309d4c462197b23a0000004044a3b6ba015035bd4c2197b23a00c055fb2aac904b8201f1e7c23e9d45306ebf9f955b311f5898c763a4a680a4852cc8d957c20a28b8ec00204943b014ddc858c7ed40f5fa2f4fc09bda22a76616ffc0f9ba212130fb972f573ce08e9639d6af11366160a713cbec41453683f70c3774a62a31d781d054ae69ceb96bdf5bf59ff13b98d59c8f4d9402cc1f036abc97797d9d92da09a1ac708900\",\"transaction\":{\"expiration\":\"2019-03-25T06:09:03\",\"ref_block_num\":5579,\"ref_block_prefix\":1921060437,\"max_net_usage_words\":0,\"max_cpu_usage_ms\":0,\"delay_sec\":0,\"context_free_actions\":[],\"actions\":[{\"account\":\"betdiceadmin\",\"name\":\"reveal2\",\"authorization\":[{\"actor\":\"betdicegroup\",\"permission\":\"diceserver\"}],\"data\":{\"hashSeedHash\":\"f1e7c23e9d45306ebf9f955b311f5898c763a4a680a4852cc8d957c20a28b8ec\",\"signature\":\"SIG_K1_KeLFYguv3Su8SnnkGZ6jzm27NQ7Ca9nS3c4TZX9UMGmfE4N8jKKgSfK2aZpUy7Yp12R8QKA8opj9hXec76fkCtK6JncKcb\",\"numberHash\":\"ceb96bdf5bf59ff13b98d59c8f4d9402cc1f036abc97797d9d92da09a1ac7089\"},\"hex_data\":\"f1e7c23e9d45306ebf9f955b311f5898c763a4a680a4852cc8d957c20a28b8ec00204943b014ddc858c7ed40f5fa2f4fc09bda22a76616ffc0f9ba212130fb972f573ce08e9639d6af11366160a713cbec41453683f70c3774a62a31d781d054ae69ceb96bdf5bf59ff13b98d59c8f4d9402cc1f036abc97797d9d92da09a1ac7089\"}],\"transaction_extensions\":[]}}}],\"block_extensions\":[],\"id\":\"02f2171af934752f7b39943ddfdfcd55341b02b1818161ae94399ab911052e0a\",\"block_num\":49420058,\"ref_block_prefix\":1033124219}";
-        //endregion
-
-        // FromJSON test
-        GetBlockResponse getBlockRequest = this.gson.fromJson(jsonContent, GetBlockResponse.class);
-        assertNotNull(getBlockRequest);
-
-        assertEquals("2019-03-25T06:08:05.000", getBlockRequest.getTimestamp());
-        assertEquals("eosnewyorkio", getBlockRequest.getProducer());
-        assertEquals(BigInteger.valueOf(0), getBlockRequest.getConfirmed());
-        assertEquals("02f217198bda8b9f88b0d7bd5450ce39c90352a01f896cdb64b8a4c88a9e7f3c",
-                getBlockRequest.getPrevious());
-        assertEquals("405a5daeb4510dc12cb4d90890b44a956178382fe4d80c22a7f80446e5a32d75",
-                getBlockRequest.getTransactionMroot());
-        assertEquals("d83920d9e596ffc478480ede9a18a7bd8289a2edabc9c39396d1d5f9a2e0a184",
-                getBlockRequest.getActionMroot());
-        assertEquals(BigInteger.valueOf(737), getBlockRequest.getScheduleVersion());
-        assertNull(getBlockRequest.getNewProducers());
-        assertEquals(0, getBlockRequest.getHeaderExtensions().size());
-        assertEquals(
-                "SIG_K1_KZ3SwH4yW2oYaiRzRy8uVxV9QxZsZYp39hY7DWDjFqLtBp9QjFgKizzAgRgp5y5GkYyhci59SwSVNcGasiW6J6tVZ1zMZx",
-                getBlockRequest.getProducerSignature());
-        assertEquals(2, getBlockRequest.getTransactions().size());
-        assertEquals("dff93d1c318b5a71c85eab9473f2fbc20ddda98c686ac34dc7b28cf6f2e7d531",
-                getBlockRequest.getTransactions().get(0).get("trx"));
-        assertEquals(0, getBlockRequest.getBlockExtensions().size());
-        assertEquals("02f2171af934752f7b39943ddfdfcd55341b02b1818161ae94399ab911052e0a",
-                getBlockRequest.getId());
-        assertEquals(BigInteger.valueOf(49420058), getBlockRequest.getBlockNum());
-        assertEquals(BigInteger.valueOf(1033124219), getBlockRequest.getRefBlockPrefix());
-
-        // ToJSON test
-        String toJSON = this.gson.toJson(getBlockRequest);
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-        // This test does not do verify toJSON with original json content because they are generated different values due to deep level model which is not defined in the source code.
-    }
-
-    /**
-     * Test GetRawAbiResponse
-     */
-    @Test
-    public void GetRawAbiResponseTest() {
-        String jsonContent = "{\"account_name\":\"eosio.token\",\"code_hash\":\"01bd013c4f8be142b9cadf511f007c6ac201c068d529f01ed5661803c575befa\",\"abi_hash\":\"f8f677996a8ca68388bc41cf55e727949c161b624a47e497e3b2f71a0e635dad\",\"abi\":\"DmVvc2lvOjphYmkvMS4wAQxhY2NvdW50X25hbWUEbmFtZQcIdHJhbnNmZXIABARmcm9tDGFjY291bnRfbmFtZQJ0bwxhY2NvdW50X25hbWUIcXVhbnRpdHkFYXNzZXQEbWVtbwZzdHJpbmcGY3JlYXRlAAIGaXNzdWVyDGFjY291bnRfbmFtZQ5tYXhpbXVtX3N1cHBseQVhc3NldAVpc3N1ZQADAnRvDGFjY291bnRfbmFtZQhxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwZyZXRpcmUAAghxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwVjbG9zZQACBW93bmVyDGFjY291bnRfbmFtZQZzeW1ib2wGc3ltYm9sB2FjY291bnQAAQdiYWxhbmNlBWFzc2V0DmN1cnJlbmN5X3N0YXRzAAMGc3VwcGx5BWFzc2V0Cm1heF9zdXBwbHkFYXNzZXQGaXNzdWVyDGFjY291bnRfbmFtZQUAAABXLTzNzQh0cmFuc2ZlcucFIyMgVHJhbnNmZXIgVGVybXMgJiBDb25kaXRpb25zCgpJLCB7e2Zyb219fSwgY2VydGlmeSB0aGUgZm9sbG93aW5nIHRvIGJlIHRydWUgdG8gdGhlIGJlc3Qgb2YgbXkga25vd2xlZGdlOgoKMS4gSSBjZXJ0aWZ5IHRoYXQge3txdWFudGl0eX19IGlzIG5vdCB0aGUgcHJvY2VlZHMgb2YgZnJhdWR1bGVudCBvciB2aW9sZW50IGFjdGl2aXRpZXMuCjIuIEkgY2VydGlmeSB0aGF0LCB0byB0aGUgYmVzdCBvZiBteSBrbm93bGVkZ2UsIHt7dG99fSBpcyBub3Qgc3VwcG9ydGluZyBpbml0aWF0aW9uIG9mIHZpb2xlbmNlIGFnYWluc3Qgb3RoZXJzLgozLiBJIGhhdmUgZGlzY2xvc2VkIGFueSBjb250cmFjdHVhbCB0ZXJtcyAmIGNvbmRpdGlvbnMgd2l0aCByZXNwZWN0IHRvIHt7cXVhbnRpdHl9fSB0byB7e3RvfX0uCgpJIHVuZGVyc3RhbmQgdGhhdCBmdW5kcyB0cmFuc2ZlcnMgYXJlIG5vdCByZXZlcnNpYmxlIGFmdGVyIHRoZSB7e3RyYW5zYWN0aW9uLmRlbGF5fX0gc2Vjb25kcyBvciBvdGhlciBkZWxheSBhcyBjb25maWd1cmVkIGJ5IHt7ZnJvbX19J3MgcGVybWlzc2lvbnMuCgpJZiB0aGlzIGFjdGlvbiBmYWlscyB0byBiZSBpcnJldmVyc2libHkgY29uZmlybWVkIGFmdGVyIHJlY2VpdmluZyBnb29kcyBvciBzZXJ2aWNlcyBmcm9tICd7e3RvfX0nLCBJIGFncmVlIHRvIGVpdGhlciByZXR1cm4gdGhlIGdvb2RzIG9yIHNlcnZpY2VzIG9yIHJlc2VuZCB7e3F1YW50aXR5fX0gaW4gYSB0aW1lbHkgbWFubmVyLgoAAAAAAKUxdgVpc3N1ZQAAAAAAqGzURQZjcmVhdGUAAAAAAKjrsroGcmV0aXJlAAAAAAAAhWlEBWNsb3NlAAIAAAA4T00RMgNpNjQBCGN1cnJlbmN5AQZ1aW50NjQHYWNjb3VudAAAAAAAkE3GA2k2NAEIY3VycmVuY3kBBnVpbnQ2NA5jdXJyZW5jeV9zdGF0cwAAAA===\"}";
-
-        // FromJSON test
-        GetRawAbiResponse getRawAbiResponse = this.gson
-                .fromJson(jsonContent, GetRawAbiResponse.class);
-        assertNotNull(getRawAbiResponse);
-        assertEquals("eosio.token", getRawAbiResponse.getAccountName());
-        assertEquals("01bd013c4f8be142b9cadf511f007c6ac201c068d529f01ed5661803c575befa",
-                getRawAbiResponse.getCodeHash());
-        assertEquals("f8f677996a8ca68388bc41cf55e727949c161b624a47e497e3b2f71a0e635dad",
-                getRawAbiResponse.getAbiHash());
-        assertEquals(
-                "DmVvc2lvOjphYmkvMS4wAQxhY2NvdW50X25hbWUEbmFtZQcIdHJhbnNmZXIABARmcm9tDGFjY291bnRfbmFtZQJ0bwxhY2NvdW50X25hbWUIcXVhbnRpdHkFYXNzZXQEbWVtbwZzdHJpbmcGY3JlYXRlAAIGaXNzdWVyDGFjY291bnRfbmFtZQ5tYXhpbXVtX3N1cHBseQVhc3NldAVpc3N1ZQADAnRvDGFjY291bnRfbmFtZQhxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwZyZXRpcmUAAghxdWFudGl0eQVhc3NldARtZW1vBnN0cmluZwVjbG9zZQACBW93bmVyDGFjY291bnRfbmFtZQZzeW1ib2wGc3ltYm9sB2FjY291bnQAAQdiYWxhbmNlBWFzc2V0DmN1cnJlbmN5X3N0YXRzAAMGc3VwcGx5BWFzc2V0Cm1heF9zdXBwbHkFYXNzZXQGaXNzdWVyDGFjY291bnRfbmFtZQUAAABXLTzNzQh0cmFuc2ZlcucFIyMgVHJhbnNmZXIgVGVybXMgJiBDb25kaXRpb25zCgpJLCB7e2Zyb219fSwgY2VydGlmeSB0aGUgZm9sbG93aW5nIHRvIGJlIHRydWUgdG8gdGhlIGJlc3Qgb2YgbXkga25vd2xlZGdlOgoKMS4gSSBjZXJ0aWZ5IHRoYXQge3txdWFudGl0eX19IGlzIG5vdCB0aGUgcHJvY2VlZHMgb2YgZnJhdWR1bGVudCBvciB2aW9sZW50IGFjdGl2aXRpZXMuCjIuIEkgY2VydGlmeSB0aGF0LCB0byB0aGUgYmVzdCBvZiBteSBrbm93bGVkZ2UsIHt7dG99fSBpcyBub3Qgc3VwcG9ydGluZyBpbml0aWF0aW9uIG9mIHZpb2xlbmNlIGFnYWluc3Qgb3RoZXJzLgozLiBJIGhhdmUgZGlzY2xvc2VkIGFueSBjb250cmFjdHVhbCB0ZXJtcyAmIGNvbmRpdGlvbnMgd2l0aCByZXNwZWN0IHRvIHt7cXVhbnRpdHl9fSB0byB7e3RvfX0uCgpJIHVuZGVyc3RhbmQgdGhhdCBmdW5kcyB0cmFuc2ZlcnMgYXJlIG5vdCByZXZlcnNpYmxlIGFmdGVyIHRoZSB7e3RyYW5zYWN0aW9uLmRlbGF5fX0gc2Vjb25kcyBvciBvdGhlciBkZWxheSBhcyBjb25maWd1cmVkIGJ5IHt7ZnJvbX19J3MgcGVybWlzc2lvbnMuCgpJZiB0aGlzIGFjdGlvbiBmYWlscyB0byBiZSBpcnJldmVyc2libHkgY29uZmlybWVkIGFmdGVyIHJlY2VpdmluZyBnb29kcyBvciBzZXJ2aWNlcyBmcm9tICd7e3RvfX0nLCBJIGFncmVlIHRvIGVpdGhlciByZXR1cm4gdGhlIGdvb2RzIG9yIHNlcnZpY2VzIG9yIHJlc2VuZCB7e3F1YW50aXR5fX0gaW4gYSB0aW1lbHkgbWFubmVyLgoAAAAAAKUxdgVpc3N1ZQAAAAAAqGzURQZjcmVhdGUAAAAAAKjrsroGcmV0aXJlAAAAAAAAhWlEBWNsb3NlAAIAAAA4T00RMgNpNjQBCGN1cnJlbmN5AQZ1aW50NjQHYWNjb3VudAAAAAAAkE3GA2k2NAEIY3VycmVuY3kBBnVpbnQ2NA5jdXJyZW5jeV9zdGF0cwAAAA===",
-                getRawAbiResponse.getAbi());
-
-        // ToJSON test
-        String toJSON = this.gson.toJson(getRawAbiResponse);
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-        assertEquals(jsonContent, toJSON);
-    }
-
-    /**
-     * Test GetRequiredKeysResponse
-     */
-    @Test
-    public void GetRequiredKeysResponseTest() {
-        String jsonContent = "{\"required_keys\":[\"dummy_key\"]}";
-
-        // FromJSON test
-        GetRequiredKeysResponse getRequiredKeysResponse = this.gson
-                .fromJson(jsonContent, GetRequiredKeysResponse.class);
-        assertNotNull(getRequiredKeysResponse);
-        assertNotNull(getRequiredKeysResponse.getRequiredKeys());
-        assertEquals(1, getRequiredKeysResponse.getRequiredKeys().size());
-        assertEquals("dummy_key", getRequiredKeysResponse.getRequiredKeys().get(0));
-
-        // ToJSON test
-        String toJSON = this.gson.toJson(getRequiredKeysResponse);
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-        assertEquals(jsonContent, toJSON);
-    }
-
-    /**
-     * Test PushTransactionResponse
-     */
-    @Test
-    public void PushTransactionResponseTest() {
-        String jsonContent = "{\"transaction_id\":\"dump_transaction_id\",\"processed\":{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[]},{\"receipt\":{\"receiver\":\"eosio.token\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[{\"receipt\":{\"receiver\":\"dummy_account\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[]},{\"receipt\":{\"receiver\":\"dummy_account_2\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",111]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[]}]}]}}";
-
-        // FromJSON test
-        PushTransactionResponse pushTransactionResponse = this.gson
-                .fromJson(jsonContent, PushTransactionResponse.class);
-        assertNotNull(pushTransactionResponse);
-        assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
-        assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
-
-        // ToJSON test
-        String toJSON = this.gson.toJson(pushTransactionResponse);
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-        // This test does not do verify toJSON with original json content because they are generated different values due to deep level model which is not defined in the source code.
-    }
-
-    @Test
-    public void PushTransactionResponseWithReturnValuesTest() {
-        String jsonContent = "{\"transaction_id\":\"dump_transaction_id\",\"processed\":{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"eosio.token\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[{\"receipt\":{\"receiver\":\"dummy_account\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",1]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"dummy_account_2\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[[\"dummy_account\",111]],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.token\",\"name\":\"transfer\",\"authorization\":[{\"actor\":\"dummy_account\",\"permission\":\"active\"}],\"data\":{\"from\":\"dummy_account\",\"to\":\"dummy_account_2\",\"quantity\":\"1.0000 EOS\",\"memo\":\"dummy memo\"},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":123123,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}]}]}}";
-
-        // FromJSON test
-        PushTransactionResponse pushTransactionResponse = this.gson
-                .fromJson(jsonContent, PushTransactionResponse.class);
-        Base64.decode("000000000090b1ca");
-        Base64.decode("000000000090b1ca");
-        assertNotNull(pushTransactionResponse);
-        assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
-        assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
-
-        // ToJSON test
-        String toJSON = this.gson.toJson(pushTransactionResponse);
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-    }
-
-    /**
-     * Test GetInfoResponse
-     */
-    @Test
-    public void GetInfoResponseTest() {
-        String jsonContent = "{\"server_version\":\"1a14e9cd\",\"chain_id\":\"aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906\",\"head_block_num\":49675371,\"last_irreversible_block_num\":49675040,\"last_irreversible_block_id\":\"02f5fb2074e613769d56079fefbaa46b8fbfa813f4da1395043e3358ccabbb19\",\"head_block_id\":\"02f5fc6b3a3921573eacbd43615af133b5b09071a74bece17f7f9807db3251aa\",\"head_block_time\":\"2019-03-26T17:36:45.000\",\"head_block_producer\":\"eoscannonchn\",\"virtual_block_cpu_limit\":200000000,\"virtual_block_net_limit\":1048576000,\"block_cpu_limit\":185578,\"block_net_limit\":1046440,\"server_version_string\":\"v1.6.1\"}";
-
-        // FromJSON test
-        GetInfoResponse getInfoResponse = this.gson
-                .fromJson(jsonContent, GetInfoResponse.class);
-        assertNotNull(getInfoResponse);
-        assertEquals("1a14e9cd", getInfoResponse.getServerVersion());
-        assertEquals("aca376f206b8fc25a6ed44dbdc66547c36c6c33e3a119ffbeaef943642f0e906",
-                getInfoResponse.getChainId());
-        assertEquals(BigInteger.valueOf(49675371), getInfoResponse.getHeadBlockNum());
-        assertEquals(BigInteger.valueOf(49675040), getInfoResponse.getLastIrreversibleBlockNum());
-        assertEquals("02f5fb2074e613769d56079fefbaa46b8fbfa813f4da1395043e3358ccabbb19",
-                getInfoResponse.getLastIrreversibleBlockId());
-        assertEquals("02f5fc6b3a3921573eacbd43615af133b5b09071a74bece17f7f9807db3251aa",
-                getInfoResponse.getHeadBlockId());
-        assertEquals("2019-03-26T17:36:45.000", getInfoResponse.getHeadBlockTime());
-        assertEquals("eoscannonchn", getInfoResponse.getHeadBlockProducer());
-        assertEquals(BigInteger.valueOf(200000000), getInfoResponse.getVirtualBlockCpuLimit());
-        assertEquals(BigInteger.valueOf(1048576000), getInfoResponse.getVirtualBlockNetLimit());
-        assertEquals(BigInteger.valueOf(185578), getInfoResponse.getBlockCpuLimit());
-        assertEquals(BigInteger.valueOf(1046440), getInfoResponse.getBlockNetLimit());
-        assertEquals("v1.6.1", getInfoResponse.getServerVersionString());
-
-        // ToJSON test
-        String toJSON = this.gson.toJson(getInfoResponse);
+        String toJSON = this.gson.toJson(actionResult);
         assertNotNull(toJSON);
         assertNotEquals("", toJSON);
         assertEquals(jsonContent, toJSON);
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index b817551..f6c4b10 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
@@ -19,7 +19,6 @@
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
 import one.block.eosiojava.models.rpcProvider.response.ProcessedTransactionResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
-import org.bouncycastle.util.encoders.Base64;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -310,9 +309,9 @@ public void PushTransactionResponseWithReturnValuesTest() {
         assertEquals("dump_transaction_id", pushTransactionResponse.getTransactionId());
         assertEquals("dump_id", pushTransactionResponse.getProcessed().getId());
         assertEquals(2, pushTransactionResponse.getActionTraces().size());
-        assertEquals("000000000090b1ca", pushTransactionResponse.getActionTraces().get(0).getHexReturnValue());
+        assertEquals("000000000090b1ca", pushTransactionResponse.getActionTraces().get(0).getReturnValue());
         assertEquals(null, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
-        assertEquals("0000000000408608", pushTransactionResponse.getActionTraces().get(1).getHexReturnValue());
+        assertEquals("0000000000408608", pushTransactionResponse.getActionTraces().get(1).getReturnValue());
         assertEquals(null, pushTransactionResponse.getActionTraces().get(1).getDeserializedReturnValue());
 
         // ToJSON test
@@ -361,16 +360,25 @@ public void GetInfoResponseTest() {
      */
     @Test
     public void ProcessedTransactionResponseTest() {
-        String jsonContent = "{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"0000000000408608\"}]}";
+        String jsonContent = "{\"id\":\"dump_id\",\"block_num\":1231214214,\"block_time\":\"2019-12-12T12:12:12.500\",\"producer_block_id\":\"test\",\"receipt\":{\"status\":\"executed\",\"cpu_usage_us\":1,\"net_usage_words\":1},\"elapsed\":1,\"net_usage\":1,\"scheduled\":false,\"account_ram_delta\":\"test\",\"except\":\"test\",\"error_code\":\"test\",\"action_traces\":[{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"},{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"0000000000408608\"}]}";
 
         // FromJSON test
         ProcessedTransactionResponse processedTransactionResponse = this.gson
                 .fromJson(jsonContent, ProcessedTransactionResponse.class);
         assertNotNull(processedTransactionResponse);
         assertEquals("dump_id", processedTransactionResponse.getId());
+        assertNotNull(processedTransactionResponse.getBlockTime());
+        assertNotNull(processedTransactionResponse.getProducerBlockId());
+        assertNotNull(processedTransactionResponse.getReceipt());
+        assertNotNull(processedTransactionResponse.getElapsed());
+        assertNotNull(processedTransactionResponse.getNetUsage());
+        assertNotNull(processedTransactionResponse.getScheduled());
+        assertNotNull(processedTransactionResponse.getAccountRamDelta());
+        assertNotNull(processedTransactionResponse.getExcept());
+        assertNotNull(processedTransactionResponse.getErrorCode());
         assertEquals(2, processedTransactionResponse.getActionTraces().size());
-        assertEquals("000000000090b1ca", processedTransactionResponse.getActionTraces().get(0).getHexReturnValue());
-        assertEquals("0000000000408608", processedTransactionResponse.getActionTraces().get(1).getHexReturnValue());
+        assertEquals("000000000090b1ca", processedTransactionResponse.getActionTraces().get(0).getReturnValue());
+        assertEquals("0000000000408608", processedTransactionResponse.getActionTraces().get(1).getReturnValue());
 
         // ToJSON test
         String toJSON = this.gson.toJson(processedTransactionResponse);
@@ -383,7 +391,7 @@ public void ProcessedTransactionResponseTest() {
      */
     @Test
     public void ActionTraceTest() {
-        String jsonContent = "{\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}";
+        String jsonContent = "{\"action_ordinal\":\"1\",\"creator_action_ordinal\":\"1\",\"closest_unnotified_ancestor_action_ordinal\":\"1\",\"receiver\":\"test\",\"producer_block_id\":\"test\",\"account_ram_deltas\":{},\"account_disk_deltas\":{},\"except\":\"test\",\"error_code\":\"test\",\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}";
         String deserializedReturnValue = "test";
 
         // FromJSON test
@@ -392,7 +400,24 @@ public void ActionTraceTest() {
         actionTrace.setDeserializedReturnValue(deserializedReturnValue);
 
         assertNotNull(actionTrace);
-        assertEquals("000000000090b1ca", actionTrace.getHexReturnValue());
+        assertNotNull(actionTrace.getActionOrdinal());
+        assertNotNull(actionTrace.getCreatorActionOrdinal());
+        assertNotNull(actionTrace.getClosestUnnotifiedAncestorActionOrdinal());
+        assertNotNull(actionTrace.getReceipt());
+        assertNotNull(actionTrace.getReceiver());
+        assertNotNull(actionTrace.getAct());
+        assertNotNull(actionTrace.getContextFree());
+        assertNotNull(actionTrace.getElapsed());
+        assertNotNull(actionTrace.getConsole());
+        assertNotNull(actionTrace.getTransactionId());
+        assertNotNull(actionTrace.getBlockNumber());
+        assertNotNull(actionTrace.getBlockTime());
+        assertNotNull(actionTrace.getProducerBlockId());
+        assertNotNull(actionTrace.getAccountRamDeltas());
+        assertNotNull(actionTrace.getAccountDiskDeltas());
+        assertNotNull(actionTrace.getExcept());
+        assertNotNull(actionTrace.getErrorCode());
+        assertEquals("000000000090b1ca", actionTrace.getReturnValue());
         assertEquals(deserializedReturnValue, actionTrace.getDeserializedReturnValue());
         assertEquals("eosio.assert", actionTrace.getAccountName());
         assertEquals("require", actionTrace.getActionName());

From db02dd3fb06acaa6abd4258363aab27efde36e48 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 30 Jun 2020 09:50:28 -0400
Subject: [PATCH 13/45] Add comments

---
 .../main/java/one/block/eosiojava/models/abiProvider/Abi.java    | 1 +
 .../one/block/eosiojava/models/abiProvider/ActionResult.java     | 1 +
 2 files changed, 2 insertions(+)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
index 2b23c7f..9b97dcd 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -116,6 +116,7 @@ public class Abi {
     /**
      * Gets the return type of the specified action
      * @param actionName - action to check for return type
+     * @return the return type
      */
     public String getActionReturnTypeByActionName(String actionName) {
         if (this.actionResults.isEmpty()) {
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
index a415f76..28e8c9c 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
@@ -30,6 +30,7 @@ public class ActionResult {
 
     /**
      * Determines if this action's name matches
+     * @param actionName - the action name
      * @return true if action name matches; false otherwise
      */
     public Boolean hasActionName(String actionName) { return this.name.equals(actionName); }

From 5aab43f7b87f8f64a771c5be33f8d2de48c952e3 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 30 Jun 2020 10:18:52 -0400
Subject: [PATCH 14/45] Don't use stream

---
 .../one/block/eosiojava/models/abiProvider/Abi.java | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
index 9b97dcd..c07a12f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -119,15 +119,12 @@ public class Abi {
      * @return the return type
      */
     public String getActionReturnTypeByActionName(String actionName) {
-        if (this.actionResults.isEmpty()) {
-            return null;
+        for (ActionResult actionResult : actionResults) {
+            if (actionResult.hasActionName(actionName)) {
+                return actionResult.getReturnType();
+            }
         }
 
-        ActionResult actionResult = this.actionResults.stream()
-                                                      .filter(ar -> ar.hasActionName(actionName))
-                                                      .findFirst()
-                                                      .orElse(null);
-
-        return actionResult != null ? actionResult.getReturnType() : null;
+        return null;
     }
 }

From 92b7f363fb4937233d6678972210c88fff1637a9 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 30 Jun 2020 12:10:41 -0400
Subject: [PATCH 15/45] Add new error to throw instead of printing stack trace

---
 ...ionFormatPushTransactionResponseError.java | 25 +++++++++++++++++++
 .../response/PushTransactionResponse.java     |  1 -
 .../session/TransactionProcessor.java         |  8 +++---
 3 files changed, 30 insertions(+), 4 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionFormatPushTransactionResponseError.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionFormatPushTransactionResponseError.java b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionFormatPushTransactionResponseError.java
new file mode 100644
index 0000000..61b05dd
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionFormatPushTransactionResponseError.java
@@ -0,0 +1,25 @@
+package one.block.eosiojava.error.session;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Error class is used when there is an exception while attempting to call broadCast() of TransactionProcessor
+ */
+public class TransactionFormatPushTransactionResponseError extends TransactionProcessorError {
+
+    public TransactionFormatPushTransactionResponseError() {
+    }
+
+    public TransactionFormatPushTransactionResponseError(@NotNull String message) {
+        super(message);
+    }
+
+    public TransactionFormatPushTransactionResponseError(@NotNull String message,
+            @NotNull Exception exception) {
+        super(message, exception);
+    }
+
+    public TransactionFormatPushTransactionResponseError(@NotNull Exception exception) {
+        super(exception);
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
index cc7184f..2519c8a 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
@@ -3,7 +3,6 @@
 import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
 
 /**
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index b12ce5f..6bfd41e 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -27,6 +27,7 @@
 import one.block.eosiojava.error.session.TransactionCreateSignatureRequestRequiredKeysEmptyError;
 import one.block.eosiojava.error.session.TransactionCreateSignatureRequestRpcError;
 import one.block.eosiojava.error.session.TransactionCreateSignatureRequestSerializationError;
+import one.block.eosiojava.error.session.TransactionFormatPushTransactionResponseError;
 import one.block.eosiojava.error.session.TransactionGetSignatureDeserializationError;
 import one.block.eosiojava.error.session.TransactionGetSignatureError;
 import one.block.eosiojava.error.session.TransactionGetSignatureNotAllowModifyTransactionError;
@@ -508,19 +509,20 @@ public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroad
                 0, "", this.serializedTransaction);
         try {
             return formatPushTransactionResponse(this.pushTransaction(pushTransactionRequest));
-        } catch (TransactionPushTransactionError transactionPushTransactionError) {
+        } catch (TransactionPushTransactionError | TransactionFormatPushTransactionResponseError transactionPushTransactionError) {
             throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
         }
     }
 
-    private PushTransactionResponse formatPushTransactionResponse(PushTransactionResponse response) {
+    private PushTransactionResponse formatPushTransactionResponse(PushTransactionResponse response)
+            throws TransactionFormatPushTransactionResponseError {
         List<ActionTrace> actionTraces = response.getActionTraces();
         for (ActionTrace actionTrace : actionTraces) {
             try {
                 AbiEosSerializationObject deserializationObject = deserializeActionTraceReturnValue(actionTrace, chainId, abiProvider);
                 actionTrace.setDeserializedReturnValue(deserializationObject.getJson());
             } catch (DeserializeReturnValueError transactionCreateSignatureRequestError) {
-                transactionCreateSignatureRequestError.printStackTrace();
+                throw new TransactionFormatPushTransactionResponseError(transactionCreateSignatureRequestError);
             }
         }
         return response;

From 9393ec18d847ea252683f202851c12b06129cba4 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 2 Jul 2020 17:08:38 -0400
Subject: [PATCH 16/45] Add/update tests and comments.

---
 ...ransactionFormatPushTransactionResponseError.java |  3 ++-
 .../models/rpcProvider/response/ActionTrace.java     |  6 ++++++
 .../eosiojava/session/TransactionProcessor.java      | 12 +++++++-----
 .../test/java/one/block/eosiojava/RpcModelTest.java  |  2 ++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionFormatPushTransactionResponseError.java b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionFormatPushTransactionResponseError.java
index 61b05dd..7027400 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionFormatPushTransactionResponseError.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionFormatPushTransactionResponseError.java
@@ -3,7 +3,8 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Error class is used when there is an exception while attempting to call broadCast() of TransactionProcessor
+ * Error class is used when there is an exception while attempting to call
+ * formatPushTransactionResponse() of TransactionProcessor
  */
 public class TransactionFormatPushTransactionResponseError extends TransactionProcessorError {
 
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
index d5b5324..dd23e9b 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -243,6 +243,12 @@ public class ActionTrace {
      */
     public String getActionName() { return (String)this.act.get("name"); }
 
+    /**
+     * Determines whether or not there is a return value to deserialize
+     * @return true if there is a value; false otherwise
+     */
+    public Boolean hasReturnValue() { return !this.returnValue.isEmpty(); }
+
     /**
      * Sets the deserialized return value
      * @param deserializedReturnValue - the value to set to
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 6bfd41e..d3d2877 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -518,11 +518,13 @@ private PushTransactionResponse formatPushTransactionResponse(PushTransactionRes
             throws TransactionFormatPushTransactionResponseError {
         List<ActionTrace> actionTraces = response.getActionTraces();
         for (ActionTrace actionTrace : actionTraces) {
-            try {
-                AbiEosSerializationObject deserializationObject = deserializeActionTraceReturnValue(actionTrace, chainId, abiProvider);
-                actionTrace.setDeserializedReturnValue(deserializationObject.getJson());
-            } catch (DeserializeReturnValueError transactionCreateSignatureRequestError) {
-                throw new TransactionFormatPushTransactionResponseError(transactionCreateSignatureRequestError);
+            if (actionTrace.hasReturnValue()) {
+                try {
+                    AbiEosSerializationObject deserializationObject = deserializeActionTraceReturnValue(actionTrace, chainId, abiProvider);
+                    actionTrace.setDeserializedReturnValue(deserializationObject.getJson());
+                } catch (DeserializeReturnValueError transactionCreateSignatureRequestError) {
+                    throw new TransactionFormatPushTransactionResponseError(transactionCreateSignatureRequestError);
+                }
             }
         }
         return response;
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index f6c4b10..4f73840 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
@@ -19,6 +19,7 @@
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
 import one.block.eosiojava.models.rpcProvider.response.ProcessedTransactionResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
+import static junit.framework.TestCase.*;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -417,6 +418,7 @@ public void ActionTraceTest() {
         assertNotNull(actionTrace.getAccountDiskDeltas());
         assertNotNull(actionTrace.getExcept());
         assertNotNull(actionTrace.getErrorCode());
+        assertTrue(actionTrace.hasReturnValue());
         assertEquals("000000000090b1ca", actionTrace.getReturnValue());
         assertEquals(deserializedReturnValue, actionTrace.getDeserializedReturnValue());
         assertEquals("eosio.assert", actionTrace.getAccountName());

From 3bd6b12d4c3cc2c1b06c3b7af5574510b24206fb Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 7 Jul 2020 13:34:53 -0400
Subject: [PATCH 17/45] Update README with struct serialization/deserialization
 and 0.1.3 features

---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 464dea3..d997292 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,10 @@ To date, EOSIO SDK for Java has only been tested on Android. The goal, however,
 
 ## Updates
 
+7/7/20
+
+Version 0.1.3 Allows for deserialization of action return value structs.
+
 2/25/20
 
 Version 0.1.2 Uses JDK11 to build and targets 1.8 for source and target compatibility.
@@ -148,7 +152,7 @@ EOSIO SDK for Java _does not include_ an RPC provider implementation; one must b
 
 ### Serialization Provider Protocol
 
-The Serialization Provider is responsible for ABI-driven transaction and action serialization and deserialization between JSON and binary data representations. These implementations often contain platform-sensitive C++ code and larger dependencies. For those reasons, EOSIO SDK for Java _does not include_ a serialization provider implementation; one must be installed separately.
+The Serialization Provider is responsible for ABI-driven transaction, action, and struct serialization and deserialization between JSON and binary data representations. These implementations often contain platform-sensitive C++ code and larger dependencies. For those reasons, EOSIO SDK for Java _does not include_ a serialization provider implementation; one must be installed separately.
 
 * [ISerializationProvider](eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java)
 * [ABIEOS Serialization Provider Implementation](https://github.com/EOSIO/eosio-java-android-abieos-serialization-provider) - Currently supports Android 6 (Marshmallow)+

From 15bb0b3bded80503aa58a46ba93b1c6640142710 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Wed, 8 Jul 2020 13:17:35 -0400
Subject: [PATCH 18/45] Overload constructor to pass null contract/action names
 when not needed

---
 .../models/AbiEosSerializationObject.java     | 12 +++++--
 .../session/TransactionProcessor.java         |  4 +--
 .../models/AbiEosSerializationObjectTest.java | 34 +++++++++++++++++++
 3 files changed, 45 insertions(+), 5 deletions(-)
 create mode 100644 eosiojava/src/test/java/one/block/eosiojava/models/AbiEosSerializationObjectTest.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java b/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
index 397ed51..17c5a94 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
@@ -141,7 +141,7 @@ public void setJson(@NotNull String json) {
     }
 
     /**
-     * Initialize AbiEosSerializationObject
+     * Initialize AbiEosSerializationObject.
      *
      * @param contract - the contract name.
      * @param name - the action name.
@@ -149,7 +149,7 @@ public void setJson(@NotNull String json) {
      * @param abi - the abi to use for conversion.
      */
     public AbiEosSerializationObject(@Nullable String contract,
-            @NotNull String name, @Nullable String type,
+            @Nullable String name, @Nullable String type,
             @NotNull String abi) {
         this.contract = contract;
         this.name = name;
@@ -157,4 +157,12 @@ public AbiEosSerializationObject(@Nullable String contract,
         this.abi = abi;
     }
 
+    /**
+     * Initialize AbiEosSerializationObject for use with type data only.
+     * @param type - the type name.
+     * @param abi - the abi to use for conversion.
+     */
+    public AbiEosSerializationObject(@NotNull String type, @NotNull String abi) {
+        this(null, null, type, abi);
+    }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 8d88478..67c592a 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1012,11 +1012,9 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
         }
 
         Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
-        String returnType = abi.getActionReturnTypeByActionName(actionTrace.getActionName());
 
         AbiEosSerializationObject actionAbiEosSerializationObject = new AbiEosSerializationObject(
-                actionTrace.getAccountName(), actionTrace.getActionName(),
-                returnType, actionAbiJSON);
+                abi.getActionReturnTypeByActionName(actionTrace.getActionName()), actionAbiJSON);
 
         // !!! At this step, the data field of the action is still in HEX format.
         actionAbiEosSerializationObject.setHex(actionTrace.getReturnValue());
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/AbiEosSerializationObjectTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/AbiEosSerializationObjectTest.java
new file mode 100644
index 0000000..c350f9c
--- /dev/null
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/AbiEosSerializationObjectTest.java
@@ -0,0 +1,34 @@
+package one.block.eosiojava.models;
+
+import org.junit.Test;
+import static junit.framework.TestCase.*;
+
+public class AbiEosSerializationObjectTest {
+    AbiEosSerializationObject serializationObject;
+
+    @Test
+    public void testCreateAbiEosSerializationObjectWithAllFields() {
+        String contractName = "contractName";
+        String actionName = "actionName";
+        String type = "type";
+        String abi = "abi";
+        this.serializationObject = new AbiEosSerializationObject(contractName, actionName, type, abi);
+
+        assertEquals(this.serializationObject.getContract(), contractName);
+        assertEquals(this.serializationObject.getName(), actionName);
+        assertEquals(this.serializationObject.getType(), type);
+        assertEquals(this.serializationObject.getAbi(), abi);
+    }
+
+    @Test
+    public void testCreateAbiEosSerializationObjectWithoutContractOrActionNameShouldDefaultToNull() {
+        String type = "type";
+        String abi = "abi";
+        this.serializationObject = new AbiEosSerializationObject(type, abi);
+
+        assertNull(this.serializationObject.getContract());
+        assertNull(this.serializationObject.getName());
+        assertEquals(this.serializationObject.getType(), type);
+        assertEquals(this.serializationObject.getAbi(), abi);
+    }
+}

From 5131d2c58b0c8ca09412839a7c27794989a7352d Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Wed, 8 Jul 2020 14:32:25 -0400
Subject: [PATCH 19/45] Add additional constructor for omit type

---
 .../models/AbiEosSerializationObject.java     | 11 +++++
 .../session/TransactionProcessor.java         |  3 +-
 .../models/AbiEosSerializationObjectTest.java | 41 +++++++++++--------
 3 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java b/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
index 17c5a94..bb5a868 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/AbiEosSerializationObject.java
@@ -157,6 +157,17 @@ public AbiEosSerializationObject(@Nullable String contract,
         this.abi = abi;
     }
 
+    /**
+     * Initialize AbiEosSerializationObject for use with action/transaction data only.
+     *
+     * @param contract - the contract name.
+     * @param name - the action name.
+     * @param abi - the abi to use for conversion.
+     */
+    public AbiEosSerializationObject(@NotNull String contract, @NotNull String name, @NotNull String abi) {
+        this(contract, name, null, abi);
+    }
+
     /**
      * Initialize AbiEosSerializationObject for use with type data only.
      * @param type - the type name.
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 67c592a..4a3e440 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -989,8 +989,7 @@ private AbiEosSerializationObject setupAbiEosSerializationObject(Action action,
         }
 
         AbiEosSerializationObject actionAbiEosSerializationObject = new AbiEosSerializationObject(
-                action.getAccount(), action.getName(),
-                null, actionAbiJSON);
+                action.getAccount(), action.getName(), actionAbiJSON);
         actionAbiEosSerializationObject.setHex("");
 
         // !!! At this step, the data field of the action is still in JSON format.
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/AbiEosSerializationObjectTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/AbiEosSerializationObjectTest.java
index c350f9c..a8aa3d5 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/AbiEosSerializationObjectTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/AbiEosSerializationObjectTest.java
@@ -4,31 +4,40 @@
 import static junit.framework.TestCase.*;
 
 public class AbiEosSerializationObjectTest {
-    AbiEosSerializationObject serializationObject;
+    private static final String CONTRACT_NAME = "contractName";
+    private static final String ACTION_NAME = "actionName";
+    private static final String TYPE = "type";
+    private static final String ABI = "abi";
+
+    private AbiEosSerializationObject serializationObject;
 
     @Test
     public void testCreateAbiEosSerializationObjectWithAllFields() {
-        String contractName = "contractName";
-        String actionName = "actionName";
-        String type = "type";
-        String abi = "abi";
-        this.serializationObject = new AbiEosSerializationObject(contractName, actionName, type, abi);
-
-        assertEquals(this.serializationObject.getContract(), contractName);
-        assertEquals(this.serializationObject.getName(), actionName);
-        assertEquals(this.serializationObject.getType(), type);
-        assertEquals(this.serializationObject.getAbi(), abi);
+        this.serializationObject = new AbiEosSerializationObject(CONTRACT_NAME, ACTION_NAME, TYPE, ABI);
+
+        assertEquals(this.serializationObject.getContract(), CONTRACT_NAME);
+        assertEquals(this.serializationObject.getName(), ACTION_NAME);
+        assertEquals(this.serializationObject.getType(), TYPE);
+        assertEquals(this.serializationObject.getAbi(), ABI);
+    }
+
+    @Test
+    public void testCreateAbiEosSerializationObjectWithoutTypeShouldDefaultToNull() {
+        this.serializationObject = new AbiEosSerializationObject(CONTRACT_NAME, ACTION_NAME, ABI);
+
+        assertEquals(this.serializationObject.getContract(), CONTRACT_NAME);
+        assertEquals(this.serializationObject.getName(), ACTION_NAME);
+        assertNull(this.serializationObject.getType());
+        assertEquals(this.serializationObject.getAbi(), ABI);
     }
 
     @Test
     public void testCreateAbiEosSerializationObjectWithoutContractOrActionNameShouldDefaultToNull() {
-        String type = "type";
-        String abi = "abi";
-        this.serializationObject = new AbiEosSerializationObject(type, abi);
+        this.serializationObject = new AbiEosSerializationObject(TYPE, ABI);
 
         assertNull(this.serializationObject.getContract());
         assertNull(this.serializationObject.getName());
-        assertEquals(this.serializationObject.getType(), type);
-        assertEquals(this.serializationObject.getAbi(), abi);
+        assertEquals(this.serializationObject.getType(), TYPE);
+        assertEquals(this.serializationObject.getAbi(), ABI);
     }
 }

From 6d905d2f4bca9959226557b66c91f74ec9f62d23 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 13 Jul 2020 13:24:39 -0400
Subject: [PATCH 20/45] Begin adding deserialization of queries

---
 .../session/TransactionProcessor.java         | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 4a3e440..11fd46f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1204,5 +1204,41 @@ public ContextFreeData getContextFreeData() {
         return this.contextFreeData;
     }
 
+    public deserializeQueryItData() {
+        String queryItName = "queryit";
+        String returnType = "";
+        String returnHex = "";
+        String actionAbiJSON;
+        try {
+            actionAbiJSON = abiProvider
+                    .getAbi(this.chainId, new EOSIOName(queryItName));
+        } catch (GetAbiError getAbiError) {
+            throw new TransactionCreateSignatureRequestAbiError(
+                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_GET_ABI_ERROR,
+                            queryItName), getAbiError);
+        }
+
+        Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
+        AbiEosSerializationObject queryitAbiEosSerializationObject = new AbiEosSerializationObject(
+                returnType, actionAbiJSON);
+
+        // !!! At this step, the data field of the action is still in HEX format.
+        queryitAbiEosSerializationObject.setHex(returnHex);
+
+        try {
+            this.serializationProvider.deserialize(queryitAbiEosSerializationObject);
+            if (actionAbiEosSerializationObject.getJson().isEmpty()) {
+                throw new DeserializeReturnValueError(
+                        ErrorConstants.TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_EMPTY);
+            }
+        } catch (DeserializeError | DeserializeReturnValueError deserializeError) {
+            throw new DeserializeReturnValueError(
+                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_ERROR,
+                            queryItName), deserializeError);
+        }
+
+        return queryitAbiEosSerializationObject;
+    }
+
     //endregion
 }

From 15a7cdd187c12aa1bd59d9d3a12e3312db707594 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 14 Jul 2020 10:33:57 -0400
Subject: [PATCH 21/45] Begin adding query

---
 .../one/block/eosiojava/models/rpcProvider/Query.java    | 3 +++
 .../block/eosiojava/session/TransactionProcessor.java    | 9 +++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java
new file mode 100644
index 0000000..2dc463e
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java
@@ -0,0 +1,3 @@
+public class Query implements Serializable {
+    
+}
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 11fd46f..96dc9f8 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1204,7 +1204,7 @@ public ContextFreeData getContextFreeData() {
         return this.contextFreeData;
     }
 
-    public deserializeQueryItData() {
+    public AbiEosSerializationObject deserializeQueryItData() throws TransactionCreateSignatureRequestAbiError, DeserializeReturnValueError {
         String queryItName = "queryit";
         String returnType = "";
         String returnHex = "";
@@ -1227,7 +1227,7 @@ public deserializeQueryItData() {
 
         try {
             this.serializationProvider.deserialize(queryitAbiEosSerializationObject);
-            if (actionAbiEosSerializationObject.getJson().isEmpty()) {
+            if (queryitAbiEosSerializationObject.getJson().isEmpty()) {
                 throw new DeserializeReturnValueError(
                         ErrorConstants.TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_EMPTY);
             }
@@ -1240,5 +1240,10 @@ public deserializeQueryItData() {
         return queryitAbiEosSerializationObject;
     }
 
+    public Action getQueryItAction(String account, Query query) {
+        Action action = new Action("eosio.token", "transfer", new ArrayList<>(), jsonData);
+        return new Action("account", "name", );
+    }
+
     //endregion
 }

From f992b3c15afa1eec0ef2c65e07b114a33d7b664f Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 14 Jul 2020 11:21:32 -0400
Subject: [PATCH 22/45] Setup for sendTransaction

---
 .idea/codeStyles/Project.xml                  |  25 ----
 .../rpcProvider/SendTransactionRpcError.java  |  26 ++++
 .../eosiojava/interfaces/IRPCProvider.java    |  13 ++
 .../eosiojava/models/rpcProvider/Query.java   |  20 ++-
 .../request/PushTransactionRequest.java       | 120 ++--------------
 .../request/SendTransactionRequest.java       |  23 +++
 .../request/TransactionRequest.java           | 131 ++++++++++++++++++
 .../response/PushTransactionResponse.java     |  41 +-----
 .../response/SendTransactionResponse.java     |  11 ++
 .../response/TransactionResponse.java         |  48 +++++++
 .../session/TransactionProcessor.java         |  88 ++++++++++--
 11 files changed, 360 insertions(+), 186 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/error/rpcProvider/SendTransactionRpcError.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/SendTransactionRequest.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/TransactionRequest.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/SendTransactionResponse.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/TransactionResponse.java

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 0dfe6eb..84b449b 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -7,9 +7,7 @@
         <option name="TAB_SIZE" value="2" />
       </value>
     </option>
-    <option name="RIGHT_MARGIN" value="100" />
     <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
       <option name="LAYOUT_SETTINGS">
         <value>
           <option name="INSERT_BLANK_LINE_BEFORE_TAG" value="false" />
@@ -23,9 +21,6 @@
       <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
       <option name="IMPORT_LAYOUT_TABLE">
         <value>
           <package name="" withSubpackages="true" static="true" />
@@ -55,25 +50,6 @@
       <option name="SPACE_BEFORE_SUPERCLASS_COLON" value="false" />
     </Objective-C>
     <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
       <extensions>
         <pair source="cc" header="h" fileNamingConvention="NONE" />
         <pair source="c" header="h" fileNamingConvention="NONE" />
@@ -83,7 +59,6 @@
       <option name="INDENT_CHAINED_CALLS" value="false" />
     </TypeScriptCodeStyleSettings>
     <XML>
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
       <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
     </XML>
     <codeStyleSettings language="CSS">
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/rpcProvider/SendTransactionRpcError.java b/eosiojava/src/main/java/one/block/eosiojava/error/rpcProvider/SendTransactionRpcError.java
new file mode 100644
index 0000000..2ad91d0
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/rpcProvider/SendTransactionRpcError.java
@@ -0,0 +1,26 @@
+package one.block.eosiojava.error.rpcProvider;
+
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Error class is used when there is an exception while attempting to use the RPC call,
+ * sendTransaction().
+ */
+public class SendTransactionRpcError extends RpcProviderError {
+
+    public SendTransactionRpcError() {
+    }
+
+    public SendTransactionRpcError(@NotNull String message) {
+        super(message);
+    }
+
+    public SendTransactionRpcError(@NotNull String message,
+            @NotNull Exception exception) {
+        super(message, exception);
+    }
+
+    public SendTransactionRpcError(@NotNull Exception exception) {
+        super(exception);
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java
index da865ed..c91c864 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java
@@ -5,10 +5,12 @@
 import one.block.eosiojava.error.rpcProvider.GetRawAbiRpcError;
 import one.block.eosiojava.error.rpcProvider.GetRequiredKeysRpcError;
 import one.block.eosiojava.error.rpcProvider.PushTransactionRpcError;
+import one.block.eosiojava.error.rpcProvider.SendTransactionRpcError;
 import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRawAbiRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
+import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.rpcProvider.response.GetBlockResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRawAbiResponse;
@@ -74,4 +76,15 @@ public interface IRPCProvider {
      */
     @NotNull
     PushTransactionResponse pushTransaction(PushTransactionRequest pushTransactionRequest) throws PushTransactionRpcError;
+
+    /**
+     * This method expects a transaction in JSON format and will attempt to apply it to the blockchain.
+     *
+     * @param sendTransactionRequest the transaction to push with signatures.
+     * @return the push transaction response
+     * @throws SendTransactionRpcError thrown if there are any exceptions/backend error during the
+     * sendTransaction() process.
+     */
+    @NotNull
+    PushTransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest) throws SendTransactionRpcError;
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java
index 2dc463e..4131a9a 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java
@@ -1,3 +1,21 @@
+package one.block.eosiojava.models.rpcProvider;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+
 public class Query implements Serializable {
-    
+    private String account;
+    private String data;
+
+    public String getData() {
+        return this.data;
+    }
+
+    public String getAccount() {
+        return this.account;
+    }
+
+    public Action toAction() {
+        return new Action(this.getAccount(), "queryit", new ArrayList<>(), this.getData());
+    }
 }
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java
index 34f7a5d..57c6980 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java
@@ -2,39 +2,13 @@
 
 import com.google.gson.annotations.SerializedName;
 import java.util.List;
+import one.block.eosiojava.models.rpcProvider.Transaction;
 import org.jetbrains.annotations.NotNull;
 
 /**
  * The request of PushTransactionRequest RPC call {@link one.block.eosiojava.interfaces.IRPCProvider#pushTransaction(PushTransactionRequest)}
  */
-public class PushTransactionRequest {
-
-    /**
-     * List of signatures required to authorize transaction
-     */
-    @SerializedName("signatures")
-    @NotNull
-    private List<String> signatures;
-
-    /**
-     * The compression used, usually 0.
-     */
-    @SerializedName("compression")
-    private int compression;
-
-    /**
-     * Context free data in hex
-     */
-    @SerializedName("packed_context_free_data")
-    private String packagedContextFreeData;
-
-    /**
-     * The Pack Transaction (Serialized Transaction).
-     * <br> It is serialized version of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
-     */
-    @SerializedName("packed_trx")
-    @NotNull
-    private String packTrx;
+public class PushTransactionRequest extends TransactionRequest {
 
     /**
      * Instantiates a new PushTransactionRequest.
@@ -42,90 +16,12 @@ public class PushTransactionRequest {
      * @param signatures the list of signatures required to authorize transaction
      * @param compression the compression used, usually 0.
      * @param packagedContextFreeData the context free data in hex
-     * @param packTrx the packed Transaction (serialized transaction). It is serialized version
-     * of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
-     */
-    public PushTransactionRequest(@NotNull List<String> signatures, int compression,
-            String packagedContextFreeData, @NotNull String packTrx) {
-        this.signatures = signatures;
-        this.compression = compression;
-        this.packagedContextFreeData = packagedContextFreeData;
-        this.packTrx = packTrx;
-    }
-
-    /**
-     * Gets list of signatures required to authorize transaction.
-     *
-     * @return the list of signatures
-     */
-    @NotNull
-    public List<String> getSignatures() {
-        return signatures;
-    }
-
-    /**
-     * Sets list of signatures required to authorize transaction.
-     *
-     * @param signatures the list of signatures.
-     */
-    public void setSignatures(@NotNull List<String> signatures) {
-        this.signatures = signatures;
-    }
-
-    /**
-     * Gets the compression used, usually 0.
-     *
-     * @return the compression.
-     */
-    public int getCompression() {
-        return compression;
-    }
-
-    /**
-     * Sets the compression used, usually 0.
-     *
-     * @param compression the compression.
-     */
-    public void setCompression(int compression) {
-        this.compression = compression;
-    }
-
-    /**
-     * Gets packaged context free data in hex.
-     *
-     * @return the packaged context free data in hex.
-     */
-    public String getPackagedContextFreeData() {
-        return packagedContextFreeData;
-    }
-
-    /**
-     * Sets packaged context free data in hex
-     *
-     * @param packagedContextFreeData the packaged context free data in hex.
-     */
-    public void setPackagedContextFreeData(String packagedContextFreeData) {
-        this.packagedContextFreeData = packagedContextFreeData;
-    }
-
-    /**
-     * Gets the packed transaction (serialized transaction).
-     * <br> It is serialized version of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
-     *
-     * @return the Pack Transaction (Serialized Transaction).
-     */
-    @NotNull
-    public String getPackTrx() {
-        return packTrx;
-    }
-
-    /**
-     * Sets the packed transaction (serialized transaction).
-     * <br> It is the serialized version of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
-     *
-     * @param packTrx the packed transaction (serialized transaction).
+     * @param packTrx the packed Transaction (serialized transaction). It is serialized version of
+     * {@link Transaction}.
      */
-    public void setPackTrx(@NotNull String packTrx) {
-        this.packTrx = packTrx;
+    public PushTransactionRequest(
+            @NotNull List<String> signatures, int compression, String packagedContextFreeData,
+            @NotNull String packTrx) {
+        super(signatures, compression, packagedContextFreeData, packTrx);
     }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/SendTransactionRequest.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/SendTransactionRequest.java
new file mode 100644
index 0000000..fd75fb7
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/SendTransactionRequest.java
@@ -0,0 +1,23 @@
+package one.block.eosiojava.models.rpcProvider.request;
+
+import java.util.List;
+import one.block.eosiojava.models.rpcProvider.Transaction;
+import org.jetbrains.annotations.NotNull;
+
+public class SendTransactionRequest extends TransactionRequest {
+
+    /**
+     * Instantiates a new SendTransactionRequest.
+     *
+     * @param signatures the list of signatures required to authorize transaction
+     * @param compression the compression used, usually 0.
+     * @param packagedContextFreeData the context free data in hex
+     * @param packTrx the packed Transaction (serialized transaction). It is serialized version of
+     * {@link Transaction}.
+     */
+    public SendTransactionRequest(
+            @NotNull List<String> signatures, int compression,
+            String packagedContextFreeData, @NotNull String packTrx) {
+        super(signatures, compression, packagedContextFreeData, packTrx);
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/TransactionRequest.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/TransactionRequest.java
new file mode 100644
index 0000000..feac5e8
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/TransactionRequest.java
@@ -0,0 +1,131 @@
+package one.block.eosiojava.models.rpcProvider.request;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The base class for push/send transaction requests
+ */
+public class TransactionRequest {
+
+    /**
+     * List of signatures required to authorize transaction
+     */
+    @SerializedName("signatures")
+    @NotNull
+    private List<String> signatures;
+
+    /**
+     * The compression used, usually 0.
+     */
+    @SerializedName("compression")
+    private int compression;
+
+    /**
+     * Context free data in hex
+     */
+    @SerializedName("packed_context_free_data")
+    private String packagedContextFreeData;
+
+    /**
+     * The Pack Transaction (Serialized Transaction).
+     * <br> It is serialized version of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
+     */
+    @SerializedName("packed_trx")
+    @NotNull
+    private String packTrx;
+
+    /**
+     * Instantiates a new TransactionRequest.
+     *
+     * @param signatures the list of signatures required to authorize transaction
+     * @param compression the compression used, usually 0.
+     * @param packagedContextFreeData the context free data in hex
+     * @param packTrx the packed Transaction (serialized transaction). It is serialized version
+     * of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
+     */
+    public TransactionRequest(@NotNull List<String> signatures, int compression,
+            String packagedContextFreeData, @NotNull String packTrx) {
+        this.signatures = signatures;
+        this.compression = compression;
+        this.packagedContextFreeData = packagedContextFreeData;
+        this.packTrx = packTrx;
+    }
+
+    /**
+     * Gets list of signatures required to authorize transaction.
+     *
+     * @return the list of signatures
+     */
+    @NotNull
+    public List<String> getSignatures() {
+        return signatures;
+    }
+
+    /**
+     * Sets list of signatures required to authorize transaction.
+     *
+     * @param signatures the list of signatures.
+     */
+    public void setSignatures(@NotNull List<String> signatures) {
+        this.signatures = signatures;
+    }
+
+    /**
+     * Gets the compression used, usually 0.
+     *
+     * @return the compression.
+     */
+    public int getCompression() {
+        return compression;
+    }
+
+    /**
+     * Sets the compression used, usually 0.
+     *
+     * @param compression the compression.
+     */
+    public void setCompression(int compression) {
+        this.compression = compression;
+    }
+
+    /**
+     * Gets packaged context free data in hex.
+     *
+     * @return the packaged context free data in hex.
+     */
+    public String getPackagedContextFreeData() {
+        return packagedContextFreeData;
+    }
+
+    /**
+     * Sets packaged context free data in hex
+     *
+     * @param packagedContextFreeData the packaged context free data in hex.
+     */
+    public void setPackagedContextFreeData(String packagedContextFreeData) {
+        this.packagedContextFreeData = packagedContextFreeData;
+    }
+
+    /**
+     * Gets the packed transaction (serialized transaction).
+     * <br> It is serialized version of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
+     *
+     * @return the Pack Transaction (Serialized Transaction).
+     */
+    @NotNull
+    public String getPackTrx() {
+        return packTrx;
+    }
+
+    /**
+     * Sets the packed transaction (serialized transaction).
+     * <br> It is the serialized version of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
+     *
+     * @param packTrx the packed transaction (serialized transaction).
+     */
+    public void setPackTrx(@NotNull String packTrx) {
+        this.packTrx = packTrx;
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
index 2519c8a..e59a570 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
@@ -1,50 +1,11 @@
 package one.block.eosiojava.models.rpcProvider.response;
 
-import com.google.gson.annotations.SerializedName;
-import java.util.ArrayList;
-import java.util.List;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
 
 /**
  * The response of the pushTransaction() RPC call
  * {@link one.block.eosiojava.interfaces.IRPCProvider#pushTransaction(PushTransactionRequest)}
  */
-public class PushTransactionResponse {
+public class PushTransactionResponse extends TransactionResponse {
 
-    /**
-     * The transaction id of the successful transaction.
-     */
-    @SerializedName("transaction_id")
-    private String transactionId;
-
-    /**
-     * The processed transaction
-     */
-    @SerializedName("processed")
-    private ProcessedTransactionResponse transactionResponse;
-
-    /**
-     * Gets the transaction id of the successful transaction.
-     *
-     * @return The successful transaction id.
-     */
-    public String getTransactionId() {
-        return transactionId;
-    }
-
-    /**
-     * Gets the processed transaction
-     *
-     * @return the processed transaction
-     */
-    public ProcessedTransactionResponse getProcessed() {
-        return transactionResponse;
-    }
-
-    /**
-     * Gets the processed transaction's action traces
-     *
-     * @return the processed transaction's action traces
-     */
-    public List<ActionTrace> getActionTraces() { return transactionResponse != null ? transactionResponse.getActionTraces() : new ArrayList<>(); }
 }
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/SendTransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/SendTransactionResponse.java
new file mode 100644
index 0000000..4578d01
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/SendTransactionResponse.java
@@ -0,0 +1,11 @@
+package one.block.eosiojava.models.rpcProvider.response;
+
+import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
+
+/**
+ * The response of the sendTransaction() RPC call
+ * {@link one.block.eosiojava.interfaces.IRPCProvider#sendTransaction(SendTransactionRequest)}
+ */
+public class SendTransactionResponse extends TransactionResponse {
+
+}
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/TransactionResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/TransactionResponse.java
new file mode 100644
index 0000000..f0b1119
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/TransactionResponse.java
@@ -0,0 +1,48 @@
+package one.block.eosiojava.models.rpcProvider.response;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The base class for push/send transaction responses
+ */
+public class TransactionResponse {
+
+    /**
+     * The transaction id of the successful transaction.
+     */
+    @SerializedName("transaction_id")
+    private String transactionId;
+
+    /**
+     * The processed transaction
+     */
+    @SerializedName("processed")
+    private ProcessedTransactionResponse transactionResponse;
+
+    /**
+     * Gets the transaction id of the successful transaction.
+     *
+     * @return The successful transaction id.
+     */
+    public String getTransactionId() {
+        return transactionId;
+    }
+
+    /**
+     * Gets the processed transaction
+     *
+     * @return the processed transaction
+     */
+    public ProcessedTransactionResponse getProcessed() {
+        return transactionResponse;
+    }
+
+    /**
+     * Gets the processed transaction's action traces
+     *
+     * @return the processed transaction's action traces
+     */
+    public List<ActionTrace> getActionTraces() { return transactionResponse != null ? transactionResponse.getActionTraces() : new ArrayList<>(); }
+}
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 96dc9f8..3c4ce9e 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -6,6 +6,7 @@
 import java.math.BigInteger;
 import java.text.ParseException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import one.block.eosiojava.error.ErrorConstants;
 import one.block.eosiojava.error.abiProvider.GetAbiError;
@@ -47,6 +48,7 @@
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
 import one.block.eosiojava.models.abiProvider.Abi;
+import one.block.eosiojava.models.rpcProvider.Query;
 import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
@@ -1204,6 +1206,26 @@ public ContextFreeData getContextFreeData() {
         return this.contextFreeData;
     }
 
+    // Probably not necessary
+    public AbiEosSerializationObject serializeQuery(String account, Query query)
+            throws TransactionCreateSignatureRequestSerializationError, TransactionCreateSignatureRequestAbiError {
+        Action queryItAction = query.toAction();
+        AbiEosSerializationObject actionAbiEosSerializationObject = setupAbiEosSerializationObject(queryItAction, chainId, abiProvider);
+
+        try {
+            if (queryItAction.hasData()) {
+                this.serializationProvider.serialize(actionAbiEosSerializationObject);
+            }
+        } catch (SerializeError serializeError) {
+            throw new TransactionCreateSignatureRequestSerializationError(
+                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_ERROR,
+                            queryItAction.getAccount()), serializeError);
+        }
+
+        return actionAbiEosSerializationObject;
+    }
+
+    // Necessary?
     public AbiEosSerializationObject deserializeQueryItData() throws TransactionCreateSignatureRequestAbiError, DeserializeReturnValueError {
         String queryItName = "queryit";
         String returnType = "";
@@ -1219,15 +1241,15 @@ public AbiEosSerializationObject deserializeQueryItData() throws TransactionCrea
         }
 
         Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
-        AbiEosSerializationObject queryitAbiEosSerializationObject = new AbiEosSerializationObject(
+        AbiEosSerializationObject queryItAbiEosSerializationObject = new AbiEosSerializationObject(
                 returnType, actionAbiJSON);
 
         // !!! At this step, the data field of the action is still in HEX format.
-        queryitAbiEosSerializationObject.setHex(returnHex);
+        queryItAbiEosSerializationObject.setHex(returnHex);
 
         try {
-            this.serializationProvider.deserialize(queryitAbiEosSerializationObject);
-            if (queryitAbiEosSerializationObject.getJson().isEmpty()) {
+            this.serializationProvider.deserialize(queryItAbiEosSerializationObject);
+            if (queryItAbiEosSerializationObject.getJson().isEmpty()) {
                 throw new DeserializeReturnValueError(
                         ErrorConstants.TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_EMPTY);
             }
@@ -1237,12 +1259,62 @@ public AbiEosSerializationObject deserializeQueryItData() throws TransactionCrea
                             queryItName), deserializeError);
         }
 
-        return queryitAbiEosSerializationObject;
+        return queryItAbiEosSerializationObject;
     }
 
-    public Action getQueryItAction(String account, Query query) {
-        Action action = new Action("eosio.token", "transfer", new ArrayList<>(), jsonData);
-        return new Action("account", "name", );
+    public void prepareQuery(Query query) throws TransactionPrepareError {
+        this.prepare(Collections.singletonList(query.toAction()));
+    }
+
+    /**
+     * Sign and broadcast the transaction and signature/s to chain
+     *
+     * @return PushTransactionResponse from blockchain.
+     * @throws TransactionSignAndBroadCastError thrown under the following conditions:
+     *      <br>
+     *          - Exception while creating signature. Cause: {@link TransactionCreateSignatureRequestError}
+     *      <br>
+     *          - Exception while signing. Cause: {@link TransactionGetSignatureError} or {@link SignatureProviderError}
+     *      <br>
+     *          - The transaction has not been prepared or serialized yet.
+     *      <br>
+     *          - The transaction has not been signed yet (no signature).
+     *      <br>
+     *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
+     */
+    @NotNull
+    public PushTransactionResponse signAndBroadcastQuery() throws TransactionSignAndBroadCastError {
+        EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
+        try {
+            eosioTransactionSignatureRequest = this.createSignatureRequest();
+        } catch (TransactionCreateSignatureRequestError transactionCreateSignatureRequestError) {
+            throw new TransactionSignAndBroadCastError(transactionCreateSignatureRequestError);
+        }
+
+        try {
+            this.getSignature(eosioTransactionSignatureRequest);
+        } catch (TransactionGetSignatureError transactionGetSignatureError) {
+            throw new TransactionSignAndBroadCastError(transactionGetSignatureError);
+        }
+
+        if (this.serializedTransaction == null || this.serializedTransaction.isEmpty()) {
+            throw new TransactionSignAndBroadCastError(
+                    ErrorConstants.TRANSACTION_PROCESSOR_SIGN_BROADCAST_SERIALIZED_TRANSACTION_EMPTY);
+        }
+
+        if (this.signatures.isEmpty()) {
+            throw new TransactionSignAndBroadCastError(
+                    ErrorConstants.TRANSACTION_PROCESSOR_SIGN_BROADCAST_SIGN_EMPTY);
+        }
+
+        // Signatures and serializedTransaction are assigned and finalized in getSignature() method
+        PushTransactionRequest pushTransactionRequest = new PushTransactionRequest(this.signatures,
+                0, this.contextFreeData.getHexed(), this.serializedTransaction);
+        try {
+            return formatPushTransactionResponse(this.pushTransaction(pushTransactionRequest));
+        } catch (TransactionPushTransactionError | TransactionFormatPushTransactionResponseError transactionPushTransactionError) {
+            throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
+        }
     }
 
     //endregion

From 84043dace1c102ca41531b1934f4fc6bddaf7ea5 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 14 Jul 2020 11:35:06 -0400
Subject: [PATCH 23/45] Update rpcProvider

---
 .../eosiojava/interfaces/IRPCProvider.java    |  5 ++-
 .../session/TransactionProcessor.java         | 39 +++++++++++++++----
 2 files changed, 35 insertions(+), 9 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java
index c91c864..7dd43e6 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java
@@ -16,6 +16,7 @@
 import one.block.eosiojava.models.rpcProvider.response.GetRawAbiResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
+import one.block.eosiojava.models.rpcProvider.response.SendTransactionResponse;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -81,10 +82,10 @@ public interface IRPCProvider {
      * This method expects a transaction in JSON format and will attempt to apply it to the blockchain.
      *
      * @param sendTransactionRequest the transaction to push with signatures.
-     * @return the push transaction response
+     * @return the send transaction response
      * @throws SendTransactionRpcError thrown if there are any exceptions/backend error during the
      * sendTransaction() process.
      */
     @NotNull
-    PushTransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest) throws SendTransactionRpcError;
+    SendTransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest) throws SendTransactionRpcError;
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 3c4ce9e..1b738d9 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -14,6 +14,7 @@
 import one.block.eosiojava.error.rpcProvider.GetInfoRpcError;
 import one.block.eosiojava.error.rpcProvider.GetRequiredKeysRpcError;
 import one.block.eosiojava.error.rpcProvider.PushTransactionRpcError;
+import one.block.eosiojava.error.rpcProvider.SendTransactionRpcError;
 import one.block.eosiojava.error.serializationProvider.DeserializeError;
 import one.block.eosiojava.error.serializationProvider.DeserializeReturnValueError;
 import one.block.eosiojava.error.serializationProvider.DeserializeTransactionError;
@@ -49,6 +50,7 @@
 import one.block.eosiojava.interfaces.ISignatureProvider;
 import one.block.eosiojava.models.abiProvider.Abi;
 import one.block.eosiojava.models.rpcProvider.Query;
+import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
@@ -63,6 +65,8 @@
 import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
+import one.block.eosiojava.models.rpcProvider.response.SendTransactionResponse;
+import one.block.eosiojava.models.rpcProvider.response.TransactionResponse;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureRequest;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureResponse;
 import one.block.eosiojava.utilities.DateFormatter;
@@ -521,7 +525,7 @@ public PushTransactionResponse broadcast() throws TransactionBroadCastError {
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
     @NotNull
-    public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
+    public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
         EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
         try {
             eosioTransactionSignatureRequest = this.createSignatureRequest();
@@ -555,7 +559,7 @@ public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroad
         }
     }
 
-    private PushTransactionResponse formatPushTransactionResponse(PushTransactionResponse response)
+    private TransactionResponse formatPushTransactionResponse(TransactionResponse response)
             throws TransactionFormatPushTransactionResponseError {
         List<ActionTrace> actionTraces = response.getActionTraces();
         for (ActionTrace actionTrace : actionTraces) {
@@ -1225,8 +1229,8 @@ public AbiEosSerializationObject serializeQuery(String account, Query query)
         return actionAbiEosSerializationObject;
     }
 
-    // Necessary?
-    public AbiEosSerializationObject deserializeQueryItData() throws TransactionCreateSignatureRequestAbiError, DeserializeReturnValueError {
+    // Necessary? Could just use return value
+    public AbiEosSerializationObject deserializeQueryItData(Query query) throws TransactionCreateSignatureRequestAbiError, DeserializeReturnValueError {
         String queryItName = "queryit";
         String returnType = "";
         String returnHex = "";
@@ -1282,8 +1286,9 @@ public void prepareQuery(Query query) throws TransactionPrepareError {
      *      <br>
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
+    // DO WE EVEN NEED THIS? Switch to just use send_transaction altogether?
     @NotNull
-    public PushTransactionResponse signAndBroadcastQuery() throws TransactionSignAndBroadCastError {
+    public TransactionResponse signAndBroadcastQuery() throws TransactionSignAndBroadCastError {
         EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
         try {
             eosioTransactionSignatureRequest = this.createSignatureRequest();
@@ -1308,14 +1313,34 @@ public PushTransactionResponse signAndBroadcastQuery() throws TransactionSignAnd
         }
 
         // Signatures and serializedTransaction are assigned and finalized in getSignature() method
-        PushTransactionRequest pushTransactionRequest = new PushTransactionRequest(this.signatures,
+        SendTransactionRequest sendTransactionRequest = new SendTransactionRequest(this.signatures,
                 0, this.contextFreeData.getHexed(), this.serializedTransaction);
         try {
-            return formatPushTransactionResponse(this.pushTransaction(pushTransactionRequest));
+            return formatPushTransactionResponse(this.sendTransaction(sendTransactionRequest));
         } catch (TransactionPushTransactionError | TransactionFormatPushTransactionResponseError transactionPushTransactionError) {
             throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
         }
     }
 
+    /**
+     * Send signed transaction to blockchain.
+     * <p>
+     * Check sendTransaction() flow in "Complete Workflow" document for more details.
+     *
+     * @param sendTransactionRequest the request
+     * @return Response from chain
+     */
+    @NotNull
+    private TransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest)
+            throws TransactionPushTransactionError {
+        try {
+            return this.rpcProvider.sendTransaction(sendTransactionRequest);
+        } catch (SendTransactionRpcError pushTransactionRpcError) {
+            throw new TransactionPushTransactionError(
+                    ErrorConstants.TRANSACTION_PROCESSOR_RPC_PUSH_TRANSACTION,
+                    pushTransactionRpcError);
+        }
+    }
+
     //endregion
 }

From 4d89322d7a83f92ab26543d77c3a935e863f9ce3 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Wed, 15 Jul 2020 18:02:16 -0400
Subject: [PATCH 24/45] Working towards getting proper return type to
 deserialize.

---
 .../eosiojava/models/abiProvider/Abi.java     |  14 +-
 .../eosiojava/models/abiProvider/Variant.java |  37 ++++
 .../eosiojava/models/rpcProvider/Query.java   |  21 ---
 .../rpcProvider/response/ActionTrace.java     |   5 +
 .../session/TransactionProcessor.java         | 163 +++++-------------
 .../one/block/eosiojava/AbiModelTest.java     |  12 ++
 6 files changed, 112 insertions(+), 140 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Variant.java
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
index c07a12f..1dd587e 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -51,7 +51,7 @@ public class Abi {
      * The variants
      */
     @SerializedName("variants")
-    private List<Map> variants;
+    private List<Variant> variants;
 
     /**
      * The action results
@@ -105,7 +105,7 @@ public class Abi {
      * Gets the variants
      * @return the variants
      */
-    public List<Map> getVariants() { return this.variants; }
+    public List<Variant> getVariants() { return this.variants; }
 
     /**
      * Gets the actionResults
@@ -127,4 +127,14 @@ public String getActionReturnTypeByActionName(String actionName) {
 
         return null;
     }
+
+    public List<String> getVariantTypesByName(String variantName) {
+        for (Variant variant : variants) {
+            if (variant.hasName(variantName)) {
+                return variant.getTypes();
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Variant.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Variant.java
new file mode 100644
index 0000000..fc7b0d2
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Variant.java
@@ -0,0 +1,37 @@
+package one.block.eosiojava.models.abiProvider;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.List;
+
+public class Variant {
+    /**
+     * The name
+     */
+    @SerializedName("name")
+    private String name;
+
+    /**
+     * The types
+     */
+    @SerializedName("types")
+    private List<String> types;
+
+    /**
+     * Gets the name
+     * @return the name
+     */
+    public String getName() { return this.name; }
+
+    /**
+     * Gets the types
+     * @return the types
+     */
+    public List<String> getTypes() { return this.types; }
+
+    /**
+     *
+     * @param variantName the variant name
+     * @return true if this variant's name equals value looking for
+     */
+    public Boolean hasName(String variantName) { return this.name.equals(variantName); }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java
deleted file mode 100644
index 4131a9a..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Query.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package one.block.eosiojava.models.rpcProvider;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-
-public class Query implements Serializable {
-    private String account;
-    private String data;
-
-    public String getData() {
-        return this.data;
-    }
-
-    public String getAccount() {
-        return this.account;
-    }
-
-    public Action toAction() {
-        return new Action(this.getAccount(), "queryit", new ArrayList<>(), this.getData());
-    }
-}
\ No newline at end of file
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
index dd23e9b..ee33f92 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -4,6 +4,9 @@
 import java.util.Map;
 
 public class ActionTrace {
+
+    private static final String QUERY_IT_ACTION_NAME = "queryit";
+
     /**
      * The actionOrdinal
      */
@@ -249,6 +252,8 @@ public class ActionTrace {
      */
     public Boolean hasReturnValue() { return !this.returnValue.isEmpty(); }
 
+    public Boolean isQueryItAction() { return this.getActionName() == QUERY_IT_ACTION_NAME; }
+
     /**
      * Sets the deserialized return value
      * @param deserializedReturnValue - the value to set to
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 1b738d9..4e86876 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -6,7 +6,7 @@
 import java.math.BigInteger;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 import one.block.eosiojava.error.ErrorConstants;
 import one.block.eosiojava.error.abiProvider.GetAbiError;
@@ -49,7 +49,6 @@
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
 import one.block.eosiojava.models.abiProvider.Abi;
-import one.block.eosiojava.models.rpcProvider.Query;
 import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.AbiEosSerializationObject;
@@ -525,7 +524,7 @@ public PushTransactionResponse broadcast() throws TransactionBroadCastError {
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
     @NotNull
-    public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
+    public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
         EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
         try {
             eosioTransactionSignatureRequest = this.createSignatureRequest();
@@ -559,7 +558,7 @@ public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCast
         }
     }
 
-    private TransactionResponse formatPushTransactionResponse(TransactionResponse response)
+    private PushTransactionResponse formatPushTransactionResponse(PushTransactionResponse response)
             throws TransactionFormatPushTransactionResponseError {
         List<ActionTrace> actionTraces = response.getActionTraces();
         for (ActionTrace actionTrace : actionTraces) {
@@ -1016,9 +1015,23 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
                             actionTrace.getAccountName()), getAbiError);
         }
 
+        AbiEosSerializationObject actionAbiEosSerializationObject;
+
+//        if (actionTrace.isQueryItAction()) {
+//            // Figure out how to get the query-it return type
+//            String queryItReturnType = "some-return-type";
+//            actionAbiEosSerializationObject = new AbiEosSerializationObject(
+//                    queryItReturnType, actionAbiJSON);
+//        } else {
+//            Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
+//
+//            actionAbiEosSerializationObject = new AbiEosSerializationObject(
+//                    abi.getActionReturnTypeByActionName(actionTrace.getActionName()), actionAbiJSON);
+//        }
+
         Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
 
-        AbiEosSerializationObject actionAbiEosSerializationObject = new AbiEosSerializationObject(
+        actionAbiEosSerializationObject = new AbiEosSerializationObject(
                 abi.getActionReturnTypeByActionName(actionTrace.getActionName()), actionAbiJSON);
 
         // !!! At this step, the data field of the action is still in HEX format.
@@ -1039,6 +1052,34 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
         return actionAbiEosSerializationObject;
     }
 
+    private String getQueryItReturnType(String returnValue, Abi abi) {
+        // Can also get these types by getting the ABI and then calling abi.
+        List<String> queryItTypes = abi.getVariantTypesByName("anyvar");
+//        ArrayList<String> queryItTypes = new ArrayList<String>(Arrays.asList(
+//                "null_t",
+//                "int64",
+//                "uint64",
+//                "int32",
+//                "uint32",
+//                "int16",
+//                "uint16",
+//                "int8",
+//                "uint8",
+//                "time_point",
+//                "checksum256",
+//                "float64",
+//                "string",
+//                "any_object",
+//                "any_array",
+//                "bytes",
+//                "symbol",
+//                "symbol_code",
+//                "asset"
+//        ));
+
+        return "test";
+    }
+
     /**
      * Getting deep clone of the transaction
      */
@@ -1210,118 +1251,6 @@ public ContextFreeData getContextFreeData() {
         return this.contextFreeData;
     }
 
-    // Probably not necessary
-    public AbiEosSerializationObject serializeQuery(String account, Query query)
-            throws TransactionCreateSignatureRequestSerializationError, TransactionCreateSignatureRequestAbiError {
-        Action queryItAction = query.toAction();
-        AbiEosSerializationObject actionAbiEosSerializationObject = setupAbiEosSerializationObject(queryItAction, chainId, abiProvider);
-
-        try {
-            if (queryItAction.hasData()) {
-                this.serializationProvider.serialize(actionAbiEosSerializationObject);
-            }
-        } catch (SerializeError serializeError) {
-            throw new TransactionCreateSignatureRequestSerializationError(
-                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_SERIALIZE_ACTION_ERROR,
-                            queryItAction.getAccount()), serializeError);
-        }
-
-        return actionAbiEosSerializationObject;
-    }
-
-    // Necessary? Could just use return value
-    public AbiEosSerializationObject deserializeQueryItData(Query query) throws TransactionCreateSignatureRequestAbiError, DeserializeReturnValueError {
-        String queryItName = "queryit";
-        String returnType = "";
-        String returnHex = "";
-        String actionAbiJSON;
-        try {
-            actionAbiJSON = abiProvider
-                    .getAbi(this.chainId, new EOSIOName(queryItName));
-        } catch (GetAbiError getAbiError) {
-            throw new TransactionCreateSignatureRequestAbiError(
-                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_GET_ABI_ERROR,
-                            queryItName), getAbiError);
-        }
-
-        Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
-        AbiEosSerializationObject queryItAbiEosSerializationObject = new AbiEosSerializationObject(
-                returnType, actionAbiJSON);
-
-        // !!! At this step, the data field of the action is still in HEX format.
-        queryItAbiEosSerializationObject.setHex(returnHex);
-
-        try {
-            this.serializationProvider.deserialize(queryItAbiEosSerializationObject);
-            if (queryItAbiEosSerializationObject.getJson().isEmpty()) {
-                throw new DeserializeReturnValueError(
-                        ErrorConstants.TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_EMPTY);
-            }
-        } catch (DeserializeError | DeserializeReturnValueError deserializeError) {
-            throw new DeserializeReturnValueError(
-                    String.format(ErrorConstants.TRANSACTION_PROCESSOR_DESERIALIZE_RETURN_VALUE_ERROR,
-                            queryItName), deserializeError);
-        }
-
-        return queryItAbiEosSerializationObject;
-    }
-
-    public void prepareQuery(Query query) throws TransactionPrepareError {
-        this.prepare(Collections.singletonList(query.toAction()));
-    }
-
-    /**
-     * Sign and broadcast the transaction and signature/s to chain
-     *
-     * @return PushTransactionResponse from blockchain.
-     * @throws TransactionSignAndBroadCastError thrown under the following conditions:
-     *      <br>
-     *          - Exception while creating signature. Cause: {@link TransactionCreateSignatureRequestError}
-     *      <br>
-     *          - Exception while signing. Cause: {@link TransactionGetSignatureError} or {@link SignatureProviderError}
-     *      <br>
-     *          - The transaction has not been prepared or serialized yet.
-     *      <br>
-     *          - The transaction has not been signed yet (no signature).
-     *      <br>
-     *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
-     */
-    // DO WE EVEN NEED THIS? Switch to just use send_transaction altogether?
-    @NotNull
-    public TransactionResponse signAndBroadcastQuery() throws TransactionSignAndBroadCastError {
-        EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
-        try {
-            eosioTransactionSignatureRequest = this.createSignatureRequest();
-        } catch (TransactionCreateSignatureRequestError transactionCreateSignatureRequestError) {
-            throw new TransactionSignAndBroadCastError(transactionCreateSignatureRequestError);
-        }
-
-        try {
-            this.getSignature(eosioTransactionSignatureRequest);
-        } catch (TransactionGetSignatureError transactionGetSignatureError) {
-            throw new TransactionSignAndBroadCastError(transactionGetSignatureError);
-        }
-
-        if (this.serializedTransaction == null || this.serializedTransaction.isEmpty()) {
-            throw new TransactionSignAndBroadCastError(
-                    ErrorConstants.TRANSACTION_PROCESSOR_SIGN_BROADCAST_SERIALIZED_TRANSACTION_EMPTY);
-        }
-
-        if (this.signatures.isEmpty()) {
-            throw new TransactionSignAndBroadCastError(
-                    ErrorConstants.TRANSACTION_PROCESSOR_SIGN_BROADCAST_SIGN_EMPTY);
-        }
-
-        // Signatures and serializedTransaction are assigned and finalized in getSignature() method
-        SendTransactionRequest sendTransactionRequest = new SendTransactionRequest(this.signatures,
-                0, this.contextFreeData.getHexed(), this.serializedTransaction);
-        try {
-            return formatPushTransactionResponse(this.sendTransaction(sendTransactionRequest));
-        } catch (TransactionPushTransactionError | TransactionFormatPushTransactionResponseError transactionPushTransactionError) {
-            throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
-        }
-    }
-
     /**
      * Send signed transaction to blockchain.
      * <p>
diff --git a/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
index 56a00fa..8463cd9 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
@@ -7,6 +7,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import java.util.List;
 import one.block.eosiojava.models.abiProvider.Abi;
 import one.block.eosiojava.models.abiProvider.ActionResult;
 import org.junit.Before;
@@ -63,6 +64,17 @@ public void AbiTest() {
         assertEquals(jsonContent, toJSON);
     }
 
+    @Test
+    public void AbiQueryItVariantTest() {
+        String jsonContent = "{\"version\":\"eosio::abi/1.1\",\"types\":[{\"new_type_name\":\"any_array\",\"type\":\"anyvar[]\"},{\"new_type_name\":\"any_object\",\"type\":\"field[]\"}],\"structs\":[{\"name\":\"null_t\",\"base\":\"\",\"fields\":[]},{\"name\":\"field\",\"base\":\"\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"anyvar\"}]},{\"name\":\"query\",\"base\":\"\",\"fields\":[{\"name\":\"method\",\"type\":\"string\"},{\"name\":\"arg\",\"type\":\"anyvar?\"},{\"name\":\"filter\",\"type\":\"query[]\"}]}],\"variants\":[{\"name\":\"anyvar\",\"types\":[\"null_t\",\"int64\",\"uint64\",\"int32\",\"uint32\",\"int16\",\"uint16\",\"int8\",\"uint8\",\"time_point\",\"checksum256\",\"float64\",\"string\",\"any_object\",\"any_array\",\"bytes\",\"symbol\",\"symbol_code\",\"asset\"]}]}";
+
+        // FromJSON test
+        Abi abi = this.gson
+                .fromJson(jsonContent, Abi.class);
+
+        assertEquals(19, abi.getVariantTypesByName("anyvar").size());
+    }
+
     /**
      * Test ActionResult
      */

From cfb9015a25104c19b3d604b0cc61154ef55556db Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 16 Jul 2020 09:53:29 -0400
Subject: [PATCH 25/45] Get return type properly

---
 .../eosiojava/models/abiProvider/Abi.java     | 17 ++++++
 .../session/TransactionProcessor.java         | 52 ++++---------------
 2 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
index 1dd587e..13bd86d 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -1,6 +1,7 @@
 package one.block.eosiojava.models.abiProvider;
 
 import com.google.gson.annotations.SerializedName;
+import java.nio.ByteBuffer;
 import java.util.List;
 import java.util.Map;
 
@@ -137,4 +138,20 @@ public List<String> getVariantTypesByName(String variantName) {
 
         return null;
     }
+
+    public String getQueryItReturnType(String returnValue) {
+        // Can also get these types by getting the ABI and then calling abi.
+        List<String> queryItTypes = this.getVariantTypesByName("anyvar");
+        byte[] bytes = returnValue.getBytes();
+        ByteBuffer buffer = ByteBuffer.allocate(bytes.length);
+        buffer.put(bytes);
+
+        Integer index = buffer.getInt();
+
+        if (index >= queryItTypes.size()) {
+            throw new Error("Tried to deserialize unknown anyvar type");
+        }
+
+        return queryItTypes.get(index);
+    }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 4e86876..d93bb25 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -4,6 +4,7 @@
 import java.io.IOException;
 import java.io.Serializable;
 import java.math.BigInteger;
+import java.nio.ByteBuffer;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -1016,23 +1017,16 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
         }
 
         AbiEosSerializationObject actionAbiEosSerializationObject;
-
-//        if (actionTrace.isQueryItAction()) {
-//            // Figure out how to get the query-it return type
-//            String queryItReturnType = "some-return-type";
-//            actionAbiEosSerializationObject = new AbiEosSerializationObject(
-//                    queryItReturnType, actionAbiJSON);
-//        } else {
-//            Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
-//
-//            actionAbiEosSerializationObject = new AbiEosSerializationObject(
-//                    abi.getActionReturnTypeByActionName(actionTrace.getActionName()), actionAbiJSON);
-//        }
-
         Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
 
-        actionAbiEosSerializationObject = new AbiEosSerializationObject(
-                abi.getActionReturnTypeByActionName(actionTrace.getActionName()), actionAbiJSON);
+        if (actionTrace.isQueryItAction()) {
+            // Figure out how to get the query-it return type
+            actionAbiEosSerializationObject = new AbiEosSerializationObject(
+                    abi.getQueryItReturnType(actionTrace.getReturnValue()), actionAbiJSON);
+        } else {
+            actionAbiEosSerializationObject = new AbiEosSerializationObject(
+                    abi.getActionReturnTypeByActionName(actionTrace.getActionName()), actionAbiJSON);
+        }
 
         // !!! At this step, the data field of the action is still in HEX format.
         actionAbiEosSerializationObject.setHex(actionTrace.getReturnValue());
@@ -1052,34 +1046,6 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
         return actionAbiEosSerializationObject;
     }
 
-    private String getQueryItReturnType(String returnValue, Abi abi) {
-        // Can also get these types by getting the ABI and then calling abi.
-        List<String> queryItTypes = abi.getVariantTypesByName("anyvar");
-//        ArrayList<String> queryItTypes = new ArrayList<String>(Arrays.asList(
-//                "null_t",
-//                "int64",
-//                "uint64",
-//                "int32",
-//                "uint32",
-//                "int16",
-//                "uint16",
-//                "int8",
-//                "uint8",
-//                "time_point",
-//                "checksum256",
-//                "float64",
-//                "string",
-//                "any_object",
-//                "any_array",
-//                "bytes",
-//                "symbol",
-//                "symbol_code",
-//                "asset"
-//        ));
-
-        return "test";
-    }
-
     /**
      * Getting deep clone of the transaction
      */

From a973f76d5ac5c5a99ff7481d910e39defe5e3856 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 16 Jul 2020 10:26:31 -0400
Subject: [PATCH 26/45] Implementation for getting return type index and tests

---
 .../eosiojava/models/abiProvider/Abi.java     | 23 ++++-
 .../session/TransactionProcessor.java         |  1 -
 .../AbiTest.java}                             | 86 ++++++++++++++-----
 .../eosiojava/models/ActionResultTest.java    | 48 +++++++++++
 4 files changed, 130 insertions(+), 28 deletions(-)
 rename eosiojava/src/test/java/one/block/eosiojava/{AbiModelTest.java => models/AbiTest.java} (55%)
 create mode 100644 eosiojava/src/test/java/one/block/eosiojava/models/ActionResultTest.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
index 13bd86d..48e6ce7 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -139,19 +139,34 @@ public List<String> getVariantTypesByName(String variantName) {
         return null;
     }
 
+    /**
+     * Get the queryit return type based on integer index that is prepended to hex data
+     * @param returnValue Hex representation of the return value for a queryit action
+     * @return type of data in queryit return value
+     */
     public String getQueryItReturnType(String returnValue) {
-        // Can also get these types by getting the ABI and then calling abi.
         List<String> queryItTypes = this.getVariantTypesByName("anyvar");
-        byte[] bytes = returnValue.getBytes();
+        byte[] bytes = hexStringToByteArray(returnValue);
         ByteBuffer buffer = ByteBuffer.allocate(bytes.length);
         buffer.put(bytes);
+        buffer.rewind();
 
         Integer index = buffer.getInt();
 
-        if (index >= queryItTypes.size()) {
-            throw new Error("Tried to deserialize unknown anyvar type");
+        if (index < 0 || index >= queryItTypes.size()) {
+            return null;
         }
 
         return queryItTypes.get(index);
     }
+
+    public byte[] hexStringToByteArray(String s) {
+        int len = s.length();
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                    + Character.digit(s.charAt(i+1), 16));
+        }
+        return data;
+    }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index d93bb25..cb6bf15 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1020,7 +1020,6 @@ private AbiEosSerializationObject deserializeActionTraceReturnValue(ActionTrace
         Abi abi = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(actionAbiJSON, Abi.class);
 
         if (actionTrace.isQueryItAction()) {
-            // Figure out how to get the query-it return type
             actionAbiEosSerializationObject = new AbiEosSerializationObject(
                     abi.getQueryItReturnType(actionTrace.getReturnValue()), actionAbiJSON);
         } else {
diff --git a/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/AbiTest.java
similarity index 55%
rename from eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
rename to eosiojava/src/test/java/one/block/eosiojava/models/AbiTest.java
index 8463cd9..4feeaf8 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/AbiModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/AbiTest.java
@@ -1,22 +1,23 @@
-package one.block.eosiojava;
+package one.block.eosiojava.models;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import static junit.framework.TestCase.*;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
+import java.nio.ByteBuffer;
 import java.util.List;
 import one.block.eosiojava.models.abiProvider.Abi;
-import one.block.eosiojava.models.abiProvider.ActionResult;
+import org.bouncycastle.util.encoders.Hex;
 import org.junit.Before;
 import org.junit.Test;
 
 /**
  * Test JSON serialization/Deserialization for All models in RPC Provider
  */
-public class AbiModelTest {
+public class AbiTest {
 
     private Gson gson;
 
@@ -65,7 +66,7 @@ public void AbiTest() {
     }
 
     @Test
-    public void AbiQueryItVariantTest() {
+    public void AbiGetVariantTypesByNameTest() {
         String jsonContent = "{\"version\":\"eosio::abi/1.1\",\"types\":[{\"new_type_name\":\"any_array\",\"type\":\"anyvar[]\"},{\"new_type_name\":\"any_object\",\"type\":\"field[]\"}],\"structs\":[{\"name\":\"null_t\",\"base\":\"\",\"fields\":[]},{\"name\":\"field\",\"base\":\"\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"anyvar\"}]},{\"name\":\"query\",\"base\":\"\",\"fields\":[{\"name\":\"method\",\"type\":\"string\"},{\"name\":\"arg\",\"type\":\"anyvar?\"},{\"name\":\"filter\",\"type\":\"query[]\"}]}],\"variants\":[{\"name\":\"anyvar\",\"types\":[\"null_t\",\"int64\",\"uint64\",\"int32\",\"uint32\",\"int16\",\"uint16\",\"int8\",\"uint8\",\"time_point\",\"checksum256\",\"float64\",\"string\",\"any_object\",\"any_array\",\"bytes\",\"symbol\",\"symbol_code\",\"asset\"]}]}";
 
         // FromJSON test
@@ -75,28 +76,67 @@ public void AbiQueryItVariantTest() {
         assertEquals(19, abi.getVariantTypesByName("anyvar").size());
     }
 
-    /**
-     * Test ActionResult
-     */
     @Test
-    public void ActionResultTest() {
-        String actionName = "test_action";
-        String returnType = "testReturnType";
-        String jsonContent = "{\"name\":\"" + actionName + "\",\"result_type\":\"" + returnType + "\"}";
+    public void AbiGetQueryItReturnTypeTest() {
+        String jsonContent = "{\"version\":\"eosio::abi/1.1\",\"types\":[{\"new_type_name\":\"any_array\",\"type\":\"anyvar[]\"},{\"new_type_name\":\"any_object\",\"type\":\"field[]\"}],\"structs\":[{\"name\":\"null_t\",\"base\":\"\",\"fields\":[]},{\"name\":\"field\",\"base\":\"\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"anyvar\"}]},{\"name\":\"query\",\"base\":\"\",\"fields\":[{\"name\":\"method\",\"type\":\"string\"},{\"name\":\"arg\",\"type\":\"anyvar?\"},{\"name\":\"filter\",\"type\":\"query[]\"}]}],\"variants\":[{\"name\":\"anyvar\",\"types\":[\"null_t\",\"int64\",\"uint64\",\"int32\",\"uint32\",\"int16\",\"uint16\",\"int8\",\"uint8\",\"time_point\",\"checksum256\",\"float64\",\"string\",\"any_object\",\"any_array\",\"bytes\",\"symbol\",\"symbol_code\",\"asset\"]}]}";
 
         // FromJSON test
-        ActionResult actionResult = this.gson
-                .fromJson(jsonContent, ActionResult.class);
-        assertNotNull(actionResult);
-        assertEquals(actionName, actionResult.getName());
-        assertTrue(actionResult.hasActionName(actionName));
-        assertEquals(returnType, actionResult.getReturnType());
+        Abi abi = this.gson
+                .fromJson(jsonContent, Abi.class);
 
-        // ToJSON test
-        String toJSON = this.gson.toJson(actionResult);
-        assertNotNull(toJSON);
-        assertNotEquals("", toJSON);
-        assertEquals(jsonContent, toJSON);
+        List<String> anyvarVariantTypes = abi.getVariantTypesByName("anyvar");
+
+        Integer variantTypeIndex = 1;
+        String stringVal = "[\"string\",\"test\"]";
+        byte[] stringValBytes = stringVal.getBytes();
+
+        ByteBuffer buffer = ByteBuffer.allocate(stringValBytes.length + 4);
+        buffer.putInt(variantTypeIndex);
+        buffer.put(stringValBytes);
+
+        String variantType = abi.getQueryItReturnType(Hex.toHexString(buffer.array()));
+
+        assertEquals(variantType, anyvarVariantTypes.get(variantTypeIndex));
+    }
+
+    @Test
+    public void AbiGetQueryItReturnTypeNotFoundIndexBelowZeroTest() {
+        String jsonContent = "{\"version\":\"eosio::abi/1.1\",\"types\":[{\"new_type_name\":\"any_array\",\"type\":\"anyvar[]\"},{\"new_type_name\":\"any_object\",\"type\":\"field[]\"}],\"structs\":[{\"name\":\"null_t\",\"base\":\"\",\"fields\":[]},{\"name\":\"field\",\"base\":\"\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"anyvar\"}]},{\"name\":\"query\",\"base\":\"\",\"fields\":[{\"name\":\"method\",\"type\":\"string\"},{\"name\":\"arg\",\"type\":\"anyvar?\"},{\"name\":\"filter\",\"type\":\"query[]\"}]}],\"variants\":[{\"name\":\"anyvar\",\"types\":[\"null_t\",\"int64\",\"uint64\",\"int32\",\"uint32\",\"int16\",\"uint16\",\"int8\",\"uint8\",\"time_point\",\"checksum256\",\"float64\",\"string\",\"any_object\",\"any_array\",\"bytes\",\"symbol\",\"symbol_code\",\"asset\"]}]}";
+
+        // FromJSON test
+        Abi abi = this.gson
+                .fromJson(jsonContent, Abi.class);
+
+        Integer variantTypeIndex = -1;
+        String stringVal = "[\"string\",\"test\"]";
+        byte[] stringValBytes = stringVal.getBytes();
+
+        ByteBuffer buffer = ByteBuffer.allocate(stringValBytes.length + 4);
+        buffer.putInt(variantTypeIndex);
+        buffer.put(stringValBytes);
+
+        assertNull(abi.getQueryItReturnType(Hex.toHexString(buffer.array())));
+    }
+
+    @Test
+    public void AbiGetQueryItReturnTypeNotFoundIndexAboveVariantTypesLengthTest() {
+        String jsonContent = "{\"version\":\"eosio::abi/1.1\",\"types\":[{\"new_type_name\":\"any_array\",\"type\":\"anyvar[]\"},{\"new_type_name\":\"any_object\",\"type\":\"field[]\"}],\"structs\":[{\"name\":\"null_t\",\"base\":\"\",\"fields\":[]},{\"name\":\"field\",\"base\":\"\",\"fields\":[{\"name\":\"name\",\"type\":\"string\"},{\"name\":\"value\",\"type\":\"anyvar\"}]},{\"name\":\"query\",\"base\":\"\",\"fields\":[{\"name\":\"method\",\"type\":\"string\"},{\"name\":\"arg\",\"type\":\"anyvar?\"},{\"name\":\"filter\",\"type\":\"query[]\"}]}],\"variants\":[{\"name\":\"anyvar\",\"types\":[\"null_t\",\"int64\",\"uint64\",\"int32\",\"uint32\",\"int16\",\"uint16\",\"int8\",\"uint8\",\"time_point\",\"checksum256\",\"float64\",\"string\",\"any_object\",\"any_array\",\"bytes\",\"symbol\",\"symbol_code\",\"asset\"]}]}";
+
+        // FromJSON test
+        Abi abi = this.gson
+                .fromJson(jsonContent, Abi.class);
+
+        List<String> anyvarVariantTypes = abi.getVariantTypesByName("anyvar");
+
+        Integer variantTypeIndex = anyvarVariantTypes.size() + 1;
+        String stringVal = "[\"string\",\"test\"]";
+        byte[] stringValBytes = stringVal.getBytes();
+
+        ByteBuffer buffer = ByteBuffer.allocate(stringValBytes.length + 4);
+        buffer.putInt(variantTypeIndex);
+        buffer.put(stringValBytes);
+
+        assertNull(abi.getQueryItReturnType(Hex.toHexString(buffer.array())));
     }
 
     //endregion
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/ActionResultTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/ActionResultTest.java
new file mode 100644
index 0000000..2fc307c
--- /dev/null
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/ActionResultTest.java
@@ -0,0 +1,48 @@
+package one.block.eosiojava.models;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import one.block.eosiojava.models.abiProvider.ActionResult;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ActionResultTest {
+
+    private Gson gson;
+
+    @Before
+    public void setUpGSON() {
+        this.gson = new GsonBuilder()
+                .setDateFormat("yyyy-MM-dd'T'hh:mm:ss zzz")
+                .disableHtmlEscaping().create();
+    }
+
+    /**
+     * Test ActionResult
+     */
+    @Test
+    public void ActionResultTest() {
+        String actionName = "test_action";
+        String returnType = "testReturnType";
+        String jsonContent = "{\"name\":\"" + actionName + "\",\"result_type\":\"" + returnType + "\"}";
+
+        // FromJSON test
+        ActionResult actionResult = this.gson
+                .fromJson(jsonContent, ActionResult.class);
+        assertNotNull(actionResult);
+        assertEquals(actionName, actionResult.getName());
+        assertTrue(actionResult.hasActionName(actionName));
+        assertEquals(returnType, actionResult.getReturnType());
+
+        // ToJSON test
+        String toJSON = this.gson.toJson(actionResult);
+        assertNotNull(toJSON);
+        assertNotEquals("", toJSON);
+        assertEquals(jsonContent, toJSON);
+    }
+}

From f7eb34486140ddd31cb7037f89615a317ec1ff63 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 16 Jul 2020 18:14:31 -0400
Subject: [PATCH 27/45] Added tests, finished updates to processor

---
 .../rpcProvider/response/ActionTrace.java     |   2 +-
 .../one/block/eosiojava/models/AbiTest.java   |   2 +-
 .../eosiojava/models/ActionTraceTest.java     |  67 +++++++++++
 .../session/TransactionProcessorTest.java     | 111 +++++++++++++++++-
 4 files changed, 174 insertions(+), 8 deletions(-)
 create mode 100644 eosiojava/src/test/java/one/block/eosiojava/models/ActionTraceTest.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
index ee33f92..4c7888e 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/ActionTrace.java
@@ -252,7 +252,7 @@ public class ActionTrace {
      */
     public Boolean hasReturnValue() { return !this.returnValue.isEmpty(); }
 
-    public Boolean isQueryItAction() { return this.getActionName() == QUERY_IT_ACTION_NAME; }
+    public Boolean isQueryItAction() { return this.getActionName().equals(QUERY_IT_ACTION_NAME); }
 
     /**
      * Sets the deserialized return value
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/AbiTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/AbiTest.java
index 4feeaf8..c0927c2 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/AbiTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/AbiTest.java
@@ -86,7 +86,7 @@ public void AbiGetQueryItReturnTypeTest() {
 
         List<String> anyvarVariantTypes = abi.getVariantTypesByName("anyvar");
 
-        Integer variantTypeIndex = 1;
+        Integer variantTypeIndex = 12;
         String stringVal = "[\"string\",\"test\"]";
         byte[] stringValBytes = stringVal.getBytes();
 
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/ActionTraceTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/ActionTraceTest.java
new file mode 100644
index 0000000..dc50ebc
--- /dev/null
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/ActionTraceTest.java
@@ -0,0 +1,67 @@
+package one.block.eosiojava.models;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ActionTraceTest {
+    private Gson gson;
+
+    @Before
+    public void setUpGSON() {
+        this.gson = new GsonBuilder()
+                .setDateFormat("yyyy-MM-dd'T'hh:mm:ss zzz")
+                .disableHtmlEscaping().create();
+    }
+
+    @Test
+    public void ActionTraceHasReturnValueTest() {
+        String jsonContent = "{\"action_ordinal\":\"1\",\"creator_action_ordinal\":\"1\",\"closest_unnotified_ancestor_action_ordinal\":\"1\",\"receiver\":\"test\",\"producer_block_id\":\"test\",\"account_ram_deltas\":{},\"account_disk_deltas\":{},\"except\":\"test\",\"error_code\":\"test\",\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}";
+
+        // FromJSON test
+        ActionTrace actionTrace = this.gson
+                .fromJson(jsonContent, ActionTrace.class);
+
+        assertTrue(actionTrace.hasReturnValue());
+    }
+
+    @Test
+    public void ActionTraceHasReturnNoValueTest() {
+        String jsonContent = "{\"action_ordinal\":\"1\",\"creator_action_ordinal\":\"1\",\"closest_unnotified_ancestor_action_ordinal\":\"1\",\"receiver\":\"test\",\"producer_block_id\":\"test\",\"account_ram_deltas\":{},\"account_disk_deltas\":{},\"except\":\"test\",\"error_code\":\"test\",\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"require\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"\"}";
+
+        // FromJSON test
+        ActionTrace actionTrace = this.gson
+                .fromJson(jsonContent, ActionTrace.class);
+
+        assertFalse(actionTrace.hasReturnValue());
+    }
+
+    @Test
+    public void ActionTraceIsQueryItActionTest() {
+        String queryItActionName = "queryit";
+        String jsonContent = "{\"action_ordinal\":\"1\",\"creator_action_ordinal\":\"1\",\"closest_unnotified_ancestor_action_ordinal\":\"1\",\"receiver\":\"test\",\"producer_block_id\":\"test\",\"account_ram_deltas\":{},\"account_disk_deltas\":{},\"except\":\"test\",\"error_code\":\"test\",\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"" + queryItActionName + "\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}";
+
+        // FromJSON test
+        ActionTrace actionTrace = this.gson
+                .fromJson(jsonContent, ActionTrace.class);
+
+        assertTrue(actionTrace.isQueryItAction());
+    }
+
+    @Test
+    public void ActionTraceIsNotQueryItActionTest() {
+        String nonQueryItActionName = "someactionname";
+        String jsonContent = "{\"action_ordinal\":\"1\",\"creator_action_ordinal\":\"1\",\"closest_unnotified_ancestor_action_ordinal\":\"1\",\"receiver\":\"test\",\"producer_block_id\":\"test\",\"account_ram_deltas\":{},\"account_disk_deltas\":{},\"except\":\"test\",\"error_code\":\"test\",\"receipt\":{\"receiver\":\"eosio.assert\",\"act_digest\":\"digest\",\"global_sequence\":1,\"recv_sequence\":1,\"auth_sequence\":[],\"code_sequence\":1,\"abi_sequence\":1},\"act\":{\"account\":\"eosio.assert\",\"name\":\"" + nonQueryItActionName + "\",\"authorization\":[],\"data\":{\"chain_params_hash\":\"hash\",\"manifest_id\":\"manifest id\",\"actions\":[{\"contract\":\"eosio.token\",\"action\":\"transfer\"}],\"abi_hashes\":[\"abi hashes\"]},\"hex_data\":\"hex data\"},\"context_free\":false,\"elapsed\":1,\"cpu_usage\":0,\"console\":\"\",\"total_cpu_usage\":0,\"trx_id\":\"transaction id\",\"block_num\":1,\"block_time\":\"2019-12-12T12:12:12.500\",\"account_ram_deltas\":[],\"inline_traces\":[], \"return_value\": \"000000000090b1ca\"}";
+
+        // FromJSON test
+        ActionTrace actionTrace = this.gson
+                .fromJson(jsonContent, ActionTrace.class);
+
+        assertFalse(actionTrace.isQueryItAction());
+    }
+}
diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
index 97a9621..f201135 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
@@ -590,7 +590,7 @@ public void testDeserializeActionTraceWithNoReturnValue() {
         String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace("", "retval_null");
         String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
         String expectedJson = null;
-        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson);
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, EOSIOABIJSON);
 
         TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
         assertNotNull(processor);
@@ -610,7 +610,7 @@ public void testDeserializeActionTraceWithSimpleReturnValue() {
         String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace("0a000000", "retval_simple");
         String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
         String expectedJson = "10";
-        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson);
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, EOSIOABIJSON);
 
         TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
         assertNotNull(processor);
@@ -630,7 +630,27 @@ public void testDeserializeActionTraceWithComplexReturnValue() {
         String mockedActionTraceWithComplexReturnValue = getMockedProcessedActionTrace("d2040000000000000090b1ca", "retval_complex");
         String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithComplexReturnValue);
         String expectedJson = "{\"id\":1234,\"name\":\"test\"}";
-        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson);
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, EOSIOABIJSON);
+
+        TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
+        assertNotNull(processor);
+
+        try {
+            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
+            assertNotNull(pushTransactionResponse);
+            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+        } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
+            transactionSignAndBroadCastError.printStackTrace();
+            fail("Exception should not be thrown here for calling signAndBroadcast");
+        }
+    }
+
+    @Test
+    public void testDeserializeQueryItActionTrace() {
+        String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace("0000000c5b22737472696e67222c2274657374225d", "queryit");
+        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String expectedJson = "[\"string\",\"test\"]";
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, QUERYITABIJSON);
 
         TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
         assertNotNull(processor);
@@ -705,17 +725,17 @@ private String getMockedPushTransactionResponseJson(@Nullable String mockedProce
     }
 
     private void mockDefaultSuccessData() {
-        mockDefaultSuccessData(getMockedPushTransactionResponseJson(), MOCKED_RETURN_VALUE_JSON);
+        mockDefaultSuccessData(getMockedPushTransactionResponseJson(), MOCKED_RETURN_VALUE_JSON, EOSIOABIJSON);
     }
 
-    private void mockDefaultSuccessData(String mockedPushTransactionResponseJson, String mockedReturnValueJson) {
+    private void mockDefaultSuccessData(String mockedPushTransactionResponseJson, String mockedReturnValueJson, String mockedAbiJson) {
         this.mockRPC(
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetInfoResponse, GetInfoResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetBlockResponse, GetBlockResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedPushTransactionResponseJson, PushTransactionResponse.class));
 
-        this.mockAbiProvider(EOSIOABIJSON);
+        this.mockAbiProvider(mockedAbiJson);
         this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction, mockedReturnValueJson);
         this.mockSignatureProvider(Arrays.asList("Key1", "Key2"),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedEosioTransactionSignatureResponseJSON, EosioTransactionSignatureResponse.class));
@@ -1117,6 +1137,85 @@ private void mockSignatureProvider(List<String> mockedAvaialbleKeys, EosioTransa
             + "   ]\n"
             + "}";
 
+    private static final String QUERYITABIJSON = "{\n"
+            + "    \"version\": \"eosio::abi/1.1\",\n"
+            + "    \"types\": [\n"
+            + "        {\n"
+            + "            \"new_type_name\": \"any_array\",\n"
+            + "            \"type\": \"anyvar[]\"\n"
+            + "        },\n"
+            + "        {\n"
+            + "            \"new_type_name\": \"any_object\",\n"
+            + "            \"type\": \"field[]\"\n"
+            + "        }\n"
+            + "    ],\n"
+            + "    \"structs\": [\n"
+            + "        {\n"
+            + "            \"name\": \"null_t\",\n"
+            + "            \"base\": \"\",\n"
+            + "            \"fields\": []\n"
+            + "        },\n"
+            + "        {\n"
+            + "            \"name\": \"field\",\n"
+            + "            \"base\": \"\",\n"
+            + "            \"fields\": [\n"
+            + "                {\n"
+            + "                    \"name\": \"name\",\n"
+            + "                    \"type\": \"string\"\n"
+            + "                },\n"
+            + "                {\n"
+            + "                    \"name\": \"value\",\n"
+            + "                    \"type\": \"anyvar\"\n"
+            + "                }\n"
+            + "            ]\n"
+            + "        },\n"
+            + "        {\n"
+            + "            \"name\": \"query\",\n"
+            + "            \"base\": \"\",\n"
+            + "            \"fields\": [\n"
+            + "                {\n"
+            + "                    \"name\": \"method\",\n"
+            + "                    \"type\": \"string\"\n"
+            + "                },\n"
+            + "                {\n"
+            + "                    \"name\": \"arg\",\n"
+            + "                    \"type\": \"anyvar?\"\n"
+            + "                },\n"
+            + "                {\n"
+            + "                    \"name\": \"filter\",\n"
+            + "                    \"type\": \"query[]\"\n"
+            + "                }\n"
+            + "            ]\n"
+            + "        }\n"
+            + "    ],\n"
+            + "    \"variants\": [\n"
+            + "        {\n"
+            + "            \"name\": \"anyvar\",\n"
+            + "            \"types\": [\n"
+            + "                \"null_t\",\n"
+            + "                \"int64\",\n"
+            + "                \"uint64\",\n"
+            + "                \"int32\",\n"
+            + "                \"uint32\",\n"
+            + "                \"int16\",\n"
+            + "                \"uint16\",\n"
+            + "                \"int8\",\n"
+            + "                \"uint8\",\n"
+            + "                \"time_point\",\n"
+            + "                \"checksum256\",\n"
+            + "                \"float64\",\n"
+            + "                \"string\",\n"
+            + "                \"any_object\",\n"
+            + "                \"any_array\",\n"
+            + "                \"bytes\",\n"
+            + "                \"symbol\",\n"
+            + "                \"symbol_code\",\n"
+            + "                \"asset\"\n"
+            + "            ]\n"
+            + "        }\n"
+            + "    ]\n"
+            + "}";
+
     private static final String DUMP_TRANSACTION_ID = "17335a29eae22e531966f3775e44f8b02173e780c9549881e01e470ff0ab46ce";
 
     private static final BigInteger headBlockNum = BigInteger.valueOf(31984402L);

From 33e7adc6dae4c0a63d6a5f2503995829e4c07834 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 16 Jul 2020 19:27:10 -0400
Subject: [PATCH 28/45] Add b1x-specific test

---
 .../session/TransactionProcessorTest.java     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
index f201135..8045b23 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
@@ -665,6 +665,27 @@ public void testDeserializeQueryItActionTrace() {
         }
     }
 
+    @Test
+    public void testDeserializeB1XQueryItActionTrace() {
+        String returnValue = "0D070571756F74650C103533383035393639302E32312055534404626173650C1238393335322E3534303030303030204254430B62616E636F7250726963650C0B363032312E3736205553440E6C617374547261646550726963650C0B363031302E383720555344116C61737454726164655175616E746974790C103136312E3839303835393437204254430461736B730D010565646765730E0004626964730D010565646765730E040D01046E6F64650D08076F726465724964020400000000000000056F776E65720C056D616B65720668616E646C650220766BF085AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0E312E3030303030303030204254430473697A650C0E312E30303030303030302042544307637265617465640980791FA58CAA05000D01046E6F64650D08076F726465724964020900000000000000056F776E65720C0B6D61786E616D73746F726D0668616E646C6502A0DC160486AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0F31302E3030303030303030204254430473697A650C0F31302E303030303030303020425443076372656174656409C09DBBB88CAA05000D01046E6F64650D08076F726465724964020A00000000000000056F776E65720C0B6D61786E616D73746F726D0668616E646C65026057090986AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0F31302E3030303030303030204254430473697A650C0F31302E303030303030303020425443076372656174656409A0B9B5BD8CAA05000D01046E6F64650D08076F726465724964020700000000000000056F776E65720C056D616B65720668616E646C6502A06B50FA85AA05000570726963650C0B353139392E35302055534404636F73740C08302E3030205553440972656D61696E696E670C0E312E3030303030303030204254430473697A650C0E312E303030303030303020425443076372656174656409C02CF5AE8CAA0500";
+        String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace(returnValue, "queryit");
+        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String expectedJson = "{\"quote\":\"538059690.21 USD\",\"base\":\"89352.54000000 BTC\",\"bancorPrice\":\"6021.76 USD\",\"lastTradePrice\":\"6010.87 USD\",\"lastTradeQuantity\":\"161.89085947 BTC\",\"asks\":{\"edges\":[]},\"bids\":{\"edges\":[{\"node\":{\"orderId\":\"4\",\"owner\":\"maker\",\"handle\":\"1594867124500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:38:46.000\"}},{\"node\":{\"orderId\":\"9\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867454500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:44:15.000\"}},{\"node\":{\"orderId\":\"10\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867537500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:45:38.500\"}},{\"node\":{\"orderId\":\"7\",\"owner\":\"maker\",\"handle\":\"1594867290500000\",\"price\":\"5199.50 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:41:31.000\"}}]}}";
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, QUERYITABIJSON);
+
+        TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
+        assertNotNull(processor);
+
+        try {
+            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
+            assertNotNull(pushTransactionResponse);
+            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+        } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
+            transactionSignAndBroadCastError.printStackTrace();
+            fail("Exception should not be thrown here for calling signAndBroadcast");
+        }
+    }
+
     private String getMockedProcessedActionTrace(String returnValueHex, String actionName) {
         return "{\n"
                 + "        \"action_ordinal\": 1,\n"

From e336433ad8112095183cc159ac9a0d82b493e69f Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 15:24:17 -0400
Subject: [PATCH 29/45] Add all primitive type deserialization/conversion +
 tests

---
 .../eosiojava/models/queryit/AnyObject.java   |  10 +
 .../eosiojava/models/queryit/QueryIt.java     |  23 ++
 .../models/queryit/QueryItDeserializer.java   | 115 ++++++
 .../one/block/eosiojava/utilities/Utils.java  |   3 +
 .../eosiojava/models/queryit/QueryItTest.java | 374 ++++++++++++++++++
 5 files changed, 525 insertions(+)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyObject.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
 create mode 100644 eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyObject.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyObject.java
new file mode 100644
index 0000000..8a97bf0
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyObject.java
@@ -0,0 +1,10 @@
+package one.block.eosiojava.models.queryit;
+
+import com.google.gson.annotations.SerializedName;
+import java.util.Map;
+
+public class AnyObject {
+    public String name;
+
+    public Object value;
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
new file mode 100644
index 0000000..aa36129
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
@@ -0,0 +1,23 @@
+package one.block.eosiojava.models.queryit;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class QueryIt {
+    public Object value;
+
+    public List<QueryIt> queryIts;
+
+    public QueryIt() {
+        queryIts = new ArrayList<QueryIt>();
+    }
+
+    public Object getValue() {
+        return this.value;
+    }
+
+    public void addQueryIt(QueryIt queryIt) {
+        queryIts.add(queryIt);
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
new file mode 100644
index 0000000..86eb937
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
@@ -0,0 +1,115 @@
+package one.block.eosiojava.models.queryit;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import java.lang.reflect.Type;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+
+public class QueryItDeserializer implements JsonDeserializer<QueryIt> {
+    private static final String ANY_OBJECT_TYPE = "any_object";
+    private static final String ANY_ARRAY_TYPE = "any_array";
+
+    private String datePattern;
+
+    public QueryItDeserializer(String datePattern) {
+        this.datePattern = datePattern;
+    }
+
+    // Remember to handle null_t, which likely would result in exception below
+//    @Override
+//    public QueryIt deserialize(JsonElement json, Type typeOfT,
+//            JsonDeserializationContext context) throws JsonParseException {
+//
+//        QueryIt queryIt = null;
+//        // null_t?
+//        if (!json.isJsonArray() || ((JsonArray)json).size() == 0) {
+//            return null;
+//        } else if (json.isJsonPrimitive()) {
+//            JsonPrimitive primitive = (JsonPrimitive)json;
+//            if (primitive.isString()) {
+//                queryIt.value = json.getAsString();
+//            } else if (primitive.isNumber()) {
+//                queryIt.value = json.getAsNumber();
+//            } else if (primitive.isBoolean()) {
+//                queryIt.value = json.getAsBoolean();
+//            }
+//        } else if (json.isJsonObject()) {
+//
+//        } else {
+//            JsonArray jsonAsArray = ((JsonArray) json);
+//            JsonElement element = jsonAsArray.get(0);
+//            if (element.isJsonObject()) {
+//
+//            }
+//            String type = jsonAsArray.get(0).getAsString();
+//
+//            if(type.equals(ANY_OBJECT_TYPE)) {
+//                JsonArray value = (JsonArray)jsonAsArray.get(1);
+//                QueryIt subType = deserialize(value, typeOfT, context);
+//                String test = "";
+//            } else if (type.equals(ANY_ARRAY_TYPE)) {
+//                JsonArray value = (JsonArray)jsonAsArray.get(1);
+//            } else {
+//
+//            }
+//        }
+//
+////        ActionTrace actionTrace = new Gson().fromJson(json.getAsJsonObject(), typeOfT);
+////        actionTrace.setDeserializedReturnValue();
+//        return queryIt;
+//    }
+
+    @Override
+    public QueryIt deserialize(JsonElement json, Type typeOfT,
+            JsonDeserializationContext context) throws JsonParseException {
+
+        QueryIt queryIt = new QueryIt();
+        if (!json.isJsonArray() || ((JsonArray)json).size() == 0) { // null_t
+            return queryIt;
+        } else {
+            JsonArray jsonAsArray = ((JsonArray) json);
+            String type = jsonAsArray.get(0).getAsString();
+
+            if (type.equals("int32")
+                    || type.equals("int16")
+                    || type.equals("uint16")
+                    || type.equals("int8")
+                    || type.equals("uint8")) {
+                queryIt.value = Integer.parseInt(jsonAsArray.get(1).getAsString());
+            } else if (type.equals("uint64")) {
+                queryIt.value = new BigInteger(jsonAsArray.get(1).getAsString());
+            } else if (type.equals("float64")) {
+                queryIt.value = Float.parseFloat(jsonAsArray.get(1).getAsString());
+            } else if (type.equals("int64") || type.equals("uint32")) {
+                queryIt.value = Long.parseLong(jsonAsArray.get(1).getAsString());
+            } else if (type.equals("time_point")) {
+                String timePointAsString = jsonAsArray.get(1).getAsString();
+                if (timePointAsString.charAt(timePointAsString.length() - 1) != 'Z') {
+                    timePointAsString += 'Z';
+                }
+                queryIt.value = Instant.parse(timePointAsString);
+            } else if (type.equals("any_object")) {
+                JsonArray array = jsonAsArray.get(1).getAsJsonArray();
+                for(JsonElement subJson : array) {
+                    // { "name": "something", "value": ["string", "test"] }
+                    QueryIt subQueryIt = deserialize(subJson, typeOfT, context);
+                    queryIt.addQueryIt(subQueryIt);
+                }
+                queryIt.value = "test";
+            } else if (type.equals("any_array")) {
+
+            } else { // string, checksum256, symbol, symbol_code, asset, bytes
+                queryIt.value = jsonAsArray.get(1).getAsString();
+            }
+        }
+        return queryIt;
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
index e8df846..a823581 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
@@ -8,6 +8,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
+import one.block.eosiojava.models.queryit.QueryIt;
+import one.block.eosiojava.models.queryit.QueryItDeserializer;
 
 /**
  * This class provides generic utility methods
@@ -41,6 +43,7 @@ public static <T extends Serializable> T clone(T object) throws IOException, Cla
      */
     public static Gson getGson(String datePattern) {
         return new GsonBuilder()
+                .registerTypeAdapter(QueryIt.class, new QueryItDeserializer(datePattern))
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping()
                 .create();
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
new file mode 100644
index 0000000..54dac0b
--- /dev/null
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
@@ -0,0 +1,374 @@
+package one.block.eosiojava.models.queryit;
+
+import static junit.framework.TestCase.*;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import java.math.BigInteger;
+import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import org.junit.Before;
+import org.junit.Test;
+
+public class QueryItTest {
+
+    // For generic deserialization of arrays
+//    Type listType = new TypeToken<ArrayList<AnyObject>>(){}.getType();
+//
+//    // FromJSON test
+//    List<AnyObject> anyObjects = this.gson.fromJson(jsonContent, listType);
+
+    private Gson gson;
+
+    @Before
+    public void setUpGSON() {
+        String datePattern = "yyyy-MM-dd'T'hh:mm:ss zzz";
+        this.gson = new GsonBuilder()
+                .registerTypeAdapter(QueryIt.class, new QueryItDeserializer(datePattern))
+                .setDateFormat(datePattern)
+                .disableHtmlEscaping().create();
+    }
+
+    @Test
+    public void testConversion() {
+        String jsonContent = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
+
+        // FromJSON test
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+    }
+
+    @Test
+    public void testConvertNull() {
+        String jsonContent = "[]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertNull(queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertString() {
+        String expectedValue = "someValue";
+        String jsonContent = "[\"string\", \"" + expectedValue + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertChecksum256() {
+        String expectedValue = "532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25";
+        String jsonContent = "[\"checksum256\", \"" + expectedValue + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertSymbol() {
+        String expectedValue = "10.0000 EOS";
+        String jsonContent = "[\"symbol\", \"" + expectedValue + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertSymbolCode() {
+        String expectedValue = "EOS";
+        String jsonContent = "[\"symbol_code\", \"" + expectedValue + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertAsset() {
+        String expectedValue = "10.0000 EOS";
+        String jsonContent = "[\"asset\", \"" + expectedValue + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    // Not necessary?
+//    @Test
+//    public void testConvertBoolean() {
+//        Boolean expectedValue = true;
+//        String jsonContent = "[\"boolean\", \"" + expectedValue + "\"]";
+//
+//        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+//
+//        assertNotNull(queryIt);
+//        assertEquals(expectedValue, queryIt.getValue());
+//    }
+
+    // String json = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
+
+    @Test
+    public void testConvertMaxUInt64() {
+        BigInteger expectedValue = new BigInteger("18446744073709551615");
+        String jsonContent = "[\"uint64\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinUInt64() {
+        BigInteger expectedValue = new BigInteger("0");
+        String jsonContent = "[\"uint64\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMaxInt64() {
+        Long expectedValue = 9223372036854775807L;
+        String jsonContent = "[\"int64\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinInt64() {
+        Long expectedValue = -9223372036854775808L;
+        String jsonContent = "[\"int64\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMaxUInt32() {
+        Long expectedValue = 4294967295L;
+        String jsonContent = "[\"uint32\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinUInt32() {
+        Long expectedValue = 0L;
+        String jsonContent = "[\"uint32\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMaxInt32() {
+        Integer expectedValue = 2147483647;
+        String jsonContent = "[\"int32\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinInt32() {
+        Integer expectedValue = -2147483648;
+        String jsonContent = "[\"int32\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMaxUInt16() {
+        Integer expectedValue = 65535;
+        String jsonContent = "[\"uint16\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinUInt16() {
+        Integer expectedValue = 0;
+        String jsonContent = "[\"uint16\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMaxInt16() {
+        Integer expectedValue = 32767;
+        String jsonContent = "[\"int16\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinInt16() {
+        Integer expectedValue = -32768;
+        String jsonContent = "[\"int16\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMaxUInt8() {
+        Integer expectedValue = 256;
+        String jsonContent = "[\"uint8\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinUInt8() {
+        Integer expectedValue = 0;
+        String jsonContent = "[\"uint8\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMaxInt8() {
+        Integer expectedValue = 127;
+        String jsonContent = "[\"int8\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinInt8() {
+        Integer expectedValue = -128;
+        String jsonContent = "[\"int8\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMaxFloat64() {
+        Float expectedValue = Float.parseFloat("3.40282e+038");
+        String jsonContent = "[\"float64\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertMinFloat64() {
+        Float expectedValue = Float.parseFloat("1.17549e-038");
+        String jsonContent = "[\"float64\", \"" + expectedValue.toString() + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testConvertTimepointWithoutZone() {
+        String expectedValueAsString = "2020-07-16T10:38:46.000";
+        Instant expectedValue = Instant.parse(expectedValueAsString + 'Z');
+        String expectedValueToString = "2020-07-16T10:38:46Z";
+        String jsonContent = "[\"time_point\", \"" + expectedValueAsString + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+        assertEquals(expectedValueToString, queryIt.getValue().toString());
+    }
+
+    @Test
+    public void testConvertTimepointWithZone() {
+        String expectedValueAsString = "2020-07-16T10:38:46.500Z";
+        Instant expectedValue = Instant.parse(expectedValueAsString);
+        String expectedValueToString = "2020-07-16T10:38:46.500Z";
+        String jsonContent = "[\"time_point\", \"" + expectedValueAsString + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+        assertEquals(expectedValueToString, queryIt.getValue().toString());
+    }
+
+    @Test
+    public void testConvertBytes() {
+        String expectedValue = "0110";
+        String jsonContent = "[\"bytes\", \"" + expectedValue + "\"]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getValue());
+    }
+
+    @Test
+    public void testSimpleAnyObject() {
+        String jsonContent = "[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]}]]";
+    }
+
+//    @Test
+//    public void testAnyObject() {
+//        String expectedValue = "0110";
+//        String jsonContent = "[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]";
+//
+//        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+//
+//        assertNotNull(queryIt);
+//        assertEquals(expectedValue, queryIt.getValue());
+//    }
+}

From c2cf6029bc8d9897ae9c4700f9ff0a7d549463fe Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 18:35:13 -0400
Subject: [PATCH 30/45] Working with both any_array and any_object

---
 .../eosiojava/models/queryit/QueryIt.java     | 25 +++++-
 .../models/queryit/QueryItDeserializer.java   | 83 +++++--------------
 .../one/block/eosiojava/utilities/Utils.java  |  2 +-
 .../eosiojava/models/queryit/QueryItTest.java | 75 ++++++++++++++++-
 4 files changed, 112 insertions(+), 73 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
index aa36129..a3112ab 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
@@ -5,19 +5,36 @@
 import java.util.List;
 
 public class QueryIt {
-    public Object value;
+    private String name;
+    private Object value;
 
-    public List<QueryIt> queryIts;
+    private List<QueryIt> subQueries;
 
     public QueryIt() {
-        queryIts = new ArrayList<QueryIt>();
+        subQueries = new ArrayList<QueryIt>();
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
     }
 
     public Object getValue() {
         return this.value;
     }
 
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
     public void addQueryIt(QueryIt queryIt) {
-        queryIts.add(queryIt);
+        subQueries.add(queryIt);
+    }
+
+    public List<QueryIt> getSubQueries() {
+        return this.subQueries;
     }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
index 86eb937..39ccfb6 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
@@ -4,76 +4,24 @@
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import java.lang.reflect.Type;
 import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
 
 public class QueryItDeserializer implements JsonDeserializer<QueryIt> {
     private static final String ANY_OBJECT_TYPE = "any_object";
     private static final String ANY_ARRAY_TYPE = "any_array";
 
-    private String datePattern;
-
-    public QueryItDeserializer(String datePattern) {
-        this.datePattern = datePattern;
-    }
-
-    // Remember to handle null_t, which likely would result in exception below
-//    @Override
-//    public QueryIt deserialize(JsonElement json, Type typeOfT,
-//            JsonDeserializationContext context) throws JsonParseException {
-//
-//        QueryIt queryIt = null;
-//        // null_t?
-//        if (!json.isJsonArray() || ((JsonArray)json).size() == 0) {
-//            return null;
-//        } else if (json.isJsonPrimitive()) {
-//            JsonPrimitive primitive = (JsonPrimitive)json;
-//            if (primitive.isString()) {
-//                queryIt.value = json.getAsString();
-//            } else if (primitive.isNumber()) {
-//                queryIt.value = json.getAsNumber();
-//            } else if (primitive.isBoolean()) {
-//                queryIt.value = json.getAsBoolean();
-//            }
-//        } else if (json.isJsonObject()) {
-//
-//        } else {
-//            JsonArray jsonAsArray = ((JsonArray) json);
-//            JsonElement element = jsonAsArray.get(0);
-//            if (element.isJsonObject()) {
-//
-//            }
-//            String type = jsonAsArray.get(0).getAsString();
-//
-//            if(type.equals(ANY_OBJECT_TYPE)) {
-//                JsonArray value = (JsonArray)jsonAsArray.get(1);
-//                QueryIt subType = deserialize(value, typeOfT, context);
-//                String test = "";
-//            } else if (type.equals(ANY_ARRAY_TYPE)) {
-//                JsonArray value = (JsonArray)jsonAsArray.get(1);
-//            } else {
-//
-//            }
-//        }
-//
-////        ActionTrace actionTrace = new Gson().fromJson(json.getAsJsonObject(), typeOfT);
-////        actionTrace.setDeserializedReturnValue();
-//        return queryIt;
-//    }
-
     @Override
     public QueryIt deserialize(JsonElement json, Type typeOfT,
             JsonDeserializationContext context) throws JsonParseException {
 
         QueryIt queryIt = new QueryIt();
         if (!json.isJsonArray() || ((JsonArray)json).size() == 0) { // null_t
-            return queryIt;
+            return queryIt; // Seems like this might actually be wrong for size() == 0, return []
         } else {
             JsonArray jsonAsArray = ((JsonArray) json);
             String type = jsonAsArray.get(0).getAsString();
@@ -83,31 +31,38 @@ public QueryIt deserialize(JsonElement json, Type typeOfT,
                     || type.equals("uint16")
                     || type.equals("int8")
                     || type.equals("uint8")) {
-                queryIt.value = Integer.parseInt(jsonAsArray.get(1).getAsString());
+                queryIt.setValue(Integer.parseInt(jsonAsArray.get(1).getAsString()));
             } else if (type.equals("uint64")) {
-                queryIt.value = new BigInteger(jsonAsArray.get(1).getAsString());
+                queryIt.setValue(new BigInteger(jsonAsArray.get(1).getAsString()));
             } else if (type.equals("float64")) {
-                queryIt.value = Float.parseFloat(jsonAsArray.get(1).getAsString());
+                queryIt.setValue(Float.parseFloat(jsonAsArray.get(1).getAsString()));
             } else if (type.equals("int64") || type.equals("uint32")) {
-                queryIt.value = Long.parseLong(jsonAsArray.get(1).getAsString());
+                queryIt.setValue(Long.parseLong(jsonAsArray.get(1).getAsString()));
             } else if (type.equals("time_point")) {
                 String timePointAsString = jsonAsArray.get(1).getAsString();
                 if (timePointAsString.charAt(timePointAsString.length() - 1) != 'Z') {
                     timePointAsString += 'Z';
                 }
-                queryIt.value = Instant.parse(timePointAsString);
+                queryIt.setValue(Instant.parse(timePointAsString));
             } else if (type.equals("any_object")) {
                 JsonArray array = jsonAsArray.get(1).getAsJsonArray();
                 for(JsonElement subJson : array) {
-                    // { "name": "something", "value": ["string", "test"] }
-                    QueryIt subQueryIt = deserialize(subJson, typeOfT, context);
+                    JsonObject subJsonAsObject = subJson.getAsJsonObject();
+                    String name = subJsonAsObject.get("name").getAsString();
+                    JsonArray subJsonArray = subJsonAsObject.getAsJsonArray("value");
+                    QueryIt subQueryIt = deserialize(subJsonArray, typeOfT, context);
+                    subQueryIt.setName(name);
                     queryIt.addQueryIt(subQueryIt);
                 }
-                queryIt.value = "test";
+                //queryIt.value = "test";
             } else if (type.equals("any_array")) {
-
+                JsonArray array = jsonAsArray.get(1).getAsJsonArray();
+                for(JsonElement subJson : array) {
+                    QueryIt subQueryIt = deserialize(subJson, typeOfT, context);
+                    queryIt.addQueryIt(subQueryIt);
+                }
             } else { // string, checksum256, symbol, symbol_code, asset, bytes
-                queryIt.value = jsonAsArray.get(1).getAsString();
+                queryIt.setValue(jsonAsArray.get(1).getAsString());
             }
         }
         return queryIt;
diff --git a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
index a823581..a287e92 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
@@ -43,7 +43,7 @@ public static <T extends Serializable> T clone(T object) throws IOException, Cla
      */
     public static Gson getGson(String datePattern) {
         return new GsonBuilder()
-                .registerTypeAdapter(QueryIt.class, new QueryItDeserializer(datePattern))
+                .registerTypeAdapter(QueryIt.class, new QueryItDeserializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping()
                 .create();
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
index 54dac0b..f20ceaf 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
@@ -5,8 +5,6 @@
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
 import org.junit.Before;
 import org.junit.Test;
@@ -25,13 +23,13 @@ public class QueryItTest {
     public void setUpGSON() {
         String datePattern = "yyyy-MM-dd'T'hh:mm:ss zzz";
         this.gson = new GsonBuilder()
-                .registerTypeAdapter(QueryIt.class, new QueryItDeserializer(datePattern))
+                .registerTypeAdapter(QueryIt.class, new QueryItDeserializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping().create();
     }
 
     @Test
-    public void testConversion() {
+    public void testFullConversion() {
         String jsonContent = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
 
         // FromJSON test
@@ -356,9 +354,78 @@ public void testConvertBytes() {
         assertEquals(expectedValue, queryIt.getValue());
     }
 
+    @Test
+    public void testEmptyAnyArray() {
+        int expectedSubQueriesCount = 0;
+        String jsonContent = "[\"any_array\", []]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedSubQueriesCount, queryIt.getSubQueries().size());
+    }
+
+    @Test
+    public void testSimpleAnyArray() {
+        String expectedSubqueryValue = "test";
+        int expectedSubQueriesCount = 1;
+        String jsonContent = "[\"any_array\", [[\"string\", \"" + expectedSubqueryValue + "\"]]]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedSubQueriesCount, queryIt.getSubQueries().size());
+        assertEquals(expectedSubqueryValue, queryIt.getSubQueries().get(0).getValue());
+    }
+
+    @Test
+    public void testAnyArrayWithMultipleAnyVars() {
+        String expectedSubqueryStringValue = "test";
+        Long expectedSubqueryIntValue = 1234L;
+        int expectedSubQueriesCount = 2;
+        String jsonContent = "[\"any_array\", [[\"string\", \"" + expectedSubqueryStringValue + "\"], [\"uint32\", " + expectedSubqueryIntValue + "]]]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedSubQueriesCount, queryIt.getSubQueries().size());
+        assertEquals(expectedSubqueryStringValue, queryIt.getSubQueries().get(0).getValue());
+        assertEquals(expectedSubqueryIntValue, queryIt.getSubQueries().get(1).getValue());
+    }
+
+    @Test
+    public void testEmptyNestedAnyArray() {
+        int expectedValue = 1;
+        int expectedNestedArrays = 0;
+        String jsonContent = "[\"any_array\", [[\"any_array\", []]]]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getSubQueries().size());
+        assertEquals(expectedNestedArrays, queryIt.getSubQueries().get(0).getSubQueries().size());
+    }
+
+    @Test
+    public void testSimpleNestedAnyArray() {
+        int expectedValue = 1;
+        int expectedNestedArrays = 1;
+        String jsonContent = "[\"any_array\", [[\"any_array\", [[\"string\", \"test\"]]]]]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedValue, queryIt.getSubQueries().size());
+        assertEquals(expectedNestedArrays, queryIt.getSubQueries().get(0).getSubQueries().size());
+    }
+
     @Test
     public void testSimpleAnyObject() {
         String jsonContent = "[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]}]]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
     }
 
 //    @Test

From 1e165d685e479f193894f1dbc26a7bd0a95bb83e Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 18:47:43 -0400
Subject: [PATCH 31/45] Full tests

---
 .../eosiojava/models/queryit/QueryItTest.java | 53 ++++++++++---------
 1 file changed, 29 insertions(+), 24 deletions(-)

diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
index f20ceaf..901ff78 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
@@ -28,16 +28,6 @@ public void setUpGSON() {
                 .disableHtmlEscaping().create();
     }
 
-    @Test
-    public void testFullConversion() {
-        String jsonContent = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
-
-        // FromJSON test
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
-
-        assertNotNull(queryIt);
-    }
-
     @Test
     public void testConvertNull() {
         String jsonContent = "[]";
@@ -103,20 +93,6 @@ public void testConvertAsset() {
         assertEquals(expectedValue, queryIt.getValue());
     }
 
-    // Not necessary?
-//    @Test
-//    public void testConvertBoolean() {
-//        Boolean expectedValue = true;
-//        String jsonContent = "[\"boolean\", \"" + expectedValue + "\"]";
-//
-//        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
-//
-//        assertNotNull(queryIt);
-//        assertEquals(expectedValue, queryIt.getValue());
-//    }
-
-    // String json = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
-
     @Test
     public void testConvertMaxUInt64() {
         BigInteger expectedValue = new BigInteger("18446744073709551615");
@@ -419,6 +395,19 @@ public void testSimpleNestedAnyArray() {
         assertEquals(expectedNestedArrays, queryIt.getSubQueries().get(0).getSubQueries().size());
     }
 
+    @Test
+    public void testEmptyValueAnyObject() {
+        String expectedName = "test";
+        int expectedNestedArrays = 1;
+        String jsonContent = "[\"any_object\",[{\"name\":\"" + expectedName + "\",\"value\":[]}]]";
+
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedNestedArrays, queryIt.getSubQueries().size());
+        assertEquals(expectedName, queryIt.getSubQueries().get(0).getName());
+    }
+
     @Test
     public void testSimpleAnyObject() {
         String jsonContent = "[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]}]]";
@@ -428,6 +417,22 @@ public void testSimpleAnyObject() {
         assertNotNull(queryIt);
     }
 
+    @Test
+    public void testFullAnyObjectConversion() {
+        int expectedNestedArrays = 7;
+        int expectedBidsNestedArrays = 1;
+        int expectedBidsEdgesNestedArrays = 4;
+        String jsonContent = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
+
+        // FromJSON test
+        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+
+        assertNotNull(queryIt);
+        assertEquals(expectedNestedArrays, queryIt.getSubQueries().size());
+        assertEquals(expectedBidsNestedArrays, queryIt.getSubQueries().get(6).getSubQueries().size());
+        assertEquals(expectedBidsEdgesNestedArrays, queryIt.getSubQueries().get(6).getSubQueries().get(0).getSubQueries().size());
+    }
+
 //    @Test
 //    public void testAnyObject() {
 //        String expectedValue = "0110";

From 36a115b180ab96d0dfeea31c7a62801a558b0a45 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 19:42:06 -0400
Subject: [PATCH 32/45] Use Field

---
 .../block/eosiojava/models/queryit/Field.java | 15 ++++++++
 .../models/queryit/FieldDeserializer.java     | 16 ++++++++
 .../eosiojava/models/queryit/QueryIt.java     | 20 +++++++---
 .../models/queryit/QueryItDeserializer.java   | 18 ++++++---
 .../eosiojava/models/queryit/QueryItTest.java | 38 +++++++++++--------
 5 files changed, 80 insertions(+), 27 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/FieldDeserializer.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
new file mode 100644
index 0000000..39ab326
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
@@ -0,0 +1,15 @@
+package one.block.eosiojava.models.queryit;
+
+import com.google.gson.annotations.SerializedName;
+
+public class Field {
+    @SerializedName("name")
+    private String name;
+
+    @SerializedName("value")
+    private QueryIt value;
+
+    public QueryIt getValue() { return this.value; }
+
+    public String getName() { return this.name; }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/FieldDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/FieldDeserializer.java
new file mode 100644
index 0000000..2737edd
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/FieldDeserializer.java
@@ -0,0 +1,16 @@
+package one.block.eosiojava.models.queryit;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import java.lang.reflect.Type;
+
+public class FieldDeserializer implements JsonDeserializer<Field> {
+    @Override
+    public Field deserialize(JsonElement json, Type typeOfT,
+            JsonDeserializationContext context) throws JsonParseException {
+        return new Field();
+    }
+
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
index a3112ab..3b810c5 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
@@ -8,10 +8,12 @@ public class QueryIt {
     private String name;
     private Object value;
 
-    private List<QueryIt> subQueries;
+    private List<Field> fields;
+    private List<QueryIt> queries;
 
     public QueryIt() {
-        subQueries = new ArrayList<QueryIt>();
+        fields = new ArrayList<Field>();
+        queries = new ArrayList<QueryIt>();
     }
 
     public String getName() {
@@ -30,11 +32,19 @@ public void setValue(Object value) {
         this.value = value;
     }
 
+    public void addField(Field queryIt) {
+        fields.add(queryIt);
+    }
+
+    public List<Field> getFields() {
+        return this.fields;
+    }
+
     public void addQueryIt(QueryIt queryIt) {
-        subQueries.add(queryIt);
+        queries.add(queryIt);
     }
 
-    public List<QueryIt> getSubQueries() {
-        return this.subQueries;
+    public List<QueryIt> getQueries() {
+        return this.queries;
     }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
index 39ccfb6..ff09acf 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
@@ -10,6 +10,7 @@
 import java.lang.reflect.Type;
 import java.math.BigInteger;
 import java.time.Instant;
+import java.util.List;
 
 public class QueryItDeserializer implements JsonDeserializer<QueryIt> {
     private static final String ANY_OBJECT_TYPE = "any_object";
@@ -47,12 +48,14 @@ public QueryIt deserialize(JsonElement json, Type typeOfT,
             } else if (type.equals("any_object")) {
                 JsonArray array = jsonAsArray.get(1).getAsJsonArray();
                 for(JsonElement subJson : array) {
-                    JsonObject subJsonAsObject = subJson.getAsJsonObject();
-                    String name = subJsonAsObject.get("name").getAsString();
-                    JsonArray subJsonArray = subJsonAsObject.getAsJsonArray("value");
-                    QueryIt subQueryIt = deserialize(subJsonArray, typeOfT, context);
-                    subQueryIt.setName(name);
-                    queryIt.addQueryIt(subQueryIt);
+//                    JsonObject subJsonAsObject = subJson.getAsJsonObject();
+//                    String name = subJsonAsObject.get("name").getAsString();
+//                    JsonArray subJsonArray = subJsonAsObject.getAsJsonArray("value");
+//                    QueryIt subQueryIt = deserialize(subJsonArray, typeOfT, context);
+//                    subQueryIt.setName(name);
+//                    queryIt.addField(subQueryIt);
+                    Field field = context.deserialize(subJson, Field.class);
+                    queryIt.addField(field);
                 }
                 //queryIt.value = "test";
             } else if (type.equals("any_array")) {
@@ -60,6 +63,9 @@ public QueryIt deserialize(JsonElement json, Type typeOfT,
                 for(JsonElement subJson : array) {
                     QueryIt subQueryIt = deserialize(subJson, typeOfT, context);
                     queryIt.addQueryIt(subQueryIt);
+//                    JsonArray nestedArray = subJson.getAsJsonArray().get(1).getAsJsonArray();
+//                    Field field = context.deserialize(nestedArray, Field.class);
+//                    queryIt.addField(field);
                 }
             } else { // string, checksum256, symbol, symbol_code, asset, bytes
                 queryIt.setValue(jsonAsArray.get(1).getAsString());
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
index 901ff78..65e6a5a 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
@@ -338,7 +338,7 @@ public void testEmptyAnyArray() {
         QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
 
         assertNotNull(queryIt);
-        assertEquals(expectedSubQueriesCount, queryIt.getSubQueries().size());
+        assertEquals(expectedSubQueriesCount, queryIt.getQueries().size());
     }
 
     @Test
@@ -350,8 +350,8 @@ public void testSimpleAnyArray() {
         QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
 
         assertNotNull(queryIt);
-        assertEquals(expectedSubQueriesCount, queryIt.getSubQueries().size());
-        assertEquals(expectedSubqueryValue, queryIt.getSubQueries().get(0).getValue());
+        assertEquals(expectedSubQueriesCount, queryIt.getQueries().size());
+        assertEquals(expectedSubqueryValue, queryIt.getQueries().get(0).getValue());
     }
 
     @Test
@@ -364,9 +364,9 @@ public void testAnyArrayWithMultipleAnyVars() {
         QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
 
         assertNotNull(queryIt);
-        assertEquals(expectedSubQueriesCount, queryIt.getSubQueries().size());
-        assertEquals(expectedSubqueryStringValue, queryIt.getSubQueries().get(0).getValue());
-        assertEquals(expectedSubqueryIntValue, queryIt.getSubQueries().get(1).getValue());
+        assertEquals(expectedSubQueriesCount, queryIt.getQueries().size());
+        assertEquals(expectedSubqueryStringValue, queryIt.getQueries().get(0).getValue());
+        assertEquals(expectedSubqueryIntValue, queryIt.getQueries().get(1).getValue());
     }
 
     @Test
@@ -378,8 +378,8 @@ public void testEmptyNestedAnyArray() {
         QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
 
         assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getSubQueries().size());
-        assertEquals(expectedNestedArrays, queryIt.getSubQueries().get(0).getSubQueries().size());
+        assertEquals(expectedValue, queryIt.getQueries().size());
+        assertEquals(expectedNestedArrays, queryIt.getQueries().get(0).getQueries().size());
     }
 
     @Test
@@ -391,8 +391,8 @@ public void testSimpleNestedAnyArray() {
         QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
 
         assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getSubQueries().size());
-        assertEquals(expectedNestedArrays, queryIt.getSubQueries().get(0).getSubQueries().size());
+        assertEquals(expectedValue, queryIt.getQueries().size());
+        assertEquals(expectedNestedArrays, queryIt.getQueries().get(0).getQueries().size());
     }
 
     @Test
@@ -404,17 +404,23 @@ public void testEmptyValueAnyObject() {
         QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
 
         assertNotNull(queryIt);
-        assertEquals(expectedNestedArrays, queryIt.getSubQueries().size());
-        assertEquals(expectedName, queryIt.getSubQueries().get(0).getName());
+        assertEquals(expectedNestedArrays, queryIt.getFields().size());
+        assertEquals(expectedName, queryIt.getFields().get(0).getName());
     }
 
     @Test
     public void testSimpleAnyObject() {
-        String jsonContent = "[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]}]]";
+        String expectedName = "test";
+        int expectedNestedArrays = 1;
+        BigInteger expectedIntValue = new BigInteger("7");
+        String jsonContent = "[\"any_object\",[{\"name\":\"" + expectedName + "\",\"value\":[\"uint64\"," + expectedIntValue + "]}]]";
 
         QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
 
         assertNotNull(queryIt);
+        assertEquals(expectedNestedArrays, queryIt.getFields().size());
+        assertEquals(expectedName, queryIt.getFields().get(0).getName());
+        assertEquals(expectedIntValue, queryIt.getFields().get(0).getValue().getValue());
     }
 
     @Test
@@ -428,9 +434,9 @@ public void testFullAnyObjectConversion() {
         QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
 
         assertNotNull(queryIt);
-        assertEquals(expectedNestedArrays, queryIt.getSubQueries().size());
-        assertEquals(expectedBidsNestedArrays, queryIt.getSubQueries().get(6).getSubQueries().size());
-        assertEquals(expectedBidsEdgesNestedArrays, queryIt.getSubQueries().get(6).getSubQueries().get(0).getSubQueries().size());
+        assertEquals(expectedNestedArrays, queryIt.getFields().size());
+        assertEquals(expectedBidsNestedArrays, queryIt.getFields().get(6).getValue().getFields().size());
+        assertEquals(expectedBidsEdgesNestedArrays, queryIt.getFields().get(6).getValue().getFields().get(0).getValue().getQueries().size());
     }
 
 //    @Test

From b67e9fbf7bef1cada1791cef05b20582beaba8e0 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 19:42:21 -0400
Subject: [PATCH 33/45] Unnecessary deserializer

---
 .../models/queryit/FieldDeserializer.java        | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/FieldDeserializer.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/FieldDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/FieldDeserializer.java
deleted file mode 100644
index 2737edd..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/FieldDeserializer.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package one.block.eosiojava.models.queryit;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import java.lang.reflect.Type;
-
-public class FieldDeserializer implements JsonDeserializer<Field> {
-    @Override
-    public Field deserialize(JsonElement json, Type typeOfT,
-            JsonDeserializationContext context) throws JsonParseException {
-        return new Field();
-    }
-
-}

From f9cf1cdd72407fafc911285f7a80b0357aa7b87d Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 19:56:41 -0400
Subject: [PATCH 34/45] Add constants

---
 .../models/queryit/QueryItConstants.java      | 25 ++++++++++++
 .../models/queryit/QueryItDeserializer.java   | 40 +++++--------------
 2 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItConstants.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItConstants.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItConstants.java
new file mode 100644
index 0000000..d9d91a2
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItConstants.java
@@ -0,0 +1,25 @@
+package one.block.eosiojava.models.queryit;
+
+public class QueryItConstants {
+    public static final String ANY_OBJECT_TYPE = "any_object";
+    public static final String ANY_ARRAY_TYPE = "any_array";
+    public static final String NULL_T_TYPE = "null_t";
+    public static final String INT64_TYPE = "int64";
+    public static final String UINT64_TYPE = "uint64";
+    public static final String INT32_TYPE = "int32";
+    public static final String UINT32_TYPE = "uint32";
+    public static final String INT16_TYPE = "int16";
+    public static final String UINT16_TYPE = "uint16";
+    public static final String INT8_TYPE = "int8";
+    public static final String UINT8_TYPE = "uint8";
+    public static final String TIME_POINT_TYPE = "time_point";
+    public static final String CHECKSUM256_TYPE = "checksum256";
+    public static final String FLOAT64_TYPE = "float64";
+    public static final String STRING_TYPE = "string";
+    public static final String BYTES_TYPE = "bytes";
+    public static final String SYMBOL_TYPE = "symbol";
+    public static final String SYMBOL_CODE_TYPE = "symbol_code";
+    public static final String ASSET_TYPE = "asset";
+
+    public static final char OPTIONAL_ZONE_CHAR = 'Z';
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
index ff09acf..3591ee5 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
@@ -4,18 +4,12 @@
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.google.gson.JsonPrimitive;
 import java.lang.reflect.Type;
 import java.math.BigInteger;
 import java.time.Instant;
-import java.util.List;
 
 public class QueryItDeserializer implements JsonDeserializer<QueryIt> {
-    private static final String ANY_OBJECT_TYPE = "any_object";
-    private static final String ANY_ARRAY_TYPE = "any_array";
-
     @Override
     public QueryIt deserialize(JsonElement json, Type typeOfT,
             JsonDeserializationContext context) throws JsonParseException {
@@ -27,45 +21,33 @@ public QueryIt deserialize(JsonElement json, Type typeOfT,
             JsonArray jsonAsArray = ((JsonArray) json);
             String type = jsonAsArray.get(0).getAsString();
 
-            if (type.equals("int32")
-                    || type.equals("int16")
-                    || type.equals("uint16")
-                    || type.equals("int8")
-                    || type.equals("uint8")) {
+            if (type.equals(QueryItConstants.INT32_TYPE)
+                    || type.equals(QueryItConstants.INT16_TYPE) || type.equals(QueryItConstants.UINT16_TYPE)
+                    || type.equals(QueryItConstants.INT8_TYPE) || type.equals(QueryItConstants.UINT8_TYPE)) {
                 queryIt.setValue(Integer.parseInt(jsonAsArray.get(1).getAsString()));
-            } else if (type.equals("uint64")) {
+            } else if (type.equals(QueryItConstants.UINT64_TYPE)) {
                 queryIt.setValue(new BigInteger(jsonAsArray.get(1).getAsString()));
-            } else if (type.equals("float64")) {
+            } else if (type.equals(QueryItConstants.FLOAT64_TYPE)) {
                 queryIt.setValue(Float.parseFloat(jsonAsArray.get(1).getAsString()));
-            } else if (type.equals("int64") || type.equals("uint32")) {
+            } else if (type.equals(QueryItConstants.INT64_TYPE) || type.equals(QueryItConstants.UINT32_TYPE)) {
                 queryIt.setValue(Long.parseLong(jsonAsArray.get(1).getAsString()));
-            } else if (type.equals("time_point")) {
+            } else if (type.equals(QueryItConstants.TIME_POINT_TYPE)) {
                 String timePointAsString = jsonAsArray.get(1).getAsString();
-                if (timePointAsString.charAt(timePointAsString.length() - 1) != 'Z') {
-                    timePointAsString += 'Z';
+                if (timePointAsString.charAt(timePointAsString.length() - 1) != QueryItConstants.OPTIONAL_ZONE_CHAR) {
+                    timePointAsString += QueryItConstants.OPTIONAL_ZONE_CHAR;
                 }
                 queryIt.setValue(Instant.parse(timePointAsString));
-            } else if (type.equals("any_object")) {
+            } else if (type.equals(QueryItConstants.ANY_OBJECT_TYPE)) {
                 JsonArray array = jsonAsArray.get(1).getAsJsonArray();
                 for(JsonElement subJson : array) {
-//                    JsonObject subJsonAsObject = subJson.getAsJsonObject();
-//                    String name = subJsonAsObject.get("name").getAsString();
-//                    JsonArray subJsonArray = subJsonAsObject.getAsJsonArray("value");
-//                    QueryIt subQueryIt = deserialize(subJsonArray, typeOfT, context);
-//                    subQueryIt.setName(name);
-//                    queryIt.addField(subQueryIt);
                     Field field = context.deserialize(subJson, Field.class);
                     queryIt.addField(field);
                 }
-                //queryIt.value = "test";
-            } else if (type.equals("any_array")) {
+            } else if (type.equals(QueryItConstants.ANY_ARRAY_TYPE)) {
                 JsonArray array = jsonAsArray.get(1).getAsJsonArray();
                 for(JsonElement subJson : array) {
                     QueryIt subQueryIt = deserialize(subJson, typeOfT, context);
                     queryIt.addQueryIt(subQueryIt);
-//                    JsonArray nestedArray = subJson.getAsJsonArray().get(1).getAsJsonArray();
-//                    Field field = context.deserialize(nestedArray, Field.class);
-//                    queryIt.addField(field);
                 }
             } else { // string, checksum256, symbol, symbol_code, asset, bytes
                 queryIt.setValue(jsonAsArray.get(1).getAsString());

From 834beb0735d32cfd564fbd8262eb2c7bc5c557d2 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 20:04:37 -0400
Subject: [PATCH 35/45] Convert QueryIt -> AnyVar

---
 .../eosiojava/models/queryit/AnyObject.java   |  10 -
 .../queryit/{QueryIt.java => AnyVar.java}     |  16 +-
 ...erializer.java => AnyVarDeserializer.java} |  28 +-
 .../block/eosiojava/models/queryit/Field.java |   4 +-
 .../one/block/eosiojava/utilities/Utils.java  |   6 +-
 .../{QueryItTest.java => AnyVarTest.java}     | 249 +++++++++---------
 6 files changed, 146 insertions(+), 167 deletions(-)
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyObject.java
 rename eosiojava/src/main/java/one/block/eosiojava/models/queryit/{QueryIt.java => AnyVar.java} (71%)
 rename eosiojava/src/main/java/one/block/eosiojava/models/queryit/{QueryItDeserializer.java => AnyVarDeserializer.java} (69%)
 rename eosiojava/src/test/java/one/block/eosiojava/models/queryit/{QueryItTest.java => AnyVarTest.java} (58%)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyObject.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyObject.java
deleted file mode 100644
index 8a97bf0..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyObject.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package one.block.eosiojava.models.queryit;
-
-import com.google.gson.annotations.SerializedName;
-import java.util.Map;
-
-public class AnyObject {
-    public String name;
-
-    public Object value;
-}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
similarity index 71%
rename from eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
rename to eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
index 3b810c5..4ed6da7 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryIt.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
@@ -4,16 +4,16 @@
 import java.util.ArrayList;
 import java.util.List;
 
-public class QueryIt {
+public class AnyVar {
     private String name;
     private Object value;
 
     private List<Field> fields;
-    private List<QueryIt> queries;
+    private List<AnyVar> anyVars;
 
-    public QueryIt() {
+    public AnyVar() {
         fields = new ArrayList<Field>();
-        queries = new ArrayList<QueryIt>();
+        anyVars = new ArrayList<AnyVar>();
     }
 
     public String getName() {
@@ -40,11 +40,11 @@ public List<Field> getFields() {
         return this.fields;
     }
 
-    public void addQueryIt(QueryIt queryIt) {
-        queries.add(queryIt);
+    public void addAnyVar(AnyVar anyVar) {
+        anyVars.add(anyVar);
     }
 
-    public List<QueryIt> getQueries() {
-        return this.queries;
+    public List<AnyVar> getAnyVars() {
+        return this.anyVars;
     }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
similarity index 69%
rename from eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
rename to eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
index 3591ee5..ce689b0 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
@@ -9,14 +9,14 @@
 import java.math.BigInteger;
 import java.time.Instant;
 
-public class QueryItDeserializer implements JsonDeserializer<QueryIt> {
+public class AnyVarDeserializer implements JsonDeserializer<AnyVar> {
     @Override
-    public QueryIt deserialize(JsonElement json, Type typeOfT,
+    public AnyVar deserialize(JsonElement json, Type typeOfT,
             JsonDeserializationContext context) throws JsonParseException {
 
-        QueryIt queryIt = new QueryIt();
+        AnyVar anyVar = new AnyVar();
         if (!json.isJsonArray() || ((JsonArray)json).size() == 0) { // null_t
-            return queryIt; // Seems like this might actually be wrong for size() == 0, return []
+            return anyVar; // Seems like this might actually be wrong for size() == 0, return []
         } else {
             JsonArray jsonAsArray = ((JsonArray) json);
             String type = jsonAsArray.get(0).getAsString();
@@ -24,35 +24,35 @@ public QueryIt deserialize(JsonElement json, Type typeOfT,
             if (type.equals(QueryItConstants.INT32_TYPE)
                     || type.equals(QueryItConstants.INT16_TYPE) || type.equals(QueryItConstants.UINT16_TYPE)
                     || type.equals(QueryItConstants.INT8_TYPE) || type.equals(QueryItConstants.UINT8_TYPE)) {
-                queryIt.setValue(Integer.parseInt(jsonAsArray.get(1).getAsString()));
+                anyVar.setValue(Integer.parseInt(jsonAsArray.get(1).getAsString()));
             } else if (type.equals(QueryItConstants.UINT64_TYPE)) {
-                queryIt.setValue(new BigInteger(jsonAsArray.get(1).getAsString()));
+                anyVar.setValue(new BigInteger(jsonAsArray.get(1).getAsString()));
             } else if (type.equals(QueryItConstants.FLOAT64_TYPE)) {
-                queryIt.setValue(Float.parseFloat(jsonAsArray.get(1).getAsString()));
+                anyVar.setValue(Float.parseFloat(jsonAsArray.get(1).getAsString()));
             } else if (type.equals(QueryItConstants.INT64_TYPE) || type.equals(QueryItConstants.UINT32_TYPE)) {
-                queryIt.setValue(Long.parseLong(jsonAsArray.get(1).getAsString()));
+                anyVar.setValue(Long.parseLong(jsonAsArray.get(1).getAsString()));
             } else if (type.equals(QueryItConstants.TIME_POINT_TYPE)) {
                 String timePointAsString = jsonAsArray.get(1).getAsString();
                 if (timePointAsString.charAt(timePointAsString.length() - 1) != QueryItConstants.OPTIONAL_ZONE_CHAR) {
                     timePointAsString += QueryItConstants.OPTIONAL_ZONE_CHAR;
                 }
-                queryIt.setValue(Instant.parse(timePointAsString));
+                anyVar.setValue(Instant.parse(timePointAsString));
             } else if (type.equals(QueryItConstants.ANY_OBJECT_TYPE)) {
                 JsonArray array = jsonAsArray.get(1).getAsJsonArray();
                 for(JsonElement subJson : array) {
                     Field field = context.deserialize(subJson, Field.class);
-                    queryIt.addField(field);
+                    anyVar.addField(field);
                 }
             } else if (type.equals(QueryItConstants.ANY_ARRAY_TYPE)) {
                 JsonArray array = jsonAsArray.get(1).getAsJsonArray();
                 for(JsonElement subJson : array) {
-                    QueryIt subQueryIt = deserialize(subJson, typeOfT, context);
-                    queryIt.addQueryIt(subQueryIt);
+                    AnyVar subAnyVar = deserialize(subJson, typeOfT, context);
+                    anyVar.addAnyVar(subAnyVar);
                 }
             } else { // string, checksum256, symbol, symbol_code, asset, bytes
-                queryIt.setValue(jsonAsArray.get(1).getAsString());
+                anyVar.setValue(jsonAsArray.get(1).getAsString());
             }
         }
-        return queryIt;
+        return anyVar;
     }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
index 39ab326..c645b1c 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
@@ -7,9 +7,9 @@ public class Field {
     private String name;
 
     @SerializedName("value")
-    private QueryIt value;
+    private AnyVar value;
 
-    public QueryIt getValue() { return this.value; }
+    public AnyVar getValue() { return this.value; }
 
     public String getName() { return this.name; }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
index a287e92..db629e3 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
@@ -8,8 +8,8 @@
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.Serializable;
-import one.block.eosiojava.models.queryit.QueryIt;
-import one.block.eosiojava.models.queryit.QueryItDeserializer;
+import one.block.eosiojava.models.queryit.AnyVar;
+import one.block.eosiojava.models.queryit.AnyVarDeserializer;
 
 /**
  * This class provides generic utility methods
@@ -43,7 +43,7 @@ public static <T extends Serializable> T clone(T object) throws IOException, Cla
      */
     public static Gson getGson(String datePattern) {
         return new GsonBuilder()
-                .registerTypeAdapter(QueryIt.class, new QueryItDeserializer())
+                .registerTypeAdapter(AnyVar.class, new AnyVarDeserializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping()
                 .create();
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
similarity index 58%
rename from eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
rename to eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
index 65e6a5a..86c88b6 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/QueryItTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
@@ -9,7 +9,7 @@
 import org.junit.Before;
 import org.junit.Test;
 
-public class QueryItTest {
+public class AnyVarTest {
 
     // For generic deserialization of arrays
 //    Type listType = new TypeToken<ArrayList<AnyObject>>(){}.getType();
@@ -23,7 +23,7 @@ public class QueryItTest {
     public void setUpGSON() {
         String datePattern = "yyyy-MM-dd'T'hh:mm:ss zzz";
         this.gson = new GsonBuilder()
-                .registerTypeAdapter(QueryIt.class, new QueryItDeserializer())
+                .registerTypeAdapter(AnyVar.class, new AnyVarDeserializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping().create();
     }
@@ -32,10 +32,10 @@ public void setUpGSON() {
     public void testConvertNull() {
         String jsonContent = "[]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertNull(queryIt.getValue());
+        assertNotNull(anyVar);
+        assertNull(anyVar.getValue());
     }
 
     @Test
@@ -43,10 +43,10 @@ public void testConvertString() {
         String expectedValue = "someValue";
         String jsonContent = "[\"string\", \"" + expectedValue + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -54,10 +54,10 @@ public void testConvertChecksum256() {
         String expectedValue = "532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25";
         String jsonContent = "[\"checksum256\", \"" + expectedValue + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -65,10 +65,10 @@ public void testConvertSymbol() {
         String expectedValue = "10.0000 EOS";
         String jsonContent = "[\"symbol\", \"" + expectedValue + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -76,10 +76,10 @@ public void testConvertSymbolCode() {
         String expectedValue = "EOS";
         String jsonContent = "[\"symbol_code\", \"" + expectedValue + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -87,10 +87,10 @@ public void testConvertAsset() {
         String expectedValue = "10.0000 EOS";
         String jsonContent = "[\"asset\", \"" + expectedValue + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -98,10 +98,10 @@ public void testConvertMaxUInt64() {
         BigInteger expectedValue = new BigInteger("18446744073709551615");
         String jsonContent = "[\"uint64\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -109,10 +109,10 @@ public void testConvertMinUInt64() {
         BigInteger expectedValue = new BigInteger("0");
         String jsonContent = "[\"uint64\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -120,10 +120,10 @@ public void testConvertMaxInt64() {
         Long expectedValue = 9223372036854775807L;
         String jsonContent = "[\"int64\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -131,10 +131,10 @@ public void testConvertMinInt64() {
         Long expectedValue = -9223372036854775808L;
         String jsonContent = "[\"int64\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -142,10 +142,10 @@ public void testConvertMaxUInt32() {
         Long expectedValue = 4294967295L;
         String jsonContent = "[\"uint32\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -153,10 +153,10 @@ public void testConvertMinUInt32() {
         Long expectedValue = 0L;
         String jsonContent = "[\"uint32\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -164,10 +164,10 @@ public void testConvertMaxInt32() {
         Integer expectedValue = 2147483647;
         String jsonContent = "[\"int32\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -175,10 +175,10 @@ public void testConvertMinInt32() {
         Integer expectedValue = -2147483648;
         String jsonContent = "[\"int32\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -186,10 +186,10 @@ public void testConvertMaxUInt16() {
         Integer expectedValue = 65535;
         String jsonContent = "[\"uint16\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -197,10 +197,10 @@ public void testConvertMinUInt16() {
         Integer expectedValue = 0;
         String jsonContent = "[\"uint16\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -208,10 +208,10 @@ public void testConvertMaxInt16() {
         Integer expectedValue = 32767;
         String jsonContent = "[\"int16\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -219,10 +219,10 @@ public void testConvertMinInt16() {
         Integer expectedValue = -32768;
         String jsonContent = "[\"int16\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -230,10 +230,10 @@ public void testConvertMaxUInt8() {
         Integer expectedValue = 256;
         String jsonContent = "[\"uint8\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -241,10 +241,10 @@ public void testConvertMinUInt8() {
         Integer expectedValue = 0;
         String jsonContent = "[\"uint8\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -252,10 +252,10 @@ public void testConvertMaxInt8() {
         Integer expectedValue = 127;
         String jsonContent = "[\"int8\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -263,10 +263,10 @@ public void testConvertMinInt8() {
         Integer expectedValue = -128;
         String jsonContent = "[\"int8\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -274,10 +274,10 @@ public void testConvertMaxFloat64() {
         Float expectedValue = Float.parseFloat("3.40282e+038");
         String jsonContent = "[\"float64\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -285,10 +285,10 @@ public void testConvertMinFloat64() {
         Float expectedValue = Float.parseFloat("1.17549e-038");
         String jsonContent = "[\"float64\", \"" + expectedValue.toString() + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -298,11 +298,11 @@ public void testConvertTimepointWithoutZone() {
         String expectedValueToString = "2020-07-16T10:38:46Z";
         String jsonContent = "[\"time_point\", \"" + expectedValueAsString + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
-        assertEquals(expectedValueToString, queryIt.getValue().toString());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
+        assertEquals(expectedValueToString, anyVar.getValue().toString());
     }
 
     @Test
@@ -312,11 +312,11 @@ public void testConvertTimepointWithZone() {
         String expectedValueToString = "2020-07-16T10:38:46.500Z";
         String jsonContent = "[\"time_point\", \"" + expectedValueAsString + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
-        assertEquals(expectedValueToString, queryIt.getValue().toString());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
+        assertEquals(expectedValueToString, anyVar.getValue().toString());
     }
 
     @Test
@@ -324,10 +324,10 @@ public void testConvertBytes() {
         String expectedValue = "0110";
         String jsonContent = "[\"bytes\", \"" + expectedValue + "\"]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getValue());
     }
 
     @Test
@@ -335,10 +335,10 @@ public void testEmptyAnyArray() {
         int expectedSubQueriesCount = 0;
         String jsonContent = "[\"any_array\", []]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedSubQueriesCount, queryIt.getQueries().size());
+        assertNotNull(anyVar);
+        assertEquals(expectedSubQueriesCount, anyVar.getAnyVars().size());
     }
 
     @Test
@@ -347,11 +347,11 @@ public void testSimpleAnyArray() {
         int expectedSubQueriesCount = 1;
         String jsonContent = "[\"any_array\", [[\"string\", \"" + expectedSubqueryValue + "\"]]]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedSubQueriesCount, queryIt.getQueries().size());
-        assertEquals(expectedSubqueryValue, queryIt.getQueries().get(0).getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedSubQueriesCount, anyVar.getAnyVars().size());
+        assertEquals(expectedSubqueryValue, anyVar.getAnyVars().get(0).getValue());
     }
 
     @Test
@@ -361,12 +361,12 @@ public void testAnyArrayWithMultipleAnyVars() {
         int expectedSubQueriesCount = 2;
         String jsonContent = "[\"any_array\", [[\"string\", \"" + expectedSubqueryStringValue + "\"], [\"uint32\", " + expectedSubqueryIntValue + "]]]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedSubQueriesCount, queryIt.getQueries().size());
-        assertEquals(expectedSubqueryStringValue, queryIt.getQueries().get(0).getValue());
-        assertEquals(expectedSubqueryIntValue, queryIt.getQueries().get(1).getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedSubQueriesCount, anyVar.getAnyVars().size());
+        assertEquals(expectedSubqueryStringValue, anyVar.getAnyVars().get(0).getValue());
+        assertEquals(expectedSubqueryIntValue, anyVar.getAnyVars().get(1).getValue());
     }
 
     @Test
@@ -375,11 +375,11 @@ public void testEmptyNestedAnyArray() {
         int expectedNestedArrays = 0;
         String jsonContent = "[\"any_array\", [[\"any_array\", []]]]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getQueries().size());
-        assertEquals(expectedNestedArrays, queryIt.getQueries().get(0).getQueries().size());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getAnyVars().size());
+        assertEquals(expectedNestedArrays, anyVar.getAnyVars().get(0).getAnyVars().size());
     }
 
     @Test
@@ -388,11 +388,11 @@ public void testSimpleNestedAnyArray() {
         int expectedNestedArrays = 1;
         String jsonContent = "[\"any_array\", [[\"any_array\", [[\"string\", \"test\"]]]]]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedValue, queryIt.getQueries().size());
-        assertEquals(expectedNestedArrays, queryIt.getQueries().get(0).getQueries().size());
+        assertNotNull(anyVar);
+        assertEquals(expectedValue, anyVar.getAnyVars().size());
+        assertEquals(expectedNestedArrays, anyVar.getAnyVars().get(0).getAnyVars().size());
     }
 
     @Test
@@ -401,11 +401,11 @@ public void testEmptyValueAnyObject() {
         int expectedNestedArrays = 1;
         String jsonContent = "[\"any_object\",[{\"name\":\"" + expectedName + "\",\"value\":[]}]]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedNestedArrays, queryIt.getFields().size());
-        assertEquals(expectedName, queryIt.getFields().get(0).getName());
+        assertNotNull(anyVar);
+        assertEquals(expectedNestedArrays, anyVar.getFields().size());
+        assertEquals(expectedName, anyVar.getFields().get(0).getName());
     }
 
     @Test
@@ -415,12 +415,12 @@ public void testSimpleAnyObject() {
         BigInteger expectedIntValue = new BigInteger("7");
         String jsonContent = "[\"any_object\",[{\"name\":\"" + expectedName + "\",\"value\":[\"uint64\"," + expectedIntValue + "]}]]";
 
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedNestedArrays, queryIt.getFields().size());
-        assertEquals(expectedName, queryIt.getFields().get(0).getName());
-        assertEquals(expectedIntValue, queryIt.getFields().get(0).getValue().getValue());
+        assertNotNull(anyVar);
+        assertEquals(expectedNestedArrays, anyVar.getFields().size());
+        assertEquals(expectedName, anyVar.getFields().get(0).getName());
+        assertEquals(expectedIntValue, anyVar.getFields().get(0).getValue().getValue());
     }
 
     @Test
@@ -431,22 +431,11 @@ public void testFullAnyObjectConversion() {
         String jsonContent = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
 
         // FromJSON test
-        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
-        assertNotNull(queryIt);
-        assertEquals(expectedNestedArrays, queryIt.getFields().size());
-        assertEquals(expectedBidsNestedArrays, queryIt.getFields().get(6).getValue().getFields().size());
-        assertEquals(expectedBidsEdgesNestedArrays, queryIt.getFields().get(6).getValue().getFields().get(0).getValue().getQueries().size());
+        assertNotNull(anyVar);
+        assertEquals(expectedNestedArrays, anyVar.getFields().size());
+        assertEquals(expectedBidsNestedArrays, anyVar.getFields().get(6).getValue().getFields().size());
+        assertEquals(expectedBidsEdgesNestedArrays, anyVar.getFields().get(6).getValue().getFields().get(0).getValue().getAnyVars().size());
     }
-
-//    @Test
-//    public void testAnyObject() {
-//        String expectedValue = "0110";
-//        String jsonContent = "[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]";
-//
-//        QueryIt queryIt = this.gson.fromJson(jsonContent, QueryIt.class);
-//
-//        assertNotNull(queryIt);
-//        assertEquals(expectedValue, queryIt.getValue());
-//    }
 }

From 8b3feff9a2fd1398d0593e0dbdb3cf2ccdf43f80 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 22:37:50 -0400
Subject: [PATCH 36/45] Serialize all regular types

---
 .../eosiojava/models/queryit/AnyVar.java      |  14 ++
 .../models/queryit/AnyVarDeserializer.java    |  13 +-
 .../models/queryit/AnyVarSerializer.java      |  56 +++++++
 .../eosiojava/models/queryit/AnyVarTest.java  | 149 ++++++++++++++----
 4 files changed, 192 insertions(+), 40 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
index 4ed6da7..39a3f71 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
@@ -1,10 +1,12 @@
 package one.block.eosiojava.models.queryit;
 
 
+import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
 public class AnyVar {
+    private String type;
     private String name;
     private Object value;
 
@@ -32,6 +34,14 @@ public void setValue(Object value) {
         this.value = value;
     }
 
+    public String getType() {
+        return this.type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     public void addField(Field queryIt) {
         fields.add(queryIt);
     }
@@ -47,4 +57,8 @@ public void addAnyVar(AnyVar anyVar) {
     public List<AnyVar> getAnyVars() {
         return this.anyVars;
     }
+
+    public Boolean isEmpty() {
+        return this.name == null && this.value == null && this.getFields().size() == 0 && this.getAnyVars().size() == 0;
+    }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
index ce689b0..72a3064 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
@@ -20,6 +20,7 @@ public AnyVar deserialize(JsonElement json, Type typeOfT,
         } else {
             JsonArray jsonAsArray = ((JsonArray) json);
             String type = jsonAsArray.get(0).getAsString();
+            anyVar.setType(type);
 
             if (type.equals(QueryItConstants.INT32_TYPE)
                     || type.equals(QueryItConstants.INT16_TYPE) || type.equals(QueryItConstants.UINT16_TYPE)
@@ -31,12 +32,12 @@ public AnyVar deserialize(JsonElement json, Type typeOfT,
                 anyVar.setValue(Float.parseFloat(jsonAsArray.get(1).getAsString()));
             } else if (type.equals(QueryItConstants.INT64_TYPE) || type.equals(QueryItConstants.UINT32_TYPE)) {
                 anyVar.setValue(Long.parseLong(jsonAsArray.get(1).getAsString()));
-            } else if (type.equals(QueryItConstants.TIME_POINT_TYPE)) {
-                String timePointAsString = jsonAsArray.get(1).getAsString();
-                if (timePointAsString.charAt(timePointAsString.length() - 1) != QueryItConstants.OPTIONAL_ZONE_CHAR) {
-                    timePointAsString += QueryItConstants.OPTIONAL_ZONE_CHAR;
-                }
-                anyVar.setValue(Instant.parse(timePointAsString));
+//            } else if (type.equals(QueryItConstants.TIME_POINT_TYPE)) { // Serialization doesn't work exactly due to dropped milliseconds if .000
+//                String timePointAsString = jsonAsArray.get(1).getAsString();
+//                if (timePointAsString.charAt(timePointAsString.length() - 1) != QueryItConstants.OPTIONAL_ZONE_CHAR) {
+//                    timePointAsString += QueryItConstants.OPTIONAL_ZONE_CHAR;
+//                }
+//                anyVar.setValue(Instant.parse(timePointAsString));
             } else if (type.equals(QueryItConstants.ANY_OBJECT_TYPE)) {
                 JsonArray array = jsonAsArray.get(1).getAsJsonArray();
                 for(JsonElement subJson : array) {
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
new file mode 100644
index 0000000..7194656
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
@@ -0,0 +1,56 @@
+package one.block.eosiojava.models.queryit;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
+import java.math.BigInteger;
+import java.time.Instant;
+
+public class AnyVarSerializer implements JsonSerializer<AnyVar> {
+
+    @Override
+    public JsonElement serialize(AnyVar src, Type typeOfSrc, JsonSerializationContext context) {
+        if (src.isEmpty()) {
+            return new JsonArray();
+        } else {
+            JsonArray array = new JsonArray();
+            String type = src.getType();
+            array.add(type);
+
+            array.add(src.getValue().toString());
+
+            return array;
+        }
+    }
+
+    // Don't think this matters, even though it'd be nice.. doesn't match output JSON from EOSJS
+//            switch(type) {
+//                case QueryItConstants.INT32_TYPE:
+//                case QueryItConstants.INT16_TYPE:
+//                case QueryItConstants.UINT16_TYPE:
+//                case QueryItConstants.INT8_TYPE:
+//                case QueryItConstants.UINT8_TYPE:
+//                    array.add((Integer)src.getValue());
+//                    break;
+//                case QueryItConstants.UINT64_TYPE:
+//                    array.add((BigInteger)src.getValue());
+//                    break;
+//                case QueryItConstants.FLOAT64_TYPE:
+//                    array.add((Float)src.getValue());
+//                    break;
+//                case QueryItConstants.UINT32_TYPE:
+//                case QueryItConstants.INT64_TYPE:
+//                    array.add((Long)src.getValue());
+//                    break;
+//                default: // time_point, string, checksum256, symbol, symbol_code, asset, bytes
+//                    array.add((String)src.getValue());
+//                    break;
+//            }
+}
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
index 86c88b6..a404bd6 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
@@ -1,6 +1,8 @@
 package one.block.eosiojava.models.queryit;
 
 import static junit.framework.TestCase.*;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertNotNull;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -24,6 +26,7 @@ public void setUpGSON() {
         String datePattern = "yyyy-MM-dd'T'hh:mm:ss zzz";
         this.gson = new GsonBuilder()
                 .registerTypeAdapter(AnyVar.class, new AnyVarDeserializer())
+                .registerTypeAdapter(AnyVar.class, new AnyVarSerializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping().create();
     }
@@ -36,298 +39,373 @@ public void testConvertNull() {
 
         assertNotNull(anyVar);
         assertNull(anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertString() {
         String expectedValue = "someValue";
-        String jsonContent = "[\"string\", \"" + expectedValue + "\"]";
+        String jsonContent = "[\"string\",\"" + expectedValue + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertChecksum256() {
         String expectedValue = "532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25";
-        String jsonContent = "[\"checksum256\", \"" + expectedValue + "\"]";
+        String jsonContent = "[\"checksum256\",\"" + expectedValue + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertSymbol() {
         String expectedValue = "10.0000 EOS";
-        String jsonContent = "[\"symbol\", \"" + expectedValue + "\"]";
+        String jsonContent = "[\"symbol\",\"" + expectedValue + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertSymbolCode() {
         String expectedValue = "EOS";
-        String jsonContent = "[\"symbol_code\", \"" + expectedValue + "\"]";
+        String jsonContent = "[\"symbol_code\",\"" + expectedValue + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertAsset() {
         String expectedValue = "10.0000 EOS";
-        String jsonContent = "[\"asset\", \"" + expectedValue + "\"]";
+        String jsonContent = "[\"asset\",\"" + expectedValue + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxUInt64() {
         BigInteger expectedValue = new BigInteger("18446744073709551615");
-        String jsonContent = "[\"uint64\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"uint64\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinUInt64() {
         BigInteger expectedValue = new BigInteger("0");
-        String jsonContent = "[\"uint64\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"uint64\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxInt64() {
         Long expectedValue = 9223372036854775807L;
-        String jsonContent = "[\"int64\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"int64\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinInt64() {
         Long expectedValue = -9223372036854775808L;
-        String jsonContent = "[\"int64\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"int64\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxUInt32() {
         Long expectedValue = 4294967295L;
-        String jsonContent = "[\"uint32\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"uint32\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinUInt32() {
         Long expectedValue = 0L;
-        String jsonContent = "[\"uint32\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"uint32\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxInt32() {
         Integer expectedValue = 2147483647;
-        String jsonContent = "[\"int32\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"int32\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinInt32() {
         Integer expectedValue = -2147483648;
-        String jsonContent = "[\"int32\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"int32\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxUInt16() {
         Integer expectedValue = 65535;
-        String jsonContent = "[\"uint16\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"uint16\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinUInt16() {
         Integer expectedValue = 0;
-        String jsonContent = "[\"uint16\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"uint16\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxInt16() {
         Integer expectedValue = 32767;
-        String jsonContent = "[\"int16\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"int16\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinInt16() {
         Integer expectedValue = -32768;
-        String jsonContent = "[\"int16\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"int16\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxUInt8() {
         Integer expectedValue = 256;
-        String jsonContent = "[\"uint8\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"uint8\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinUInt8() {
         Integer expectedValue = 0;
-        String jsonContent = "[\"uint8\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"uint8\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxInt8() {
         Integer expectedValue = 127;
-        String jsonContent = "[\"int8\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"int8\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinInt8() {
         Integer expectedValue = -128;
-        String jsonContent = "[\"int8\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"int8\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxFloat64() {
         Float expectedValue = Float.parseFloat("3.40282e+038");
-        String jsonContent = "[\"float64\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"float64\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinFloat64() {
         Float expectedValue = Float.parseFloat("1.17549e-038");
-        String jsonContent = "[\"float64\", \"" + expectedValue.toString() + "\"]";
+        String jsonContent = "[\"float64\",\"" + expectedValue.toString() + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertTimepointWithoutZone() {
-        String expectedValueAsString = "2020-07-16T10:38:46.000";
-        Instant expectedValue = Instant.parse(expectedValueAsString + 'Z');
-        String expectedValueToString = "2020-07-16T10:38:46Z";
-        String jsonContent = "[\"time_point\", \"" + expectedValueAsString + "\"]";
+        String expectedValue = "2020-07-16T10:38:46.000";
+        String jsonContent = "[\"time_point\",\"" + expectedValue + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-        assertEquals(expectedValueToString, anyVar.getValue().toString());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertTimepointWithZone() {
-        String expectedValueAsString = "2020-07-16T10:38:46.500Z";
-        Instant expectedValue = Instant.parse(expectedValueAsString);
-        String expectedValueToString = "2020-07-16T10:38:46.500Z";
-        String jsonContent = "[\"time_point\", \"" + expectedValueAsString + "\"]";
+        String expectedValue = "2020-07-16T10:38:46.500Z";
+        String jsonContent = "[\"time_point\",\"" + expectedValue + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-        assertEquals(expectedValueToString, anyVar.getValue().toString());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertBytes() {
         String expectedValue = "0110";
-        String jsonContent = "[\"bytes\", \"" + expectedValue + "\"]";
+        String jsonContent = "[\"bytes\",\"" + expectedValue + "\"]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -437,5 +515,8 @@ public void testFullAnyObjectConversion() {
         assertEquals(expectedNestedArrays, anyVar.getFields().size());
         assertEquals(expectedBidsNestedArrays, anyVar.getFields().get(6).getValue().getFields().size());
         assertEquals(expectedBidsEdgesNestedArrays, anyVar.getFields().get(6).getValue().getFields().get(0).getValue().getAnyVars().size());
+
+        String toJSON = this.gson.toJson(anyVar);
+        String test = toJSON;
     }
 }

From 3aa11df4ddc1f7004df489cbbbd17bba41dab696 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Fri, 17 Jul 2020 23:36:57 -0400
Subject: [PATCH 37/45] Fix bug in deserializer. Add serializer for now

---
 .../models/queryit/AnyVarDeserializer.java    |  5 ++-
 .../models/queryit/AnyVarSerializer.java      | 45 ++++++++++++++++---
 .../eosiojava/models/queryit/AnyVarTest.java  | 36 +++++++++++++--
 3 files changed, 75 insertions(+), 11 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
index 72a3064..0f8c91b 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
@@ -7,7 +7,6 @@
 import com.google.gson.JsonParseException;
 import java.lang.reflect.Type;
 import java.math.BigInteger;
-import java.time.Instant;
 
 public class AnyVarDeserializer implements JsonDeserializer<AnyVar> {
     @Override
@@ -15,7 +14,9 @@ public AnyVar deserialize(JsonElement json, Type typeOfT,
             JsonDeserializationContext context) throws JsonParseException {
 
         AnyVar anyVar = new AnyVar();
-        if (!json.isJsonArray() || ((JsonArray)json).size() == 0) { // null_t
+        if (json.isJsonPrimitive()) {
+            anyVar.setValue(json.getAsJsonPrimitive().getAsString());
+        } else if (!json.isJsonArray() || ((JsonArray)json).size() == 0) { // null_t
             return anyVar; // Seems like this might actually be wrong for size() == 0, return []
         } else {
             JsonArray jsonAsArray = ((JsonArray) json);
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
index 7194656..48af941 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
@@ -20,14 +20,49 @@ public JsonElement serialize(AnyVar src, Type typeOfSrc, JsonSerializationContex
         if (src.isEmpty()) {
             return new JsonArray();
         } else {
-            JsonArray array = new JsonArray();
-            String type = src.getType();
-            array.add(type);
+            JsonObject object = new JsonObject();
+            for (Field field : src.getFields()) {
+                if (field.getValue().getType().equals(QueryItConstants.ANY_OBJECT_TYPE)) {
+                    JsonElement jsonElement = serialize(field.getValue(), typeOfSrc, context);
+                    String test = "";
+                    //object.add(field.getValue());
+                } else if (field.getValue().isEmpty()) {
+                    return new JsonArray();
+                } else {
+                    try {
+                        object.addProperty(field.getName(), field.getValue().getValue().toString());
+                    } catch(NullPointerException exception) {
+                        String test = "";
+                    }
 
-            array.add(src.getValue().toString());
+                }
+            }
 
-            return array;
+            for (AnyVar anyVar : src.getAnyVars()) {
+                JsonElement array = serialize(anyVar, typeOfSrc, context);
+
+                String test = "";
+            }
+            return object;
         }
+//        else {
+//            JsonArray array = new JsonArray();
+//            String type = src.getType();
+//            array.add(type);
+//
+//            for(AnyVar anyVar : src.getAnyVars()) {
+//                JsonElement object = serialize(anyVar, typeOfSrc, context);
+//                String test = "";
+//            }
+//
+////            for(Field field : src.getFields()) {
+////                JsonObject object = serialize(field, )
+////            }
+//
+//            array.add(src.getValue().toString());
+//
+//            return array;
+//        }
     }
 
     // Don't think this matters, even though it'd be nice.. doesn't match output JSON from EOSJS
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
index a404bd6..e70e76a 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
@@ -411,25 +411,33 @@ public void testConvertBytes() {
     @Test
     public void testEmptyAnyArray() {
         int expectedSubQueriesCount = 0;
-        String jsonContent = "[\"any_array\", []]";
+        String expectedJsonContent = "[]";
+        String jsonContent = "[\"any_array\", " + expectedJsonContent + "]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedSubQueriesCount, anyVar.getAnyVars().size());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, expectedJsonContent);
     }
 
     @Test
     public void testSimpleAnyArray() {
         String expectedSubqueryValue = "test";
         int expectedSubQueriesCount = 1;
-        String jsonContent = "[\"any_array\", [[\"string\", \"" + expectedSubqueryValue + "\"]]]";
+        String expectedJsonContent = "[[\"string\", \"" + expectedSubqueryValue + "\"]]";
+        String jsonContent = "[\"any_array\", " + expectedJsonContent + "]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedSubQueriesCount, anyVar.getAnyVars().size());
         assertEquals(expectedSubqueryValue, anyVar.getAnyVars().get(0).getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, expectedJsonContent);
     }
 
     @Test
@@ -489,8 +497,9 @@ public void testEmptyValueAnyObject() {
     @Test
     public void testSimpleAnyObject() {
         String expectedName = "test";
-        int expectedNestedArrays = 1;
         BigInteger expectedIntValue = new BigInteger("7");
+        String expectedJsonContent = "{\"" + expectedName + "\":\"" + expectedIntValue + "\"}";
+        int expectedNestedArrays = 1;
         String jsonContent = "[\"any_object\",[{\"name\":\"" + expectedName + "\",\"value\":[\"uint64\"," + expectedIntValue + "]}]]";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
@@ -499,6 +508,25 @@ public void testSimpleAnyObject() {
         assertEquals(expectedNestedArrays, anyVar.getFields().size());
         assertEquals(expectedName, anyVar.getFields().get(0).getName());
         assertEquals(expectedIntValue, anyVar.getFields().get(0).getValue().getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, expectedJsonContent);
+    }
+
+    @Test
+    public void testNestedAnyObjects() {
+        String expectedName = "test";
+        int expectedNestedArrays = 1;
+        int expectedSubNestedArrays = 1;
+        String jsonContent = "[\"any_object\",[{\"name\":\"quote1\",\"value\":[\"any_object\",[{\"name\":\"quote2\",\"value\":\"" + expectedName + "\"}]]}]]";
+
+        // FromJSON test
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
+
+        assertNotNull(anyVar);
+        assertEquals(expectedNestedArrays, anyVar.getFields().size());
+        assertEquals(expectedSubNestedArrays, anyVar.getFields().get(0).getValue().getFields().size());
+        assertEquals(expectedName, anyVar.getFields().get(0).getValue().getFields().get(0).getValue().getValue());
     }
 
     @Test
@@ -517,6 +545,6 @@ public void testFullAnyObjectConversion() {
         assertEquals(expectedBidsEdgesNestedArrays, anyVar.getFields().get(6).getValue().getFields().get(0).getValue().getAnyVars().size());
 
         String toJSON = this.gson.toJson(anyVar);
-        String test = toJSON;
+        assertEquals(toJSON, jsonContent);
     }
 }

From 65278329dd3b7c250a12d54c7b9e3d033e9e1d6b Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Sat, 18 Jul 2020 15:33:13 -0400
Subject: [PATCH 38/45] Serialize properly

---
 .../eosiojava/models/queryit/AnyVar.java      |   4 +
 .../models/queryit/AnyVarSerializer.java      |  80 +++----------
 .../block/eosiojava/models/queryit/Field.java |  10 ++
 .../eosiojava/models/queryit/AnyVarTest.java  | 107 ++++--------------
 4 files changed, 52 insertions(+), 149 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
index 39a3f71..78674e3 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
@@ -18,6 +18,10 @@ public AnyVar() {
         anyVars = new ArrayList<AnyVar>();
     }
 
+    public Boolean hasValue() {
+        return this.value != null;
+    }
+
     public String getName() {
         return this.name;
     }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
index 48af941..86e8464 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
@@ -1,17 +1,12 @@
 package one.block.eosiojava.models.queryit;
 
 import com.google.gson.JsonArray;
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
-import com.google.gson.JsonParseException;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
-import java.math.BigInteger;
-import java.time.Instant;
 
 public class AnyVarSerializer implements JsonSerializer<AnyVar> {
 
@@ -21,71 +16,26 @@ public JsonElement serialize(AnyVar src, Type typeOfSrc, JsonSerializationContex
             return new JsonArray();
         } else {
             JsonObject object = new JsonObject();
+            if (src.hasValue()) { // Primitive
+                return new JsonPrimitive(src.getValue().toString());
+            }
             for (Field field : src.getFields()) {
-                if (field.getValue().getType().equals(QueryItConstants.ANY_OBJECT_TYPE)) {
-                    JsonElement jsonElement = serialize(field.getValue(), typeOfSrc, context);
-                    String test = "";
-                    //object.add(field.getValue());
-                } else if (field.getValue().isEmpty()) {
-                    return new JsonArray();
-                } else {
-                    try {
-                        object.addProperty(field.getName(), field.getValue().getValue().toString());
-                    } catch(NullPointerException exception) {
-                        String test = "";
+                if (field.hasPrimitiveValue()) { // Primitive
+                    Object obj = field.getAnyVarValue();
+                    object.addProperty(field.getName(), obj.toString());
+                } else if (field.hasType(QueryItConstants.ANY_OBJECT_TYPE))  { // any_object
+                    JsonElement element = serialize(field.getValue(), typeOfSrc, context);
+                    object.add(field.getName(), element);
+                } else if (field.hasType(QueryItConstants.ANY_ARRAY_TYPE)) { // any_array
+                    JsonArray array = new JsonArray();
+                    for (AnyVar anyVar : field.getValue().getAnyVars()) {
+                        JsonElement element = serialize(anyVar, typeOfSrc, context);
+                        array.add(element);
                     }
-
+                    object.add(field.getName(), array);
                 }
             }
-
-            for (AnyVar anyVar : src.getAnyVars()) {
-                JsonElement array = serialize(anyVar, typeOfSrc, context);
-
-                String test = "";
-            }
             return object;
         }
-//        else {
-//            JsonArray array = new JsonArray();
-//            String type = src.getType();
-//            array.add(type);
-//
-//            for(AnyVar anyVar : src.getAnyVars()) {
-//                JsonElement object = serialize(anyVar, typeOfSrc, context);
-//                String test = "";
-//            }
-//
-////            for(Field field : src.getFields()) {
-////                JsonObject object = serialize(field, )
-////            }
-//
-//            array.add(src.getValue().toString());
-//
-//            return array;
-//        }
     }
-
-    // Don't think this matters, even though it'd be nice.. doesn't match output JSON from EOSJS
-//            switch(type) {
-//                case QueryItConstants.INT32_TYPE:
-//                case QueryItConstants.INT16_TYPE:
-//                case QueryItConstants.UINT16_TYPE:
-//                case QueryItConstants.INT8_TYPE:
-//                case QueryItConstants.UINT8_TYPE:
-//                    array.add((Integer)src.getValue());
-//                    break;
-//                case QueryItConstants.UINT64_TYPE:
-//                    array.add((BigInteger)src.getValue());
-//                    break;
-//                case QueryItConstants.FLOAT64_TYPE:
-//                    array.add((Float)src.getValue());
-//                    break;
-//                case QueryItConstants.UINT32_TYPE:
-//                case QueryItConstants.INT64_TYPE:
-//                    array.add((Long)src.getValue());
-//                    break;
-//                default: // time_point, string, checksum256, symbol, symbol_code, asset, bytes
-//                    array.add((String)src.getValue());
-//                    break;
-//            }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
index c645b1c..c6cb2f1 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
@@ -11,5 +11,15 @@ public class Field {
 
     public AnyVar getValue() { return this.value; }
 
+    public Object getAnyVarValue() { return this.value != null ? this.value.getValue() : null; }
+
+    public Boolean hasPrimitiveValue() { return this.getValue().hasValue(); }
+
+    public Boolean hasType() { return this.getValue() != null && this.getValue().getType() != null; }
+
+    public String getType() { return this.getValue().getType(); }
+
+    public Boolean hasType(String type) { return this.hasType() && this.getType().equals(type); }
+
     public String getName() { return this.name; }
 }
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
index e70e76a..0bb5679 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
@@ -1,13 +1,11 @@
 package one.block.eosiojava.models.queryit;
 
 import static junit.framework.TestCase.*;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import java.math.BigInteger;
-import java.time.Instant;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -53,9 +51,6 @@ public void testConvertString() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -67,9 +62,6 @@ public void testConvertChecksum256() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -81,9 +73,6 @@ public void testConvertSymbol() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -95,9 +84,6 @@ public void testConvertSymbolCode() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -109,9 +95,6 @@ public void testConvertAsset() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -123,9 +106,6 @@ public void testConvertMaxUInt64() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -137,9 +117,6 @@ public void testConvertMinUInt64() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -151,9 +128,6 @@ public void testConvertMaxInt64() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -165,9 +139,6 @@ public void testConvertMinInt64() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -179,9 +150,6 @@ public void testConvertMaxUInt32() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -193,9 +161,6 @@ public void testConvertMinUInt32() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -207,9 +172,6 @@ public void testConvertMaxInt32() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -221,9 +183,6 @@ public void testConvertMinInt32() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -235,9 +194,6 @@ public void testConvertMaxUInt16() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -249,9 +205,6 @@ public void testConvertMinUInt16() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -263,9 +216,6 @@ public void testConvertMaxInt16() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -277,9 +227,6 @@ public void testConvertMinInt16() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -291,9 +238,6 @@ public void testConvertMaxUInt8() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -305,9 +249,6 @@ public void testConvertMinUInt8() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -319,51 +260,42 @@ public void testConvertMaxInt8() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinInt8() {
         Integer expectedValue = -128;
         String jsonContent = "[\"int8\",\"" + expectedValue.toString() + "\"]";
+        String expectedJsonContent = "-128";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMaxFloat64() {
         Float expectedValue = Float.parseFloat("3.40282e+038");
         String jsonContent = "[\"float64\",\"" + expectedValue.toString() + "\"]";
+        String expectedJsonContent = "3.40282E38";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
     public void testConvertMinFloat64() {
         Float expectedValue = Float.parseFloat("1.17549e-038");
         String jsonContent = "[\"float64\",\"" + expectedValue.toString() + "\"]";
+        String expectedJsonContent = "1.17549e-038";
 
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -375,9 +307,6 @@ public void testConvertTimepointWithoutZone() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -389,9 +318,6 @@ public void testConvertTimepointWithZone() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -403,9 +329,6 @@ public void testConvertBytes() {
 
         assertNotNull(anyVar);
         assertEquals(expectedValue, anyVar.getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
     }
 
     @Test
@@ -435,9 +358,6 @@ public void testSimpleAnyArray() {
         assertNotNull(anyVar);
         assertEquals(expectedSubQueriesCount, anyVar.getAnyVars().size());
         assertEquals(expectedSubqueryValue, anyVar.getAnyVars().get(0).getValue());
-
-        String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, expectedJsonContent);
     }
 
     @Test
@@ -513,12 +433,27 @@ public void testSimpleAnyObject() {
         assertEquals(toJSON, expectedJsonContent);
     }
 
+    @Test
+    public void testAnyObjectWithAnyArray() {
+        String expectedName = "test";
+        String expectedJsonContent = "{\"test\":[\"test2\"]}";
+        String jsonContent = "[\"any_object\",[{\"name\":\"" + expectedName + "\",\"value\":[\"any_array\", [[\"string\", \"test2\"]]]}]]";
+
+        AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
+
+        assertNotNull(anyVar);
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, expectedJsonContent);
+    }
+
     @Test
     public void testNestedAnyObjects() {
         String expectedName = "test";
         int expectedNestedArrays = 1;
         int expectedSubNestedArrays = 1;
         String jsonContent = "[\"any_object\",[{\"name\":\"quote1\",\"value\":[\"any_object\",[{\"name\":\"quote2\",\"value\":\"" + expectedName + "\"}]]}]]";
+        String expectedJsonContent = "{\"quote1\":{\"quote2\":\"" + expectedName + "\"}}";
 
         // FromJSON test
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
@@ -527,6 +462,9 @@ public void testNestedAnyObjects() {
         assertEquals(expectedNestedArrays, anyVar.getFields().size());
         assertEquals(expectedSubNestedArrays, anyVar.getFields().get(0).getValue().getFields().size());
         assertEquals(expectedName, anyVar.getFields().get(0).getValue().getFields().get(0).getValue().getValue());
+
+        String toJSON = this.gson.toJson(anyVar);
+        assertEquals(toJSON, expectedJsonContent);
     }
 
     @Test
@@ -535,6 +473,7 @@ public void testFullAnyObjectConversion() {
         int expectedBidsNestedArrays = 1;
         int expectedBidsEdgesNestedArrays = 4;
         String jsonContent = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
+        String expectedJsonContent = "{\"quote\":\"538059690.21 USD\",\"base\":\"89352.54000000 BTC\",\"bancorPrice\":\"6021.76 USD\",\"lastTradePrice\":\"6010.87 USD\",\"lastTradeQuantity\":\"161.89085947 BTC\",\"asks\":{\"edges\":[]},\"bids\":{\"edges\":[{\"node\":{\"orderId\":\"4\",\"owner\":\"maker\",\"handle\":\"1594867124500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:38:46.000\"}},{\"node\":{\"orderId\":\"9\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867454500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:44:15.000\"}},{\"node\":{\"orderId\":\"10\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867537500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:45:38.500\"}},{\"node\":{\"orderId\":\"7\",\"owner\":\"maker\",\"handle\":\"1594867290500000\",\"price\":\"5199.50 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:41:31.000\"}}]}}";
 
         // FromJSON test
         AnyVar anyVar = this.gson.fromJson(jsonContent, AnyVar.class);
@@ -545,6 +484,6 @@ public void testFullAnyObjectConversion() {
         assertEquals(expectedBidsEdgesNestedArrays, anyVar.getFields().get(6).getValue().getFields().get(0).getValue().getAnyVars().size());
 
         String toJSON = this.gson.toJson(anyVar);
-        assertEquals(toJSON, jsonContent);
+        assertEquals(toJSON, expectedJsonContent);
     }
 }

From 95186e41f43765f328037cbd97725c96986ba5f2 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Sat, 18 Jul 2020 15:39:59 -0400
Subject: [PATCH 39/45] Add conversion process to transaction processor

---
 .../eosiojava/session/TransactionProcessor.java     | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index cb6bf15..3cd21ea 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -50,6 +50,7 @@
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
 import one.block.eosiojava.models.abiProvider.Abi;
+import one.block.eosiojava.models.queryit.AnyVar;
 import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.rpcProvider.response.ActionTrace;
 import one.block.eosiojava.models.AbiEosSerializationObject;
@@ -566,7 +567,12 @@ private PushTransactionResponse formatPushTransactionResponse(PushTransactionRes
             if (actionTrace.hasReturnValue()) {
                 try {
                     AbiEosSerializationObject deserializationObject = deserializeActionTraceReturnValue(actionTrace, chainId, abiProvider);
-                    actionTrace.setDeserializedReturnValue(deserializationObject.getJson());
+                    if (actionTrace.isQueryItAction()) {
+                        String json = convertAbieosQueryItJsonToUsableJson(deserializationObject.getJson());
+                        actionTrace.setDeserializedReturnValue(json);
+                    } else {
+                        actionTrace.setDeserializedReturnValue(deserializationObject.getJson());
+                    }
                 } catch (DeserializeReturnValueError transactionCreateSignatureRequestError) {
                     throw new TransactionFormatPushTransactionResponseError(transactionCreateSignatureRequestError);
                 }
@@ -575,6 +581,11 @@ private PushTransactionResponse formatPushTransactionResponse(PushTransactionRes
         return response;
     }
 
+    private String convertAbieosQueryItJsonToUsableJson(String json) {
+        AnyVar anyVar = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(json, AnyVar.class);
+        return Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).toJson(anyVar);
+    }
+
     /**
      * Return transaction in JSON string format.
      *

From 2fd674035a892240285c8b70ff1c27735536b92e Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 20 Jul 2020 09:56:02 -0400
Subject: [PATCH 40/45] Convert to use SendTransaction. Update tests

---
 .../eosiojava/models/queryit/AnyVar.java      |   2 -
 .../models/queryit/AnyVarDeserializer.java    |   2 +-
 .../request/PushTransactionRequest.java       |   1 -
 .../session/TransactionProcessor.java         |  72 +++++-----
 .../one/block/eosiojava/utilities/Utils.java  |   2 +
 .../session/TransactionProcessorTest.java     | 130 +++++++++++-------
 6 files changed, 126 insertions(+), 83 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
index 78674e3..1d01448 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
@@ -1,7 +1,5 @@
 package one.block.eosiojava.models.queryit;
 
-
-import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.List;
 
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
index 0f8c91b..5ab533f 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
@@ -17,7 +17,7 @@ public AnyVar deserialize(JsonElement json, Type typeOfT,
         if (json.isJsonPrimitive()) {
             anyVar.setValue(json.getAsJsonPrimitive().getAsString());
         } else if (!json.isJsonArray() || ((JsonArray)json).size() == 0) { // null_t
-            return anyVar; // Seems like this might actually be wrong for size() == 0, return []
+            return anyVar;
         } else {
             JsonArray jsonAsArray = ((JsonArray) json);
             String type = jsonAsArray.get(0).getAsString();
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java
index 57c6980..19066fd 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java
@@ -1,6 +1,5 @@
 package one.block.eosiojava.models.rpcProvider.request;
 
-import com.google.gson.annotations.SerializedName;
 import java.util.List;
 import one.block.eosiojava.models.rpcProvider.Transaction;
 import org.jetbrains.annotations.NotNull;
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
index 3cd21ea..aec9d39 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -487,7 +487,7 @@ public boolean sign() throws TransactionSignError {
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
     @NotNull
-    public PushTransactionResponse broadcast() throws TransactionBroadCastError {
+    public TransactionResponse broadcast() throws TransactionBroadCastError {
         if (this.serializedTransaction == null || this.serializedTransaction.isEmpty()) {
             throw new TransactionBroadCastError(
                     ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_SERIALIZED_TRANSACTION_EMPTY);
@@ -498,11 +498,11 @@ public PushTransactionResponse broadcast() throws TransactionBroadCastError {
                     ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_SIGN_EMPTY);
         }
 
-        PushTransactionRequest pushTransactionRequest = new PushTransactionRequest(this.signatures,
+        SendTransactionRequest sendTransactionRequest = new SendTransactionRequest(this.signatures,
                 0, this.contextFreeData.getHexed(), this.serializedTransaction);
         try {
-            return this.pushTransaction(pushTransactionRequest);
-        } catch (TransactionPushTransactionError transactionPushTransactionError) {
+            return formatTransactionResponse(this.sendTransaction(sendTransactionRequest));
+        } catch (TransactionPushTransactionError | TransactionFormatPushTransactionResponseError transactionPushTransactionError) {
             throw new TransactionBroadCastError(
                     ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_TRANS_ERROR,
                     transactionPushTransactionError);
@@ -512,7 +512,7 @@ public PushTransactionResponse broadcast() throws TransactionBroadCastError {
     /**
      * Sign and broadcast the transaction and signature/s to chain
      *
-     * @return PushTransactionResponse from blockchain.
+     * @return TransactionResponse from blockchain.
      * @throws TransactionSignAndBroadCastError thrown under the following conditions:
      *      <br>
      *          - Exception while creating signature. Cause: {@link TransactionCreateSignatureRequestError}
@@ -526,7 +526,7 @@ public PushTransactionResponse broadcast() throws TransactionBroadCastError {
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
     @NotNull
-    public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
+    public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
         EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
         try {
             eosioTransactionSignatureRequest = this.createSignatureRequest();
@@ -551,16 +551,22 @@ public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroad
         }
 
         // Signatures and serializedTransaction are assigned and finalized in getSignature() method
-        PushTransactionRequest pushTransactionRequest = new PushTransactionRequest(this.signatures,
+        SendTransactionRequest sendTransactionRequest = new SendTransactionRequest(this.signatures,
                 0, this.contextFreeData.getHexed(), this.serializedTransaction);
         try {
-            return formatPushTransactionResponse(this.pushTransaction(pushTransactionRequest));
+            return formatTransactionResponse(this.sendTransaction(sendTransactionRequest));
         } catch (TransactionPushTransactionError | TransactionFormatPushTransactionResponseError transactionPushTransactionError) {
             throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
         }
     }
 
-    private PushTransactionResponse formatPushTransactionResponse(PushTransactionResponse response)
+    /**
+     *
+     * @param response
+     * @return
+     * @throws TransactionFormatPushTransactionResponseError
+     */
+    private TransactionResponse formatTransactionResponse(TransactionResponse response)
             throws TransactionFormatPushTransactionResponseError {
         List<ActionTrace> actionTraces = response.getActionTraces();
         for (ActionTrace actionTrace : actionTraces) {
@@ -568,8 +574,7 @@ private PushTransactionResponse formatPushTransactionResponse(PushTransactionRes
                 try {
                     AbiEosSerializationObject deserializationObject = deserializeActionTraceReturnValue(actionTrace, chainId, abiProvider);
                     if (actionTrace.isQueryItAction()) {
-                        String json = convertAbieosQueryItJsonToUsableJson(deserializationObject.getJson());
-                        actionTrace.setDeserializedReturnValue(json);
+                        actionTrace.setDeserializedReturnValue(convertAbieosQueryItJsonToUsableJson(deserializationObject.getJson()));
                     } else {
                         actionTrace.setDeserializedReturnValue(deserializationObject.getJson());
                     }
@@ -581,6 +586,11 @@ private PushTransactionResponse formatPushTransactionResponse(PushTransactionRes
         return response;
     }
 
+    /**
+     * Convert json to AnyVar type and then convert that to human-readable queryit json
+     * @param json - the json to convert
+     * @return converted human-readable queryit json
+     */
     private String convertAbieosQueryItJsonToUsableJson(String json) {
         AnyVar anyVar = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(json, AnyVar.class);
         return Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).toJson(anyVar);
@@ -818,6 +828,26 @@ private PushTransactionResponse pushTransaction(PushTransactionRequest pushTrans
         }
     }
 
+    /**
+     * Send signed transaction to blockchain.
+     * <p>
+     * Check sendTransaction() flow in "Complete Workflow" document for more details.
+     *
+     * @param sendTransactionRequest the request
+     * @return Response from chain
+     */
+    @NotNull
+    private SendTransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest)
+            throws TransactionPushTransactionError {
+        try {
+            return this.rpcProvider.sendTransaction(sendTransactionRequest);
+        } catch (SendTransactionRpcError pushTransactionRpcError) {
+            throw new TransactionPushTransactionError(
+                    ErrorConstants.TRANSACTION_PROCESSOR_RPC_PUSH_TRANSACTION,
+                    pushTransactionRpcError);
+        }
+    }
+
     /**
      * Serialize current transaction
      *
@@ -1227,25 +1257,5 @@ public ContextFreeData getContextFreeData() {
         return this.contextFreeData;
     }
 
-    /**
-     * Send signed transaction to blockchain.
-     * <p>
-     * Check sendTransaction() flow in "Complete Workflow" document for more details.
-     *
-     * @param sendTransactionRequest the request
-     * @return Response from chain
-     */
-    @NotNull
-    private TransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest)
-            throws TransactionPushTransactionError {
-        try {
-            return this.rpcProvider.sendTransaction(sendTransactionRequest);
-        } catch (SendTransactionRpcError pushTransactionRpcError) {
-            throw new TransactionPushTransactionError(
-                    ErrorConstants.TRANSACTION_PROCESSOR_RPC_PUSH_TRANSACTION,
-                    pushTransactionRpcError);
-        }
-    }
-
     //endregion
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
index db629e3..875f905 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/utilities/Utils.java
@@ -10,6 +10,7 @@
 import java.io.Serializable;
 import one.block.eosiojava.models.queryit.AnyVar;
 import one.block.eosiojava.models.queryit.AnyVarDeserializer;
+import one.block.eosiojava.models.queryit.AnyVarSerializer;
 
 /**
  * This class provides generic utility methods
@@ -44,6 +45,7 @@ public static <T extends Serializable> T clone(T object) throws IOException, Cla
     public static Gson getGson(String datePattern) {
         return new GsonBuilder()
                 .registerTypeAdapter(AnyVar.class, new AnyVarDeserializer())
+                .registerTypeAdapter(AnyVar.class, new AnyVarSerializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping()
                 .create();
diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
index 8045b23..01c3822 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
@@ -18,6 +18,7 @@
 import one.block.eosiojava.error.rpcProvider.GetInfoRpcError;
 import one.block.eosiojava.error.rpcProvider.GetRequiredKeysRpcError;
 import one.block.eosiojava.error.rpcProvider.PushTransactionRpcError;
+import one.block.eosiojava.error.rpcProvider.SendTransactionRpcError;
 import one.block.eosiojava.error.serializationProvider.DeserializeError;
 import one.block.eosiojava.error.serializationProvider.DeserializeTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeError;
@@ -45,10 +46,13 @@
 import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
+import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.rpcProvider.response.GetBlockResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
 import one.block.eosiojava.models.rpcProvider.response.PushTransactionResponse;
+import one.block.eosiojava.models.rpcProvider.response.SendTransactionResponse;
+import one.block.eosiojava.models.rpcProvider.response.TransactionResponse;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureRequest;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureResponse;
 import one.block.eosiojava.utilities.DateFormatter;
@@ -145,9 +149,9 @@ public void broadcast() {
         }
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.broadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+            TransactionResponse transactionResponse = processor.broadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(DUMP_TRANSACTION_ID, transactionResponse.getTransactionId());
         } catch (TransactionBroadCastError transactionBroadCastError) {
             transactionBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling broadcast");
@@ -161,9 +165,9 @@ public void signAndBroadcast() {
         assertNotNull(processor);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+            TransactionResponse transactionResponse = processor.signAndBroadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(DUMP_TRANSACTION_ID, transactionResponse.getTransactionId());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
@@ -378,9 +382,9 @@ public void setRequiredKeys() {
         processor.setRequiredKeys(requiredKeys);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+            TransactionResponse transactionResponse = processor.signAndBroadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(DUMP_TRANSACTION_ID, transactionResponse.getTransactionId());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
@@ -393,7 +397,7 @@ public void isAllowTransactionToBeModified() {
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetInfoResponse, GetInfoResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetBlockResponse, GetBlockResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class),
-                Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(getMockedPushTransactionResponseJson(), PushTransactionResponse.class));
+                Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(getMockedSendTransactionResponseJson(), SendTransactionResponse.class));
 
         this.mockAbiProvider(EOSIOABIJSON);
         this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction, MOCKED_RETURN_VALUE_JSON);
@@ -416,9 +420,9 @@ public void isAllowTransactionToBeModified() {
         assertTrue(processor.isTransactionModificationAllowed());
 
        try {
-           PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-           assertNotNull(pushTransactionResponse);
-           assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+           TransactionResponse transactionResponse = processor.signAndBroadcast();
+           assertNotNull(transactionResponse);
+           assertEquals(DUMP_TRANSACTION_ID, transactionResponse.getTransactionId());
 
            // after signing and broadcast, serialized transaction is updated
            assertEquals(MOCKED_TRANSACTION_HEX_MODIFIED, processor.getSerializedTransaction());
@@ -457,9 +461,9 @@ public void testPresetTransaction() {
         }
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+            TransactionResponse transactionResponse = processor.signAndBroadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(DUMP_TRANSACTION_ID, transactionResponse.getTransactionId());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for sign and broadcast");
@@ -588,7 +592,7 @@ public void testContextFreeActionPrepareWithData() {
     @Test
     public void testDeserializeActionTraceWithNoReturnValue() {
         String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace("", "retval_null");
-        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String mockPushTransactionResponseJson = this.getMockedSendTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
         String expectedJson = null;
         this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, EOSIOABIJSON);
 
@@ -596,9 +600,9 @@ public void testDeserializeActionTraceWithNoReturnValue() {
         assertNotNull(processor);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+            TransactionResponse transactionResponse = processor.signAndBroadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(expectedJson, transactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
@@ -608,7 +612,7 @@ public void testDeserializeActionTraceWithNoReturnValue() {
     @Test
     public void testDeserializeActionTraceWithSimpleReturnValue() {
         String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace("0a000000", "retval_simple");
-        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String mockPushTransactionResponseJson = this.getMockedSendTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
         String expectedJson = "10";
         this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, EOSIOABIJSON);
 
@@ -616,9 +620,9 @@ public void testDeserializeActionTraceWithSimpleReturnValue() {
         assertNotNull(processor);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+            TransactionResponse transactionResponse = processor.signAndBroadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(expectedJson, transactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
@@ -628,7 +632,7 @@ public void testDeserializeActionTraceWithSimpleReturnValue() {
     @Test
     public void testDeserializeActionTraceWithComplexReturnValue() {
         String mockedActionTraceWithComplexReturnValue = getMockedProcessedActionTrace("d2040000000000000090b1ca", "retval_complex");
-        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithComplexReturnValue);
+        String mockPushTransactionResponseJson = this.getMockedSendTransactionResponseJson(mockedActionTraceWithComplexReturnValue);
         String expectedJson = "{\"id\":1234,\"name\":\"test\"}";
         this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, EOSIOABIJSON);
 
@@ -636,9 +640,9 @@ public void testDeserializeActionTraceWithComplexReturnValue() {
         assertNotNull(processor);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+            TransactionResponse transactionResponse = processor.signAndBroadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(expectedJson, transactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
@@ -648,17 +652,17 @@ public void testDeserializeActionTraceWithComplexReturnValue() {
     @Test
     public void testDeserializeQueryItActionTrace() {
         String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace("0000000c5b22737472696e67222c2274657374225d", "queryit");
-        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
-        String expectedJson = "[\"string\",\"test\"]";
+        String mockPushTransactionResponseJson = this.getMockedSendTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String expectedJson = "\"test\"";
         this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, QUERYITABIJSON);
 
         TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
         assertNotNull(processor);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+            TransactionResponse transactionResponse = processor.signAndBroadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(expectedJson, transactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
@@ -666,26 +670,56 @@ public void testDeserializeQueryItActionTrace() {
     }
 
     @Test
-    public void testDeserializeB1XQueryItActionTrace() {
+    public void testDeserializeB1XQueryItActionTraceSignAndBroadcast() {
         String returnValue = "0D070571756F74650C103533383035393639302E32312055534404626173650C1238393335322E3534303030303030204254430B62616E636F7250726963650C0B363032312E3736205553440E6C617374547261646550726963650C0B363031302E383720555344116C61737454726164655175616E746974790C103136312E3839303835393437204254430461736B730D010565646765730E0004626964730D010565646765730E040D01046E6F64650D08076F726465724964020400000000000000056F776E65720C056D616B65720668616E646C650220766BF085AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0E312E3030303030303030204254430473697A650C0E312E30303030303030302042544307637265617465640980791FA58CAA05000D01046E6F64650D08076F726465724964020900000000000000056F776E65720C0B6D61786E616D73746F726D0668616E646C6502A0DC160486AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0F31302E3030303030303030204254430473697A650C0F31302E303030303030303020425443076372656174656409C09DBBB88CAA05000D01046E6F64650D08076F726465724964020A00000000000000056F776E65720C0B6D61786E616D73746F726D0668616E646C65026057090986AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0F31302E3030303030303030204254430473697A650C0F31302E303030303030303020425443076372656174656409A0B9B5BD8CAA05000D01046E6F64650D08076F726465724964020700000000000000056F776E65720C056D616B65720668616E646C6502A06B50FA85AA05000570726963650C0B353139392E35302055534404636F73740C08302E3030205553440972656D61696E696E670C0E312E3030303030303030204254430473697A650C0E312E303030303030303020425443076372656174656409C02CF5AE8CAA0500";
         String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace(returnValue, "queryit");
-        String mockPushTransactionResponseJson = this.getMockedPushTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
-        String expectedJson = "{\"quote\":\"538059690.21 USD\",\"base\":\"89352.54000000 BTC\",\"bancorPrice\":\"6021.76 USD\",\"lastTradePrice\":\"6010.87 USD\",\"lastTradeQuantity\":\"161.89085947 BTC\",\"asks\":{\"edges\":[]},\"bids\":{\"edges\":[{\"node\":{\"orderId\":\"4\",\"owner\":\"maker\",\"handle\":\"1594867124500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:38:46.000\"}},{\"node\":{\"orderId\":\"9\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867454500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:44:15.000\"}},{\"node\":{\"orderId\":\"10\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867537500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:45:38.500\"}},{\"node\":{\"orderId\":\"7\",\"owner\":\"maker\",\"handle\":\"1594867290500000\",\"price\":\"5199.50 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:41:31.000\"}}]}}";
+        String mockPushTransactionResponseJson = this.getMockedSendTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String expectedJson = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
+        String expectedSerializedJson = "{\"quote\":\"538059690.21 USD\",\"base\":\"89352.54000000 BTC\",\"bancorPrice\":\"6021.76 USD\",\"lastTradePrice\":\"6010.87 USD\",\"lastTradeQuantity\":\"161.89085947 BTC\",\"asks\":{\"edges\":[]},\"bids\":{\"edges\":[{\"node\":{\"orderId\":\"4\",\"owner\":\"maker\",\"handle\":\"1594867124500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:38:46.000\"}},{\"node\":{\"orderId\":\"9\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867454500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:44:15.000\"}},{\"node\":{\"orderId\":\"10\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867537500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:45:38.500\"}},{\"node\":{\"orderId\":\"7\",\"owner\":\"maker\",\"handle\":\"1594867290500000\",\"price\":\"5199.50 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:41:31.000\"}}]}}";
         this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, QUERYITABIJSON);
 
         TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
         assertNotNull(processor);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(expectedJson, pushTransactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+            TransactionResponse transactionResponse = processor.signAndBroadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(expectedSerializedJson, transactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
         }
     }
 
+    @Test
+    public void testDeserializeB1XQueryItActionTraceBroadcast() {
+        String returnValue = "0D070571756F74650C103533383035393639302E32312055534404626173650C1238393335322E3534303030303030204254430B62616E636F7250726963650C0B363032312E3736205553440E6C617374547261646550726963650C0B363031302E383720555344116C61737454726164655175616E746974790C103136312E3839303835393437204254430461736B730D010565646765730E0004626964730D010565646765730E040D01046E6F64650D08076F726465724964020400000000000000056F776E65720C056D616B65720668616E646C650220766BF085AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0E312E3030303030303030204254430473697A650C0E312E30303030303030302042544307637265617465640980791FA58CAA05000D01046E6F64650D08076F726465724964020900000000000000056F776E65720C0B6D61786E616D73746F726D0668616E646C6502A0DC160486AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0F31302E3030303030303030204254430473697A650C0F31302E303030303030303020425443076372656174656409C09DBBB88CAA05000D01046E6F64650D08076F726465724964020A00000000000000056F776E65720C0B6D61786E616D73746F726D0668616E646C65026057090986AA05000570726963650C0B353030302E30302055534404636F73740C08302E3030205553440972656D61696E696E670C0F31302E3030303030303030204254430473697A650C0F31302E303030303030303020425443076372656174656409A0B9B5BD8CAA05000D01046E6F64650D08076F726465724964020700000000000000056F776E65720C056D616B65720668616E646C6502A06B50FA85AA05000570726963650C0B353139392E35302055534404636F73740C08302E3030205553440972656D61696E696E670C0E312E3030303030303030204254430473697A650C0E312E303030303030303020425443076372656174656409C02CF5AE8CAA0500";
+        String mockedActionTraceWithSimpleReturnValue = getMockedProcessedActionTrace(returnValue, "queryit");
+        String mockPushTransactionResponseJson = this.getMockedSendTransactionResponseJson(mockedActionTraceWithSimpleReturnValue);
+        String expectedJson = "[\"any_object\",[{\"name\":\"quote\",\"value\":[\"string\",\"538059690.21 USD\"]},{\"name\":\"base\",\"value\":[\"string\",\"89352.54000000 BTC\"]},{\"name\":\"bancorPrice\",\"value\":[\"string\",\"6021.76 USD\"]},{\"name\":\"lastTradePrice\",\"value\":[\"string\",\"6010.87 USD\"]},{\"name\":\"lastTradeQuantity\",\"value\":[\"string\",\"161.89085947 BTC\"]},{\"name\":\"asks\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[]]}]]},{\"name\":\"bids\",\"value\":[\"any_object\",[{\"name\":\"edges\",\"value\":[\"any_array\",[[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"4\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867124500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:38:46.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"9\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867454500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:44:15.000\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"10\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maxnamstorm\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867537500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5000.00 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"10.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:45:38.500\"]}]]}]],[\"any_object\",[{\"name\":\"node\",\"value\":[\"any_object\",[{\"name\":\"orderId\",\"value\":[\"uint64\",\"7\"]},{\"name\":\"owner\",\"value\":[\"string\",\"maker\"]},{\"name\":\"handle\",\"value\":[\"uint64\",\"1594867290500000\"]},{\"name\":\"price\",\"value\":[\"string\",\"5199.50 USD\"]},{\"name\":\"cost\",\"value\":[\"string\",\"0.00 USD\"]},{\"name\":\"remaining\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"size\",\"value\":[\"string\",\"1.00000000 BTC\"]},{\"name\":\"created\",\"value\":[\"time_point\",\"2020-07-16T10:41:31.000\"]}]]}]]]]}]]}]]";
+        String expectedSerializedJson = "{\"quote\":\"538059690.21 USD\",\"base\":\"89352.54000000 BTC\",\"bancorPrice\":\"6021.76 USD\",\"lastTradePrice\":\"6010.87 USD\",\"lastTradeQuantity\":\"161.89085947 BTC\",\"asks\":{\"edges\":[]},\"bids\":{\"edges\":[{\"node\":{\"orderId\":\"4\",\"owner\":\"maker\",\"handle\":\"1594867124500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:38:46.000\"}},{\"node\":{\"orderId\":\"9\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867454500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:44:15.000\"}},{\"node\":{\"orderId\":\"10\",\"owner\":\"maxnamstorm\",\"handle\":\"1594867537500000\",\"price\":\"5000.00 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"10.00000000 BTC\",\"size\":\"10.00000000 BTC\",\"created\":\"2020-07-16T10:45:38.500\"}},{\"node\":{\"orderId\":\"7\",\"owner\":\"maker\",\"handle\":\"1594867290500000\",\"price\":\"5199.50 USD\",\"cost\":\"0.00 USD\",\"remaining\":\"1.00000000 BTC\",\"size\":\"1.00000000 BTC\",\"created\":\"2020-07-16T10:41:31.000\"}}]}}";
+        this.mockDefaultSuccessData(mockPushTransactionResponseJson, expectedJson, QUERYITABIJSON);
+
+        TransactionProcessor processor = createAndPrepareTransaction(this.defaultActions());
+        assertNotNull(processor);
+
+        try {
+            assertTrue(processor.sign());
+        } catch (TransactionSignError transactionSignError) {
+            transactionSignError.printStackTrace();
+            fail("Exception should not be thrown here for calling sign");
+        }
+
+        try {
+            TransactionResponse transactionResponse = processor.broadcast();
+            assertNotNull(transactionResponse);
+            assertEquals(expectedSerializedJson, transactionResponse.getActionTraces().get(0).getDeserializedReturnValue());
+        } catch (TransactionBroadCastError transactionSignAndBroadCastError) {
+            transactionSignAndBroadCastError.printStackTrace();
+            fail("Exception should not be thrown here for calling signAndBroadcast");
+        }
+    }
+
     private String getMockedProcessedActionTrace(String returnValueHex, String actionName) {
         return "{\n"
                 + "        \"action_ordinal\": 1,\n"
@@ -733,11 +767,11 @@ private String getMockedProcessedActionTrace(String returnValueHex, String actio
                 + "      }";
     }
 
-    private String getMockedPushTransactionResponseJson() {
-        return getMockedPushTransactionResponseJson(null);
+    private String getMockedSendTransactionResponseJson() {
+        return getMockedSendTransactionResponseJson(null);
     }
 
-    private String getMockedPushTransactionResponseJson(@Nullable String mockedProcessedActionTrace) {
+    private String getMockedSendTransactionResponseJson(@Nullable String mockedProcessedActionTrace) {
         if (mockedProcessedActionTrace != null) {
             return "{\"transaction_id\":\"" + DUMP_TRANSACTION_ID + "\", \"processed\": { \"action_traces\": [" + mockedProcessedActionTrace + "]}}";
         }
@@ -746,7 +780,7 @@ private String getMockedPushTransactionResponseJson(@Nullable String mockedProce
     }
 
     private void mockDefaultSuccessData() {
-        mockDefaultSuccessData(getMockedPushTransactionResponseJson(), MOCKED_RETURN_VALUE_JSON, EOSIOABIJSON);
+        mockDefaultSuccessData(getMockedSendTransactionResponseJson(), MOCKED_RETURN_VALUE_JSON, EOSIOABIJSON);
     }
 
     private void mockDefaultSuccessData(String mockedPushTransactionResponseJson, String mockedReturnValueJson, String mockedAbiJson) {
@@ -754,7 +788,7 @@ private void mockDefaultSuccessData(String mockedPushTransactionResponseJson, St
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetInfoResponse, GetInfoResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetBlockResponse, GetBlockResponse.class),
                 Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class),
-                Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedPushTransactionResponseJson, PushTransactionResponse.class));
+                Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedPushTransactionResponseJson, SendTransactionResponse.class));
 
         this.mockAbiProvider(mockedAbiJson);
         this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction, mockedReturnValueJson);
@@ -829,7 +863,7 @@ private void mockRPC(
             @Nullable GetInfoResponse getInfoResponse,
             @Nullable GetBlockResponse getBlockResponse,
             @Nullable GetRequiredKeysResponse getRequiredKeysResponse,
-            @Nullable PushTransactionResponse pushTransactionResponse) {
+            @Nullable SendTransactionResponse sendTransactionResponse) {
 
         if (getInfoResponse != null) {
             try {
@@ -858,10 +892,10 @@ private void mockRPC(
             }
         }
 
-        if (pushTransactionResponse != null) {
+        if (sendTransactionResponse != null) {
             try {
-                when(this.mockedRpcProvider.pushTransaction(any(PushTransactionRequest.class))).thenReturn(pushTransactionResponse);
-            } catch (PushTransactionRpcError pushTransactionRpcError) {
+                when(this.mockedRpcProvider.sendTransaction(any(SendTransactionRequest.class))).thenReturn(sendTransactionResponse);
+            } catch (SendTransactionRpcError pushTransactionRpcError) {
                 pushTransactionRpcError.printStackTrace();
                 fail("Exception should not be thrown here for mocking pushTransaction");
             }

From 7feef17a898b5c7a15e4c6e3c99b9d4ad1a218fe Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 20 Jul 2020 10:16:20 -0400
Subject: [PATCH 41/45] Javadocs and tests

---
 .../eosiojava/models/abiProvider/Abi.java     |  3 +
 .../models/abiProvider/ActionResult.java      |  3 +
 .../eosiojava/models/abiProvider/Variant.java |  3 +
 .../eosiojava/models/queryit/AnyVar.java      | 84 +++++++++++++++++--
 .../models/queryit/AnyVarDeserializer.java    |  3 +
 .../models/queryit/AnyVarSerializer.java      |  3 +
 .../block/eosiojava/models/queryit/Field.java |  3 +
 .../eosiojava/models/queryit/AnyVarTest.java  | 37 ++++++--
 8 files changed, 127 insertions(+), 12 deletions(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
index 48e6ce7..849e052 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Abi.java
@@ -5,6 +5,9 @@
 import java.util.List;
 import java.util.Map;
 
+/**
+ * The Abi
+ */
 public class Abi {
     /**
      * The comment
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
index 28e8c9c..5b865c7 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/ActionResult.java
@@ -2,6 +2,9 @@
 
 import com.google.gson.annotations.SerializedName;
 
+/**
+ * The action results that are contained in response when submitting transactions
+ */
 public class ActionResult {
 
     /**
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Variant.java b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Variant.java
index fc7b0d2..bef2249 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Variant.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/abiProvider/Variant.java
@@ -3,6 +3,9 @@
 import com.google.gson.annotations.SerializedName;
 import java.util.List;
 
+/**
+ * The Abi type variants
+ */
 public class Variant {
     /**
      * The name
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
index 1d01448..01c33d0 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVar.java
@@ -3,64 +3,136 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * AnyVar in a queryit abi/json
+ */
 public class AnyVar {
+
+    /**
+     * The variant type of data
+     */
     private String type;
+    /**
+     * Name of the field
+     */
     private String name;
+    /**
+     * Dynamic value based on type
+     */
     private Object value;
 
+    /**
+     * List of fields that this object may contain
+     */
     private List<Field> fields;
+    /**
+     * List of sub anyVars this object may contain
+     */
     private List<AnyVar> anyVars;
 
+    /**
+     * Create a new anyVar with empty lists
+     */
     public AnyVar() {
         fields = new ArrayList<Field>();
         anyVars = new ArrayList<AnyVar>();
     }
 
-    public Boolean hasValue() {
-        return this.value != null;
-    }
-
+    /**
+     * Get the name
+     * @return - the name
+     */
     public String getName() {
         return this.name;
     }
 
+    /**
+     * Set the name
+     * @param name - the name
+     */
     public void setName(String name) {
         this.name = name;
     }
 
+    /**
+     * Get the dynamic value
+     * @return - the value
+     */
     public Object getValue() {
         return this.value;
     }
 
+    /**
+     * Set the value
+     * @param value - the value
+     */
     public void setValue(Object value) {
         this.value = value;
     }
 
+    /**
+     * Get the variant type
+     * @return - the type
+     */
     public String getType() {
         return this.type;
     }
 
+    /**
+     * Set the variant type
+     * @param type - the type
+     */
     public void setType(String type) {
         this.type = type;
     }
 
-    public void addField(Field queryIt) {
-        fields.add(queryIt);
+    /**
+     * Add a new field
+     * @param field - the field to add
+     */
+    public void addField(Field field) {
+        fields.add(field);
     }
 
+    /**
+     * Get the fields
+     * @return - the fields
+     */
     public List<Field> getFields() {
         return this.fields;
     }
 
+    /**
+     * Add a new sub anyVar
+     * @param anyVar - the anyVar
+     */
     public void addAnyVar(AnyVar anyVar) {
         anyVars.add(anyVar);
     }
 
+    /**
+     * Get the anyVars
+     * @return - the anyVars
+     */
     public List<AnyVar> getAnyVars() {
         return this.anyVars;
     }
 
+    /**
+     * Determine whether or not this object is empty
+     * The object is empty if there is no name, value, and no collections
+     * @return - whether or not this object is empty
+     */
     public Boolean isEmpty() {
         return this.name == null && this.value == null && this.getFields().size() == 0 && this.getAnyVars().size() == 0;
     }
+
+    /**
+     * Determine whether or not there is a value
+     * If there isn't, it means that this object must contain data in fields or anyVars
+     * @return - whether or not there is a value
+     */
+    public Boolean hasValue() {
+        return this.value != null;
+    }
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
index 5ab533f..0ac6d78 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarDeserializer.java
@@ -8,6 +8,9 @@
 import java.lang.reflect.Type;
 import java.math.BigInteger;
 
+/**
+ * Custom deserializer converting ABIEOS representation of queryit data to AnyVar object
+ */
 public class AnyVarDeserializer implements JsonDeserializer<AnyVar> {
     @Override
     public AnyVar deserialize(JsonElement json, Type typeOfT,
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
index 86e8464..6bfcb51 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/AnyVarSerializer.java
@@ -8,6 +8,9 @@
 import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 
+/**
+ * Custom serializer converting AnyVar object to human-readable json representation
+ */
 public class AnyVarSerializer implements JsonSerializer<AnyVar> {
 
     @Override
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
index c6cb2f1..8db91b9 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
@@ -2,6 +2,9 @@
 
 import com.google.gson.annotations.SerializedName;
 
+/**
+ * Field in a queryit abi/json
+ */
 public class Field {
     @SerializedName("name")
     private String name;
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
index 0bb5679..6e2a1f5 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/AnyVarTest.java
@@ -11,13 +11,8 @@
 
 public class AnyVarTest {
 
-    // For generic deserialization of arrays
-//    Type listType = new TypeToken<ArrayList<AnyObject>>(){}.getType();
-//
-//    // FromJSON test
-//    List<AnyObject> anyObjects = this.gson.fromJson(jsonContent, listType);
-
     private Gson gson;
+    private AnyVar testAnyVar;
 
     @Before
     public void setUpGSON() {
@@ -27,6 +22,36 @@ public void setUpGSON() {
                 .registerTypeAdapter(AnyVar.class, new AnyVarSerializer())
                 .setDateFormat(datePattern)
                 .disableHtmlEscaping().create();
+
+        testAnyVar = new AnyVar();
+    }
+
+    @Test
+    public void testConstructor() {
+        assertTrue(testAnyVar.isEmpty());
+    }
+
+    @Test
+    public void testHasNoValue() {
+        assertFalse(testAnyVar.hasValue());
+    }
+
+    @Test
+    public void testHasValueWithString() {
+        testAnyVar.setValue("anything");
+        assertTrue(testAnyVar.hasValue());
+    }
+
+    @Test
+    public void testHasValueWithInteger() {
+        testAnyVar.setValue(1);
+        assertTrue(testAnyVar.hasValue());
+    }
+
+    @Test
+    public void testHasValueWithObject() {
+        testAnyVar.setValue(new Object());
+        assertTrue(testAnyVar.hasValue());
     }
 
     @Test

From 195b18653e214a0f56e0203ce839ec289eec9f56 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 20 Jul 2020 10:41:04 -0400
Subject: [PATCH 42/45] Javadocs and field tests

---
 .../block/eosiojava/models/queryit/Field.java |  66 ++++++++++-
 .../eosiojava/models/queryit/FieldTest.java   | 108 ++++++++++++++++++
 2 files changed, 168 insertions(+), 6 deletions(-)
 create mode 100644 eosiojava/src/test/java/one/block/eosiojava/models/queryit/FieldTest.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
index 8db91b9..df60a19 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/Field.java
@@ -6,23 +6,77 @@
  * Field in a queryit abi/json
  */
 public class Field {
+
+    /**
+     * The name of the field
+     */
     @SerializedName("name")
     private String name;
 
+    /**
+     * The value of the field, which might be a primitive, object, or collection
+     */
     @SerializedName("value")
     private AnyVar value;
 
-    public AnyVar getValue() { return this.value; }
+    /**
+     * Get the name
+     * @return - the name
+     */
+    public String getName() { return this.name; }
+
+    /**
+     * Set the name
+     * @param name - the name
+     */
+    public void setName(String name) { this.name = name; }
 
-    public Object getAnyVarValue() { return this.value != null ? this.value.getValue() : null; }
+    /**
+     * Get the value
+     * @return - the value
+     */
+    public AnyVar getValue() { return this.value; }
 
-    public Boolean hasPrimitiveValue() { return this.getValue().hasValue(); }
+    /**
+     * Set the value
+     * @param value - the value
+     */
+    public void setValue(AnyVar value) { this.value = value; }
 
-    public Boolean hasType() { return this.getValue() != null && this.getValue().getType() != null; }
+    /**
+     * Determine whether or not there is a value
+     * @return - whether or not there is a value
+     */
+    public Boolean hasValue() { return this.value != null; }
 
-    public String getType() { return this.getValue().getType(); }
+    /**
+     * Determine whether or not this field has any type
+     * @return - whether or not this field has any type
+     */
+    public Boolean hasType() { return this.hasValue() && this.getValue().getType() != null; }
 
+    /**
+     * Determine whether or not this field has the given type
+     * @param type - the type to check
+     * @return - whether or not this field has the given type
+     */
     public Boolean hasType(String type) { return this.hasType() && this.getType().equals(type); }
 
-    public String getName() { return this.name; }
+    /**
+     * Get the type from the anyVar
+     * @return - the type
+     */
+    public String getType() { return this.hasValue() ? this.getValue().getType() : null; }
+
+    /**
+     * Get the anyVar's value if it exists
+     * @return - the value if it exists
+     */
+    public Object getAnyVarValue() { return this.hasValue() ? this.getValue().getValue() : null; }
+
+    /**
+     * Determine whether or not this is a primitive field, meaning the anyVar has a direct value instead of collections
+     * @return - whether or not this is a primitive field
+     */
+    public Boolean hasPrimitiveValue() { return this.hasValue() ? this.getValue().hasValue() : false; }
 }
diff --git a/eosiojava/src/test/java/one/block/eosiojava/models/queryit/FieldTest.java b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/FieldTest.java
new file mode 100644
index 0000000..32b9521
--- /dev/null
+++ b/eosiojava/src/test/java/one/block/eosiojava/models/queryit/FieldTest.java
@@ -0,0 +1,108 @@
+package one.block.eosiojava.models.queryit;
+
+import static junit.framework.TestCase.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class FieldTest {
+    private Field field;
+
+    @Before
+    public void setup() {
+        field = new Field();
+    }
+
+    @Test
+    public void testHasValueWithoutValue() {
+        assertFalse(field.hasValue());
+    }
+
+    @Test
+    public void testHasValue() {
+        field.setValue(new AnyVar());
+        assertTrue(field.hasValue());
+    }
+
+    @Test
+    public void testHasTypeWithoutValue() {
+        assertFalse(field.hasType());
+    }
+
+    @Test
+    public void testHasType() {
+        String type = "type";
+        setType(type);
+
+        assertTrue(field.hasType());
+    }
+
+    @Test
+    public void testHasTypeWithParamWithoutValue() {
+        String typeToCheck = "type";
+        assertFalse(field.hasType(typeToCheck));
+    }
+
+    @Test
+    public void testHasTypeWithParamWithoutCorrectValue() {
+        String typeToCheck = "type";
+        setType("othertype");
+        assertFalse(field.hasType(typeToCheck));
+    }
+
+    @Test
+    public void testHasTypeWithParam() {
+        String typeToCheck = "type";
+        setType(typeToCheck);
+        assertTrue(field.hasType(typeToCheck));
+    }
+
+    @Test
+    public void testGetTypeWithoutValue() {
+        assertNull(field.getType());
+    }
+
+    @Test
+    public void testGetType() {
+        String type = "type";
+        setType(type);
+
+        assertEquals(type, field.getType());
+    }
+
+    @Test
+    public void testGetAnyVarValueWithoutValue() {
+        assertNull(field.getAnyVarValue());
+    }
+
+    @Test
+    public void testGetAnyVarValue() {
+        Object test = "test";
+        setValue(test);
+        assertEquals(test, field.getAnyVarValue());
+    }
+
+    @Test
+    public void testHasPrimitiveValueWithoutValue() {
+        assertFalse(field.hasPrimitiveValue());
+    }
+
+    @Test
+    public void testHasPrimitiveValue() {
+        Object test = "test";
+        setValue(test);
+        assertTrue(field.hasPrimitiveValue());
+    }
+
+    private void setType(String type) {
+        AnyVar anyVar = new AnyVar();
+        anyVar.setType(type);
+        field.setValue(anyVar);
+    }
+
+    private void setValue(Object value) {
+        AnyVar anyVar = new AnyVar();
+        anyVar.setValue(value);
+        field.setValue(anyVar);
+    }
+}

From 7ce56c0c0b957b6d8aae6005f24a8f05286ecd1d Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 20 Jul 2020 10:48:27 -0400
Subject: [PATCH 43/45] Javadocs

---
 .../models/queryit/QueryItConstants.java      | 65 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItConstants.java b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItConstants.java
index d9d91a2..c196894 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItConstants.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/queryit/QueryItConstants.java
@@ -1,25 +1,88 @@
 package one.block.eosiojava.models.queryit;
 
+/**
+ * Queryit abi variants and constants
+ */
 public class QueryItConstants {
+
+    /**
+     * AnyObject type - structure will be an object ["any_object",[{"name":"test","value":[]}]]
+     */
     public static final String ANY_OBJECT_TYPE = "any_object";
+    /**
+     * AnyArray type - structure will be an array ["any_array", [["any_array", [["string", "test"]]]]]
+     */
     public static final String ANY_ARRAY_TYPE = "any_array";
+    /**
+     * NullT type - structure will be an empty array []
+     */
     public static final String NULL_T_TYPE = "null_t";
+    /**
+     * Int64 primitive - structure will contain ["int64", 1]
+     */
     public static final String INT64_TYPE = "int64";
+    /**
+     * UInt64 primitive - structure will contain ["uint64", 1]
+     */
     public static final String UINT64_TYPE = "uint64";
+    /**
+     * Int32 primitive - structure will contain ["int32", 1]
+     */
     public static final String INT32_TYPE = "int32";
+    /**
+     * UInt32 primitive - structure will contain ["uint32", 1]
+     */
     public static final String UINT32_TYPE = "uint32";
+    /**
+     * Int16 primitive - structure will contain ["int16", 1]
+     */
     public static final String INT16_TYPE = "int16";
+    /**
+     * UInt16 primitive - structure will contain ["uint16", 1]
+     */
     public static final String UINT16_TYPE = "uint16";
+    /**
+     * Int8 primitive - structure will contain ["int8", 1]
+     */
     public static final String INT8_TYPE = "int8";
+    /**
+     * UInt8 primitive - structure will contain ["uint8", 1]
+     */
     public static final String UINT8_TYPE = "uint8";
+    /**
+     * TimePoint primitive - structure will contain ["time_point", "2020-07-16T10:44:15.000"]
+     */
     public static final String TIME_POINT_TYPE = "time_point";
+    /**
+     * Checksum256 primitive - structure will contain ["checksum256", "532eaabd9574880dbf76b9b8cc00832c20a6ec113d682299550d7a6e0f345e25"]
+     */
     public static final String CHECKSUM256_TYPE = "checksum256";
+    /**
+     * Float64 primitive - structure will contain ["float64", 1.00]
+     */
     public static final String FLOAT64_TYPE = "float64";
+    /**
+     * String primitive - structure will contain ["string", "test"]
+     */
     public static final String STRING_TYPE = "string";
+    /**
+     * Bytes primitive - structure will contain ["bytes", "0101"]
+     */
     public static final String BYTES_TYPE = "bytes";
+    /**
+     * Symbol primitive - structure will contain ["symbol", "EOS 10.000"]
+     */
     public static final String SYMBOL_TYPE = "symbol";
+    /**
+     * SymbolCode primitive - structure will contain ["symbol_code", "EOS"]
+     */
     public static final String SYMBOL_CODE_TYPE = "symbol_code";
+    /**
+     * Asset primitive - structure will contain ["asset", "EOS 10.000"]
+     */
     public static final String ASSET_TYPE = "asset";
-
+    /**
+     * TimePoint optional character - Java does not interpret timepoint to Instant correctly without the Z
+     */
     public static final char OPTIONAL_ZONE_CHAR = 'Z';
 }

From 4cd63b988187a660d11d71340e404695af7b5ccb Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 20 Jul 2020 12:43:48 -0400
Subject: [PATCH 44/45] Fix test

---
 .../eosiojava/session/NegativeTransactionProcessorTest.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java b/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
index e5ffd5f..295c9f5 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
@@ -18,6 +18,7 @@
 import one.block.eosiojava.error.rpcProvider.GetInfoRpcError;
 import one.block.eosiojava.error.rpcProvider.GetRequiredKeysRpcError;
 import one.block.eosiojava.error.rpcProvider.PushTransactionRpcError;
+import one.block.eosiojava.error.rpcProvider.SendTransactionRpcError;
 import one.block.eosiojava.error.serializationProvider.DeserializeTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
@@ -47,6 +48,7 @@
 import one.block.eosiojava.models.rpcProvider.request.GetBlockRequest;
 import one.block.eosiojava.models.rpcProvider.request.GetRequiredKeysRequest;
 import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
+import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.rpcProvider.response.GetBlockResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetInfoResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
@@ -419,8 +421,8 @@ public void broadCast_thenFailWithPushTransactionError() throws TransactionBroad
 
         // Mock PushTransaction RPC to throw error
         try {
-            when(this.mockedRpcProvider.pushTransaction(any(PushTransactionRequest.class))).thenThrow(new PushTransactionRpcError());
-        } catch (PushTransactionRpcError pushTransactionRpcError) {
+            when(this.mockedRpcProvider.sendTransaction(any(SendTransactionRequest.class))).thenThrow(new SendTransactionRpcError());
+        } catch (SendTransactionRpcError pushTransactionRpcError) {
             pushTransactionRpcError.printStackTrace();
             fail("Exception should not be thrown here for mocking pushTransaction");
         }

From f1b3a6525abde4c79fe6e33b70a3c6a9d8e68bd7 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 20 Jul 2020 12:46:22 -0400
Subject: [PATCH 45/45] Bump libraryVersion as test

---
 eosiojava/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eosiojava/build.gradle b/eosiojava/build.gradle
index dc73946..6355eed 100644
--- a/eosiojava/build.gradle
+++ b/eosiojava/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 
 def libraryGroupId = 'one.block'
 def libraryArtifactId = 'eosiojava'
-def libraryVersion = '0.1.2'
+def libraryVersion = '0.1.2-queryit'
 
 task sourcesJar(type: Jar, dependsOn: classes){
     classifier = 'sources'