From 5f32d299a0b3124a4f4cab0eaedde3d997b65c7e 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 01/19] Setup for sendTransaction

---
 .idea/codeStyles/Project.xml                  |  25 ----
 .../rpcProvider/SendTransactionRpcError.java  |  26 ++++
 .../eosiojava/interfaces/IRPCProvider.java    |  13 ++
 .../request/PushTransactionRequest.java       | 120 ++--------------
 .../request/SendTransactionRequest.java       |  23 +++
 .../request/TransactionRequest.java           | 131 ++++++++++++++++++
 .../response/PushTransactionResponse.java     |  26 +---
 .../response/SendTransactionResponse.java     |  11 ++
 .../response/TransactionResponse.java         |  48 +++++++
 9 files changed, 261 insertions(+), 162 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/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 a55edd1..c04b3a4 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,34 +1,10 @@
 package one.block.eosiojava.models.rpcProvider.response;
 
-import com.google.gson.annotations.SerializedName;
-import java.util.Map;
 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 {
-
-    /**
-     * The transaction id of the successful transaction.
-     */
-    @SerializedName("transaction_id")
-    private String transactionId;
-
-    @SerializedName("processed")
-    private Map processed;
-
-    /**
-     * Gets the transaction id of the successful transaction.
-     *
-     * @return The successful transaction id.
-     */
-    public String getTransactionId() {
-        return transactionId;
-    }
-
-    public Map getProcessed() {
-        return processed;
-    }
+public class PushTransactionResponse extends TransactionResponse {
 }
\ 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

From e020dadd61b3a38b017cb0e6c4c598c98865bad8 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 02/19] Update rpcProvider

---
 .../eosiojava/interfaces/IRPCProvider.java    |  5 +--
 .../session/TransactionProcessor.java         | 36 +++++++++++++++----
 2 files changed, 33 insertions(+), 8 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 2add4e2..1cfd277 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -13,6 +13,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;
@@ -43,6 +44,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.request.SendTransactionRequest;
 import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
@@ -56,6 +58,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;
@@ -475,7 +479,7 @@ public boolean sign() throws TransactionSignError {
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
     @NotNull
-    public PushTransactionResponse broadcast() throws TransactionBroadCastError {
+    public SendTransactionResponse broadcast() throws TransactionBroadCastError {
         if (this.serializedTransaction == null || this.serializedTransaction.isEmpty()) {
             throw new TransactionBroadCastError(
                     ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_SERIALIZED_TRANSACTION_EMPTY);
@@ -486,10 +490,10 @@ 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);
+            return this.sendTransaction(sendTransactionRequest);
         } catch (TransactionPushTransactionError transactionPushTransactionError) {
             throw new TransactionBroadCastError(
                     ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_TRANS_ERROR,
@@ -514,7 +518,7 @@ public PushTransactionResponse broadcast() throws TransactionBroadCastError {
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
     @NotNull
-    public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
+    public SendTransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
         EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
         try {
             eosioTransactionSignatureRequest = this.createSignatureRequest();
@@ -539,10 +543,10 @@ public PushTransactionResponse signAndBroadcast() throws TransactionSignAndBroad
         }
 
         // Signatures and serializedTransaction are assigned and finalized in getSignature() method
-        PushTransactionRequest pushTransactionRequest = new PushTransactionRequest(this.signatures,
+        SendTransactionRequest pushTransactionRequest = new SendTransactionRequest(this.signatures,
                 0, this.contextFreeData.getHexed(), this.serializedTransaction);
         try {
-            return this.pushTransaction(pushTransactionRequest);
+            return this.sendTransaction(pushTransactionRequest);
         } catch (TransactionPushTransactionError transactionPushTransactionError) {
             throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
         }
@@ -1149,5 +1153,25 @@ 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 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);
+        }
+    }
+
     //endregion
 }

From 64694a60766c13839833c73f73615eab9131f6d2 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 4 Aug 2020 16:52:31 -0400
Subject: [PATCH 03/19] Send transaction version bump

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

diff --git a/eosiojava/build.gradle b/eosiojava/build.gradle
index dc73946..c1c0937 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-send-transaction'
 
 task sourcesJar(type: Jar, dependsOn: classes){
     classifier = 'sources'

From 2577040a3b6bb404d8983375d9b3a1d90e9e08d3 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 4 Aug 2020 16:54:42 -0400
Subject: [PATCH 04/19] Temp remove ProcessedTransactionResponse

---
 .../response/TransactionResponse.java         | 21 ++-----------------
 1 file changed, 2 insertions(+), 19 deletions(-)

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
index f0b1119..19d57a4 100644
--- 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
@@ -1,8 +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;
 
 /**
  * The base class for push/send transaction responses
@@ -19,7 +18,7 @@ public class TransactionResponse {
      * The processed transaction
      */
     @SerializedName("processed")
-    private ProcessedTransactionResponse transactionResponse;
+    private Map processed;
 
     /**
      * Gets the transaction id of the successful transaction.
@@ -29,20 +28,4 @@ public class TransactionResponse {
     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

From 9a4e03828d8314f8161cbd24967ce39c616e4607 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 4 Aug 2020 17:13:49 -0400
Subject: [PATCH 05/19] Add isAmqpRequest field to SendTransactionRequest

---
 .../request/SendTransactionRequest.java       | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

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
index fd75fb7..24168a8 100644
--- 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
@@ -6,6 +6,14 @@
 
 public class SendTransactionRequest extends TransactionRequest {
 
+    /**
+     * Determines whether or not this request is sent to AMQP
+     * By default, it is sent to AMQP
+     */
+    @SerializedName("isAmqpRequest")
+    @NotNull
+    private boolean isAmqpRequest;
+
     /**
      * Instantiates a new SendTransactionRequest.
      *
@@ -20,4 +28,16 @@ public SendTransactionRequest(
             String packagedContextFreeData, @NotNull String packTrx) {
         super(signatures, compression, packagedContextFreeData, packTrx);
     }
+
+    /**
+     * Gets the field that determines whether or not transaction is sent to AMQP
+     * @return the AMQP field to determine where transaction is sent
+     */
+    public boolean getIsAmqpRequest() { return this.isAmqpRequest; }
+
+    /**
+     * Sets the field that determines whether or not transaction is sent to AMQP
+     * @param isAmqpRequest the AMQP field to determine where transaction is sent
+     */
+    public void setIsAmqpRequest(boolean isAmqpRequest) { this.isAmqpRequest = isAmqpRequest; }
 }

From 57213100a44eaf3a35dc9e26a4c422063300954d Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 4 Aug 2020 17:53:24 -0400
Subject: [PATCH 06/19] Add serialized

---
 .../models/rpcProvider/request/SendTransactionRequest.java       | 1 +
 1 file changed, 1 insertion(+)

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
index 24168a8..4694fbf 100644
--- 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
@@ -3,6 +3,7 @@
 import java.util.List;
 import one.block.eosiojava.models.rpcProvider.Transaction;
 import org.jetbrains.annotations.NotNull;
+import com.google.gson.annotations.SerializedName;
 
 public class SendTransactionRequest extends TransactionRequest {
 

From 3f3591abae31b16f4a3b0bc6f78ae528959368c0 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 4 Aug 2020 17:54:07 -0400
Subject: [PATCH 07/19] Bump version

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

diff --git a/eosiojava/build.gradle b/eosiojava/build.gradle
index c1c0937..88136db 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-send-transaction'
+def libraryVersion = '0.1.2-send-transaction2'
 
 task sourcesJar(type: Jar, dependsOn: classes){
     classifier = 'sources'

From bb72d8c131112e18cc6243562d7fcb5d248f59cd Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 4 Aug 2020 18:08:07 -0400
Subject: [PATCH 08/19] Default to true for amqp

---
 .../models/rpcProvider/request/SendTransactionRequest.java       | 1 +
 1 file changed, 1 insertion(+)

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
index 4694fbf..7acca25 100644
--- 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
@@ -28,6 +28,7 @@ public SendTransactionRequest(
             @NotNull List<String> signatures, int compression,
             String packagedContextFreeData, @NotNull String packTrx) {
         super(signatures, compression, packagedContextFreeData, packTrx);
+        this.setIsAmqpRequest(true);
     }
 
     /**

From 099af256b4ce688bbb026535a147f4a4c88e381a Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 6 Aug 2020 11:23:55 -0400
Subject: [PATCH 09/19] More AMQP config

---
 .../models/rpcProvider/AMQPConfig.java        | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/AMQPConfig.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/AMQPConfig.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/AMQPConfig.java
new file mode 100644
index 0000000..db62b09
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/AMQPConfig.java
@@ -0,0 +1,64 @@
+package one.block.eosiojava.models.rpcProvider;
+
+/**
+ * The config class for AMQP
+ */
+public class AMQPConfig {
+
+    /**
+     * The Connection timeout.
+     */
+    private long connectionTimeout;
+
+    /**
+     * The Read timeout.
+     */
+    private String replyToQueueName;
+
+    /**
+     * Instantiates a new Rpc config.
+     *
+     * @param connectionTimeout the connection timeout
+     * @param replyToQueueName the read timeout
+     */
+    public AMQPConfig(long connectionTimeout, String replyToQueueName) {
+        this.connectionTimeout = connectionTimeout;
+        this.replyToQueueName = replyToQueueName;
+    }
+
+    /**
+     * Gets connection timeout.
+     *
+     * @return the connection timeout
+     */
+    public long getConnectionTimeout() {
+        return connectionTimeout;
+    }
+
+    /**
+     * Sets connection timeout.
+     *
+     * @param connectionTimeout the connection timeout
+     */
+    public void setConnectionTimeout(long connectionTimeout) {
+        this.connectionTimeout = connectionTimeout;
+    }
+
+    /**
+     * Gets read replyToQueueName.
+     *
+     * @return the replyToQueueName
+     */
+    public String getReplyToQueueName() {
+        return this.replyToQueueName;
+    }
+
+    /**
+     * Sets read replyToQueueName.
+     *
+     * @param replyToQueueName the read timeout
+     */
+    public void setReplyToQueueName(String replyToQueueName) {
+        this.replyToQueueName = replyToQueueName;
+    }
+}

From ac203f3add59948832d58754cbd19e55380e59fe Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 13 Aug 2020 13:36:58 -0400
Subject: [PATCH 10/19] AMQP interface/config

---
 .idea/codeStyles/Project.xml                  |  25 ----
 eosiojava/build.gradle                        |   3 +-
 .../eosiojava/interfaces/IAMQPProvider.java   |  19 +++
 .../models/amqpProvider/AMQPConfig.java       | 115 ++++++++++++++++++
 4 files changed, 136 insertions(+), 26 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPConfig.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/build.gradle b/eosiojava/build.gradle
index dc73946..6eeb7ce 100644
--- a/eosiojava/build.gradle
+++ b/eosiojava/build.gradle
@@ -37,11 +37,12 @@ dependencies {
     testCompile 'org.mockito:mockito-core:2.26.0'
     api 'org.bitcoinj:bitcoinj-core:0.15.2'
     api 'org.slf4j:slf4j-jdk14:1.7.25'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
 }
 
 def libraryGroupId = 'one.block'
 def libraryArtifactId = 'eosiojava'
-def libraryVersion = '0.1.2'
+def libraryVersion = '0.1.2-amqp2'
 
 task sourcesJar(type: Jar, dependsOn: classes){
     classifier = 'sources'
diff --git a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
new file mode 100644
index 0000000..b606885
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
@@ -0,0 +1,19 @@
+package one.block.eosiojava.interfaces;
+
+import io.reactivex.Completable;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * The interface of AMQP provider.
+ */
+public interface IAMQPProvider {
+
+    /**
+     * Sends an AMQP message to configured queue
+     *
+     * @param data the request
+     * @return the response from the queue that message was received
+     */
+    @NotNull
+    Completable send(byte[] data);
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPConfig.java b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPConfig.java
new file mode 100644
index 0000000..c158171
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPConfig.java
@@ -0,0 +1,115 @@
+package one.block.eosiojava.models.amqpProvider;
+
+/**
+ * The config class for AMQP
+ */
+public class AMQPConfig {
+
+    /**
+     * The exchange
+     */
+    private String exchangeName;
+
+    /**
+     * The request queue name.
+     */
+    private String requestQueueName;
+
+    /**
+     * The reply-to queue name.
+     */
+    private String replyToQueueName; //TODO::Determine whether or not this is even configurable
+
+    /**
+     * The host
+     */
+    private String hostName;
+
+    /**
+     * Instantiates a new AMQP config.
+     *
+     * @param exchangeName the exchangeName
+     * @param requestQueueName the requestQueueName
+     * @param replyToQueueName the replyToQueueName
+     * @param hostName the hostName
+     */
+    public AMQPConfig(String exchangeName, String requestQueueName, String replyToQueueName, String hostName) {
+        this.setExchangeName(exchangeName);
+        this.setRequestQueueName(requestQueueName);
+        this.setReplyToQueueName(replyToQueueName);
+        this.setHostName(hostName);
+    }
+
+    /**
+     * Gets exchangeName.
+     *
+     * @return the exchangeName
+     */
+    public String getExchangeName() {
+        return this.exchangeName;
+    }
+
+    /**
+     * Sets exchangeName.
+     *
+     * @param exchangeName the exchangeName
+     */
+    public void setExchangeName(String exchangeName) {
+        this.exchangeName = exchangeName;
+    }
+
+    /**
+     * Gets requestQueueName.
+     *
+     * @return the requestQueueName
+     */
+    public String getRequestQueueName() {
+        return this.requestQueueName;
+    }
+
+    /**
+     * Sets requestQueueName.
+     *
+     * @param requestQueueName the requestQueueName
+     */
+    public void setRequestQueueName(String requestQueueName) {
+        this.requestQueueName = requestQueueName;
+    }
+
+    /**
+     * Gets replyToQueueName.
+     *
+     * @return the replyToQueueName
+     */
+    public String getReplyToQueueName() {
+        return this.replyToQueueName;
+    }
+
+    /**
+     * Sets replyToQueueName.
+     *
+     * @param replyToQueueName the replyToQueueName
+     */
+    public void setReplyToQueueName(String replyToQueueName) {
+        this.replyToQueueName = replyToQueueName;
+    }
+
+    /**
+     * Gets hostName.
+     *
+     * @return the hostName
+     */
+    public String getHostName() {
+        return this.hostName;
+    }
+
+    /**
+     * Sets hostName.
+     *
+     * @param hostName the hostName
+     */
+    public void setHostName(String hostName) {
+        this.hostName = hostName;
+    }
+}
+

From c1c14a0a17ff229c3c8eaba247684a24c82e17d7 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 13 Aug 2020 15:47:13 -0400
Subject: [PATCH 11/19] Update session/processor to use amqpProvider

---
 .../session/TransactionProcessor.java         | 69 +++++++++++++++++--
 .../eosiojava/session/TransactionSession.java | 29 +++++++-
 2 files changed, 91 insertions(+), 7 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 2add4e2..0b6bf19 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -40,6 +40,7 @@
 import one.block.eosiojava.error.signatureProvider.GetAvailableKeysError;
 import one.block.eosiojava.error.signatureProvider.SignatureProviderError;
 import one.block.eosiojava.interfaces.IABIProvider;
+import one.block.eosiojava.interfaces.IAMQPProvider;
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
@@ -105,6 +106,12 @@ public class TransactionProcessor {
     @NotNull
     private ISignatureProvider signatureProvider;
 
+    /**
+     * Reference of AMQP Provider from TransactionSession
+     */
+    @Nullable
+    private IAMQPProvider amqpProvider;
+
     /**
      * Transaction instance that holds all data relating to an EOS Transaction.
      * <p>
@@ -216,6 +223,24 @@ public TransactionProcessor(
         this.signatureProvider = signatureProvider;
     }
 
+    /**
+     * Constructor with all provider references from {@link TransactionSession}
+     * @param serializationProvider the serialization provider.
+     * @param rpcProvider the rpc provider.
+     * @param abiProvider the abi provider.
+     * @param signatureProvider the signature provider.
+     * @param amqpProvider the AMQP provider.
+     */
+    public TransactionProcessor(
+            @NotNull ISerializationProvider serializationProvider,
+            @NotNull IRPCProvider rpcProvider,
+            @NotNull IABIProvider abiProvider,
+            @NotNull ISignatureProvider signatureProvider,
+            @NotNull IAMQPProvider amqpProvider) {
+        this(serializationProvider, rpcProvider, abiProvider, signatureProvider);
+        this.amqpProvider = amqpProvider;
+    }
+
     /**
      * Constructor with all provider references from {@link TransactionSession} and preset
      * Transaction
@@ -223,7 +248,7 @@ public TransactionProcessor(
      * @param rpcProvider the rpc provider.
      * @param abiProvider the abi provider.
      * @param signatureProvider the signature provider.
-     * @param transaction - preset Transaction
+     * @param transaction - the preset Transaction.
      * @throws TransactionProcessorConstructorInputError thrown if the input transaction has an empty action list.
      */
     public TransactionProcessor(
@@ -233,11 +258,29 @@ public TransactionProcessor(
             @NotNull ISignatureProvider signatureProvider,
             @NotNull Transaction transaction) throws TransactionProcessorConstructorInputError {
         this(serializationProvider, rpcProvider, abiProvider, signatureProvider);
-        this.transaction = transaction;
-        if (this.transaction.getActions().isEmpty()) {
-            throw new TransactionProcessorConstructorInputError(
-                    ErrorConstants.TRANSACTION_PROCESSOR_ACTIONS_EMPTY_ERROR_MSG);
-        }
+        this.setTransaction(transaction);
+    }
+
+    /**
+     * Constructor with all provider references from {@link TransactionSession} and preset
+     * Transaction
+     * @param serializationProvider the serialization provider.
+     * @param rpcProvider the rpc provider.
+     * @param abiProvider the abi provider.
+     * @param signatureProvider the signature provider.
+     * @param transaction - the preset Transaction.
+     * @param amqpProvider the AMQP provider.
+     * @throws TransactionProcessorConstructorInputError thrown if the input transaction has an empty action list.
+     */
+    public TransactionProcessor(
+            @NotNull ISerializationProvider serializationProvider,
+            @NotNull IRPCProvider rpcProvider,
+            @NotNull IABIProvider abiProvider,
+            @NotNull ISignatureProvider signatureProvider,
+            @NotNull Transaction transaction,
+            @NotNull IAMQPProvider amqpProvider) throws TransactionProcessorConstructorInputError {
+        this(serializationProvider, rpcProvider, abiProvider, signatureProvider, amqpProvider);
+        this.setTransaction(transaction);
     }
 
     //region public methods
@@ -1003,6 +1046,20 @@ private void finishPreparing(Transaction preparingTransaction, ContextFreeData p
         }
     }
 
+    /**
+     * Set the preset transaction
+     * @param transaction the preset transaction
+     * @throws TransactionProcessorConstructorInputError
+     */
+    private void setTransaction(Transaction transaction)
+            throws TransactionProcessorConstructorInputError {
+        this.transaction = transaction;
+        if (this.transaction.getActions().isEmpty()) {
+            throw new TransactionProcessorConstructorInputError(
+                    ErrorConstants.TRANSACTION_PROCESSOR_ACTIONS_EMPTY_ERROR_MSG);
+        }
+    }
+
     //endregion
 
     //region getters/setters
diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionSession.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionSession.java
index 9f70b48..908f604 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionSession.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionSession.java
@@ -2,11 +2,13 @@
 
 import one.block.eosiojava.error.session.TransactionProcessorConstructorInputError;
 import one.block.eosiojava.interfaces.IABIProvider;
+import one.block.eosiojava.interfaces.IAMQPProvider;
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
 import one.block.eosiojava.models.rpcProvider.Transaction;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * Transaction Session class has a factory role for creating {@link TransactionProcessor} object from providers instances
@@ -45,6 +47,14 @@ public class TransactionSession {
     @NotNull
     private ISignatureProvider signatureProvider;
 
+    /**
+     * AMQP Provider to be used as a reference on {@link TransactionProcessor} object
+     * <br>
+     *     Responsible for AMQP message publishing on EOSIO chain
+     */
+    @Nullable
+    private IAMQPProvider amqpProvider;
+
     /**
      * Initialize TransactionSession object which acts like a factory to create {@link TransactionProcessor} object from providers instances.
      *
@@ -63,6 +73,23 @@ public TransactionSession(
         this.signatureProvider = signatureProvider;
     }
 
+    /**
+     * Initialize TransactionSession object which acts like a factory to create {@link TransactionProcessor} object from providers instances.
+     *
+     * @param serializationProvider serialization provider.
+     * @param rpcProvider Rpc provider.
+     * @param abiProvider ABI provider.
+     * @param signatureProvider signature provider.
+     */
+    public TransactionSession(
+            @NotNull ISerializationProvider serializationProvider,
+            @NotNull IRPCProvider rpcProvider, @NotNull IABIProvider abiProvider,
+            @NotNull ISignatureProvider signatureProvider,
+            @NotNull IAMQPProvider amqpProvider) {
+        this(serializationProvider, rpcProvider, abiProvider, signatureProvider);
+        this.amqpProvider = amqpProvider;
+    }
+
     /**
      * Create and return a new instance of TransactionProcessor
      *
@@ -70,7 +97,7 @@ public TransactionSession(
      */
     public TransactionProcessor getTransactionProcessor() {
         return new TransactionProcessor(this.serializationProvider, this.rpcProvider,
-                this.abiProvider, this.signatureProvider);
+                this.abiProvider, this.signatureProvider, this.amqpProvider);
     }
 
     /**

From dac75f79c66707e1c07b84ed3a9f98f381a12c30 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 13 Aug 2020 16:31:29 -0400
Subject: [PATCH 12/19] Add completable/blocking

---
 .../eosiojava/interfaces/IAMQPProvider.java   |  4 +-
 .../AMQPMessageFailedResponse.java            |  7 +++
 .../AMQPMessageSuccessResponse.java           |  6 ++
 .../session/TransactionProcessor.java         | 61 ++++++++++++++++---
 4 files changed, 67 insertions(+), 11 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageFailedResponse.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageSuccessResponse.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
index b606885..1eaae42 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
@@ -11,9 +11,9 @@ public interface IAMQPProvider {
     /**
      * Sends an AMQP message to configured queue
      *
-     * @param data the request
+     * @param object the object to send to AMQP
      * @return the response from the queue that message was received
      */
     @NotNull
-    Completable send(byte[] data);
+    Completable send(Object object);
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageFailedResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageFailedResponse.java
new file mode 100644
index 0000000..0a66434
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageFailedResponse.java
@@ -0,0 +1,7 @@
+package one.block.eosiojava.models.amqpProvider;
+
+import one.block.eosiojava.models.rpcProvider.response.TransactionResponse;
+
+public class AMQPMessageFailedResponse extends TransactionResponse {
+
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageSuccessResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageSuccessResponse.java
new file mode 100644
index 0000000..b8859e6
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageSuccessResponse.java
@@ -0,0 +1,6 @@
+package one.block.eosiojava.models.amqpProvider;
+
+import one.block.eosiojava.models.rpcProvider.response.TransactionResponse;
+
+public class AMQPMessageSuccessResponse extends TransactionResponse {
+}
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 9ee21ba..e730853 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1,12 +1,18 @@
 package one.block.eosiojava.session;
 
 import com.google.common.base.Strings;
+import io.reactivex.Completable;
+import io.reactivex.CompletableObserver;
+import io.reactivex.disposables.Disposable;
 import java.io.IOException;
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 import one.block.eosiojava.error.ErrorConstants;
 import one.block.eosiojava.error.abiProvider.GetAbiError;
 import one.block.eosiojava.error.rpcProvider.GetBlockRpcError;
@@ -45,6 +51,8 @@
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
+import one.block.eosiojava.models.amqpProvider.AMQPMessageFailedResponse;
+import one.block.eosiojava.models.amqpProvider.AMQPMessageSuccessResponse;
 import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
@@ -522,7 +530,7 @@ public boolean sign() throws TransactionSignError {
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
     @NotNull
-    public SendTransactionResponse 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);
@@ -561,7 +569,7 @@ public SendTransactionResponse broadcast() throws TransactionBroadCastError {
      *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
      */
     @NotNull
-    public SendTransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
+    public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
         EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
         try {
             eosioTransactionSignatureRequest = this.createSignatureRequest();
@@ -1219,14 +1227,49 @@ public ContextFreeData getContextFreeData() {
      * @return Response from chain
      */
     @NotNull
-    private SendTransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest)
+    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);
+        if (this.amqpProvider != null) {
+            return this.sendAmqpTransaction(sendTransactionRequest);
+        } else {
+            try {
+                return this.rpcProvider.sendTransaction(sendTransactionRequest);
+            } catch (SendTransactionRpcError pushTransactionRpcError) {
+                throw new TransactionPushTransactionError(
+                        ErrorConstants.TRANSACTION_PROCESSOR_RPC_PUSH_TRANSACTION,
+                        pushTransactionRpcError);
+            }
+        }
+    }
+
+    private TransactionResponse sendAmqpTransaction(SendTransactionRequest sendTransactionRequest) {
+        AtomicBoolean success = new AtomicBoolean(false);
+        Completable completable = this.amqpProvider.send(sendTransactionRequest);
+        completable.subscribe(new CompletableObserver() {
+            @Override
+            public void onSubscribe(Disposable d) {
+
+            }
+
+            @Override
+            public void onComplete() {
+                success.getAndSet(true);
+            }
+
+            @Override
+            public void onError(Throwable e) {
+                success.getAndSet(false);
+                // Do something else?
+            }
+        });
+
+        // Await response for 5 seconds
+        completable.blockingAwait(5, TimeUnit.SECONDS);
+
+        if (success.get()) {
+            return new AMQPMessageSuccessResponse();
+        } else {
+            return new AMQPMessageFailedResponse();
         }
     }
 

From 07a6d3c8ed4ba5cdaaad953f367283baaf9cc12e Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Thu, 13 Aug 2020 16:40:44 -0400
Subject: [PATCH 13/19] Java doc

---
 .../java/one/block/eosiojava/session/TransactionSession.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionSession.java b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionSession.java
index 908f604..2ed9cb7 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionSession.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionSession.java
@@ -80,6 +80,7 @@ public TransactionSession(
      * @param rpcProvider Rpc provider.
      * @param abiProvider ABI provider.
      * @param signatureProvider signature provider.
+     * @param amqpProvider AMQP provider.
      */
     public TransactionSession(
             @NotNull ISerializationProvider serializationProvider,

From 8fcfb7d99943864a293b215c87f78170d17ce4cb Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 17 Aug 2020 10:59:32 -0400
Subject: [PATCH 14/19] Update AMQP provider to just pass a string, prefixed
 with unsigned 0 to denote the transaction type

---
 eosiojava/build.gradle                        |  3 +--
 .../eosiojava/interfaces/IAMQPProvider.java   |  4 ++--
 .../request/SendTransactionRequest.java       | 22 -------------------
 .../session/TransactionProcessor.java         |  2 +-
 4 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/eosiojava/build.gradle b/eosiojava/build.gradle
index f76f799..e847afd 100644
--- a/eosiojava/build.gradle
+++ b/eosiojava/build.gradle
@@ -36,13 +36,12 @@ dependencies {
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.26.0'
     api 'org.bitcoinj:bitcoinj-core:0.15.2'
-    api 'org.slf4j:slf4j-jdk14:1.7.25'
     implementation 'io.reactivex.rxjava2:rxjava:2.2.19'
 }
 
 def libraryGroupId = 'one.block'
 def libraryArtifactId = 'eosiojava'
-def libraryVersion = '0.1.2-amqp3'
+def libraryVersion = '0.2.0-amqp5'
 
 task sourcesJar(type: Jar, dependsOn: classes){
     classifier = 'sources'
diff --git a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
index 1eaae42..ce0da4a 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
@@ -11,9 +11,9 @@ public interface IAMQPProvider {
     /**
      * Sends an AMQP message to configured queue
      *
-     * @param object the object to send to AMQP
+     * @param message the message to send to AMQP
      * @return the response from the queue that message was received
      */
     @NotNull
-    Completable send(Object object);
+    Completable send(String message);
 }
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
index 7acca25..7073c7d 100644
--- 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
@@ -6,15 +6,6 @@
 import com.google.gson.annotations.SerializedName;
 
 public class SendTransactionRequest extends TransactionRequest {
-
-    /**
-     * Determines whether or not this request is sent to AMQP
-     * By default, it is sent to AMQP
-     */
-    @SerializedName("isAmqpRequest")
-    @NotNull
-    private boolean isAmqpRequest;
-
     /**
      * Instantiates a new SendTransactionRequest.
      *
@@ -28,18 +19,5 @@ public SendTransactionRequest(
             @NotNull List<String> signatures, int compression,
             String packagedContextFreeData, @NotNull String packTrx) {
         super(signatures, compression, packagedContextFreeData, packTrx);
-        this.setIsAmqpRequest(true);
     }
-
-    /**
-     * Gets the field that determines whether or not transaction is sent to AMQP
-     * @return the AMQP field to determine where transaction is sent
-     */
-    public boolean getIsAmqpRequest() { return this.isAmqpRequest; }
-
-    /**
-     * Sets the field that determines whether or not transaction is sent to AMQP
-     * @param isAmqpRequest the AMQP field to determine where transaction is sent
-     */
-    public void setIsAmqpRequest(boolean isAmqpRequest) { this.isAmqpRequest = isAmqpRequest; }
 }
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 e730853..dad90c9 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1244,7 +1244,7 @@ private TransactionResponse sendTransaction(SendTransactionRequest sendTransacti
 
     private TransactionResponse sendAmqpTransaction(SendTransactionRequest sendTransactionRequest) {
         AtomicBoolean success = new AtomicBoolean(false);
-        Completable completable = this.amqpProvider.send(sendTransactionRequest);
+        Completable completable = this.amqpProvider.send((char)0 + sendTransactionRequest.getPackTrx());
         completable.subscribe(new CompletableObserver() {
             @Override
             public void onSubscribe(Disposable d) {

From e3bcd6ee056a467c81fa3a727cfec7e07bfaa421 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Mon, 17 Aug 2020 17:52:09 -0400
Subject: [PATCH 15/19] Single completable

---
 eosiojava/build.gradle                        |  2 +-
 .../eosiojava/interfaces/IAMQPProvider.java   |  2 +-
 .../request/SendTransactionRequest.java       | 14 +++++++++++
 .../session/TransactionProcessor.java         | 23 +++++++------------
 .../one/block/eosiojava/RpcModelTest.java     |  2 +-
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/eosiojava/build.gradle b/eosiojava/build.gradle
index e847afd..0e43e05 100644
--- a/eosiojava/build.gradle
+++ b/eosiojava/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 
 def libraryGroupId = 'one.block'
 def libraryArtifactId = 'eosiojava'
-def libraryVersion = '0.2.0-amqp5'
+def libraryVersion = '0.2.0-amqp7'
 
 task sourcesJar(type: Jar, dependsOn: classes){
     classifier = 'sources'
diff --git a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
index ce0da4a..fc26f4c 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IAMQPProvider.java
@@ -15,5 +15,5 @@ public interface IAMQPProvider {
      * @return the response from the queue that message was received
      */
     @NotNull
-    Completable send(String message);
+    Completable send(byte[] message);
 }
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
index 7073c7d..6524feb 100644
--- 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
@@ -2,6 +2,8 @@
 
 import java.util.List;
 import one.block.eosiojava.models.rpcProvider.Transaction;
+import one.block.eosiojava.utilities.DateFormatter;
+import one.block.eosiojava.utilities.Utils;
 import org.jetbrains.annotations.NotNull;
 import com.google.gson.annotations.SerializedName;
 
@@ -20,4 +22,16 @@ public SendTransactionRequest(
             String packagedContextFreeData, @NotNull String packTrx) {
         super(signatures, compression, packagedContextFreeData, packTrx);
     }
+
+    public byte[] toBinary() {
+        String sendTransactionRequestAsString = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).toJson(this);
+        byte[] sendTransactionRequestAsBytes = sendTransactionRequestAsString.getBytes();
+        byte[] prependedTransactionRequestAsBytes = new byte[1 + sendTransactionRequestAsBytes.length];
+        prependedTransactionRequestAsBytes[0] = (char)0;
+        for(int j = 0; j < sendTransactionRequestAsBytes.length; j++) {
+            prependedTransactionRequestAsBytes[j + 1] = sendTransactionRequestAsBytes[j];
+        }
+
+        return prependedTransactionRequestAsBytes;
+    }
 }
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 dad90c9..d33db31 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1,5 +1,7 @@
 package one.block.eosiojava.session;
 
+import static java.util.concurrent.TimeUnit.SECONDS;
+
 import com.google.common.base.Strings;
 import io.reactivex.Completable;
 import io.reactivex.CompletableObserver;
@@ -1244,27 +1246,18 @@ private TransactionResponse sendTransaction(SendTransactionRequest sendTransacti
 
     private TransactionResponse sendAmqpTransaction(SendTransactionRequest sendTransactionRequest) {
         AtomicBoolean success = new AtomicBoolean(false);
-        Completable completable = this.amqpProvider.send((char)0 + sendTransactionRequest.getPackTrx());
-        completable.subscribe(new CompletableObserver() {
-            @Override
-            public void onSubscribe(Disposable d) {
-
-            }
-
-            @Override
-            public void onComplete() {
-                success.getAndSet(true);
-            }
+        Completable completable = this.amqpProvider.send(sendTransactionRequest.toBinary());
 
+        // What do we do on error?
+        Completable onComplete = completable.doOnComplete(new io.reactivex.functions.Action() {
             @Override
-            public void onError(Throwable e) {
-                success.getAndSet(false);
-                // Do something else?
+            public void run() throws Exception {
+                success.set(true);
             }
         });
 
         // Await response for 5 seconds
-        completable.blockingAwait(5, TimeUnit.SECONDS);
+        onComplete.blockingAwait(5, TimeUnit.SECONDS);
 
         if (success.get()) {
             return new AMQPMessageSuccessResponse();
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index f029417..ed3d6c5 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.getTransactionId());
 
         // ToJSON test
         String toJSON = this.gson.toJson(pushTransactionResponse);

From 9a20e5dc23ab03476cf047c5457c9f05aa574017 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Tue, 18 Aug 2020 17:14:23 -0400
Subject: [PATCH 16/19] Add error messages and queue process. Update interfaces

---
 eosiojava/build.gradle                        |  2 +-
 .../block/eosiojava/error/ErrorConstants.java |  8 +-
 .../DeserializePackedTransactionError.java    | 26 ++++++
 .../SerializePackedTransactionError.java      | 26 ++++++
 .../TransactionSendAmqpTransactionError.java  | 25 ++++++
 ...> TransactionSendRpcTransactionError.java} | 10 +--
 .../interfaces/ISerializationProvider.java    | 22 +++++
 .../session/TransactionProcessor.java         | 83 ++++++++++---------
 8 files changed, 155 insertions(+), 47 deletions(-)
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializePackedTransactionError.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/SerializePackedTransactionError.java
 create mode 100644 eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendAmqpTransactionError.java
 rename eosiojava/src/main/java/one/block/eosiojava/error/session/{TransactionPushTransactionError.java => TransactionSendRpcTransactionError.java} (51%)

diff --git a/eosiojava/build.gradle b/eosiojava/build.gradle
index 0e43e05..c364c24 100644
--- a/eosiojava/build.gradle
+++ b/eosiojava/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 
 def libraryGroupId = 'one.block'
 def libraryArtifactId = 'eosiojava'
-def libraryVersion = '0.2.0-amqp7'
+def libraryVersion = '0.2.0-amqp8'
 
 task sourcesJar(type: Jar, dependsOn: classes){
     classifier = 'sources'
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 07d738b..9bfc879 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
@@ -4,6 +4,7 @@
 
 import java.util.List;
 import one.block.eosiojava.interfaces.IRPCProvider;
+import one.block.eosiojava.interfaces.IAMQPProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
 import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
@@ -268,7 +269,12 @@ private ErrorConstants(){
     /**
      * Error message get thrown if {@link IRPCProvider#pushTransaction(PushTransactionRequest)} returns error.
      */
-    public static final String TRANSACTION_PROCESSOR_RPC_PUSH_TRANSACTION = "Error happened on calling pushTransaction RPC call";
+    public static final String TRANSACTION_PROCESSOR_RPC_SEND_TRANSACTION = "Error happened on calling pushTransaction RPC call";
+
+    /**
+     * Error message get thrown if {@link IAMQPProvider#send(byte[])} returns error.
+     */
+    public static final String TRANSACTION_PROCESSOR_AMQP_SEND_TRANSACTION = "Error happened on calling send AMQP call";
 
     /**
      * Error message get thrown if {@link TransactionProcessor#serialize()}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializePackedTransactionError.java b/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializePackedTransactionError.java
new file mode 100644
index 0000000..85b67b1
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/DeserializePackedTransactionError.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 deserializeTransaction()
+ *  of Serialization Provider
+ */
+public class DeserializePackedTransactionError extends SerializationProviderError {
+
+    public DeserializePackedTransactionError() {
+    }
+
+    public DeserializePackedTransactionError(@NotNull String message) {
+        super(message);
+    }
+
+    public DeserializePackedTransactionError(@NotNull String message,
+            @NotNull Exception exception) {
+        super(message, exception);
+    }
+
+    public DeserializePackedTransactionError(@NotNull Exception exception) {
+        super(exception);
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/SerializePackedTransactionError.java b/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/SerializePackedTransactionError.java
new file mode 100644
index 0000000..0df80bb
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/serializationProvider/SerializePackedTransactionError.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 serializeTransaction() of
+ * Serialization Provider
+ */
+public class SerializePackedTransactionError extends SerializationProviderError {
+
+    public SerializePackedTransactionError() {
+    }
+
+    public SerializePackedTransactionError(@NotNull String message) {
+        super(message);
+    }
+
+    public SerializePackedTransactionError(@NotNull String message,
+            @NotNull Exception exception) {
+        super(message, exception);
+    }
+
+    public SerializePackedTransactionError(@NotNull Exception exception) {
+        super(exception);
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendAmqpTransactionError.java b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendAmqpTransactionError.java
new file mode 100644
index 0000000..00e9546
--- /dev/null
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendAmqpTransactionError.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 pushTransaction() of TransactionProcessor
+ */
+public class TransactionSendAmqpTransactionError extends TransactionProcessorError {
+
+    public TransactionSendAmqpTransactionError() {
+    }
+
+    public TransactionSendAmqpTransactionError(@NotNull String message) {
+        super(message);
+    }
+
+    public TransactionSendAmqpTransactionError(@NotNull String message,
+            @NotNull Exception exception) {
+        super(message, exception);
+    }
+
+    public TransactionSendAmqpTransactionError(@NotNull Exception exception) {
+        super(exception);
+    }
+}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionPushTransactionError.java b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendRpcTransactionError.java
similarity index 51%
rename from eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionPushTransactionError.java
rename to eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendRpcTransactionError.java
index f2df1e4..d2f4985 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionPushTransactionError.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendRpcTransactionError.java
@@ -5,21 +5,21 @@
 /**
  * Error class is used when there is an exception while attempting to call pushTransaction() of TransactionProcessor
  */
-public class TransactionPushTransactionError extends TransactionProcessorError {
+public class TransactionSendRpcTransactionError extends TransactionProcessorError {
 
-    public TransactionPushTransactionError() {
+    public TransactionSendRpcTransactionError() {
     }
 
-    public TransactionPushTransactionError(@NotNull String message) {
+    public TransactionSendRpcTransactionError(@NotNull String message) {
         super(message);
     }
 
-    public TransactionPushTransactionError(@NotNull String message,
+    public TransactionSendRpcTransactionError(@NotNull String message,
             @NotNull Exception exception) {
         super(message, exception);
     }
 
-    public TransactionPushTransactionError(@NotNull Exception exception) {
+    public TransactionSendRpcTransactionError(@NotNull Exception exception) {
         super(exception);
     }
 }
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..32b604c 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/ISerializationProvider.java
@@ -2,9 +2,11 @@
 
 import one.block.eosiojava.error.serializationProvider.DeserializeAbiError;
 import one.block.eosiojava.error.serializationProvider.DeserializeError;
+import one.block.eosiojava.error.serializationProvider.DeserializePackedTransactionError;
 import one.block.eosiojava.error.serializationProvider.DeserializeTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeAbiError;
 import one.block.eosiojava.error.serializationProvider.SerializeError;
+import one.block.eosiojava.error.serializationProvider.SerializePackedTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
 import one.block.eosiojava.models.AbiEosSerializationObject;
 
@@ -76,4 +78,24 @@ public interface ISerializationProvider {
      * conversion process.
      */
     String serializeAbi(String json) throws SerializeAbiError;
+
+    /**
+     * Convenience method to transform a packed transaction (v0) hex string to a JSON string.
+     *
+     * @param hex - Hex string representing the packed transaction (v0) to deserialize.
+     * @return - Deserialized JSON string representing the transaction hex.
+     * @throws DeserializePackedTransactionError - A deserialization error is thrown if there are any exceptions during the
+     *      * conversion process.
+     */
+    String deserializePackedTransaction(String hex) throws DeserializePackedTransactionError;
+
+    /**
+     * Convenience method to transform a serialized transaction (v0) JSON string to a hex string.
+     *
+     * @param json - JSON string representing the serialized transaction (v0) to serialize.
+     * @return - Serialized hex string representing the transaction JSON.
+     * @throws SerializePackedTransactionError - A serialization error is thrown if there are any exceptions during the
+     *      * conversion process.
+     */
+    String serializePackedTransaction(String json) throws SerializePackedTransactionError;
 }
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 d33db31..c400f78 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -24,6 +24,7 @@
 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.SerializePackedTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
 import one.block.eosiojava.error.session.TransactionBroadCastEmptySignatureError;
 import one.block.eosiojava.error.session.TransactionBroadCastError;
@@ -42,7 +43,8 @@
 import one.block.eosiojava.error.session.TransactionPrepareInputError;
 import one.block.eosiojava.error.session.TransactionPrepareRpcError;
 import one.block.eosiojava.error.session.TransactionProcessorConstructorInputError;
-import one.block.eosiojava.error.session.TransactionPushTransactionError;
+import one.block.eosiojava.error.session.TransactionSendRpcTransactionError;
+import one.block.eosiojava.error.session.TransactionSendAmqpTransactionError;
 import one.block.eosiojava.error.session.TransactionSerializeError;
 import one.block.eosiojava.error.session.TransactionSignAndBroadCastError;
 import one.block.eosiojava.error.session.TransactionSignError;
@@ -75,6 +77,7 @@
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureResponse;
 import one.block.eosiojava.utilities.DateFormatter;
 import one.block.eosiojava.utilities.Utils;
+import org.bouncycastle.util.encoders.Hex;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -219,6 +222,11 @@ public class TransactionProcessor {
      */
     private boolean isTransactionModificationAllowed;
 
+    /**
+     * Prefix for packed transaction v0
+     */
+    private static final String PACKED_TRANSACTION_V0_PREFIX = "00";
+
     /**
      * Constructor with all provider references from {@link TransactionSession}
      * @param serializationProvider the serialization provider.
@@ -529,7 +537,9 @@ public boolean sign() throws TransactionSignError {
      *      <br>
      *          - The transaction has not been signed yet (no signature).
      *      <br>
-     *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
+     *          - An error has been returned from the blockchain. Cause: {@link TransactionSendRpcTransactionError}
+     *      <br>
+     *          - An error has been returned from the AMQP TRX queue process. Cause: {@link TransactionSendAmqpTransactionError}
      */
     @NotNull
     public TransactionResponse broadcast() throws TransactionBroadCastError {
@@ -547,10 +557,10 @@ public TransactionResponse broadcast() throws TransactionBroadCastError {
                 0, this.contextFreeData.getHexed(), this.serializedTransaction);
         try {
             return this.sendTransaction(sendTransactionRequest);
-        } catch (TransactionPushTransactionError transactionPushTransactionError) {
+        } catch (TransactionSendRpcTransactionError | TransactionSendAmqpTransactionError transactionSendTransactionError) {
             throw new TransactionBroadCastError(
                     ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_TRANS_ERROR,
-                    transactionPushTransactionError);
+                    transactionSendTransactionError);
         }
     }
 
@@ -568,7 +578,9 @@ public TransactionResponse broadcast() throws TransactionBroadCastError {
      *      <br>
      *          - The transaction has not been signed yet (no signature).
      *      <br>
-     *          - An error has been returned from the blockchain. Cause: {@link TransactionPushTransactionError}
+     *          - An error has been returned from the blockchain. Cause: {@link TransactionSendRpcTransactionError}
+     *      <br>
+     *          - An error has been returned from the AMQP TRX queue process. Cause: {@link TransactionSendAmqpTransactionError}
      */
     @NotNull
     public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
@@ -600,8 +612,8 @@ public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCast
                 0, this.contextFreeData.getHexed(), this.serializedTransaction);
         try {
             return this.sendTransaction(pushTransactionRequest);
-        } catch (TransactionPushTransactionError transactionPushTransactionError) {
-            throw new TransactionSignAndBroadCastError(transactionPushTransactionError);
+        } catch (TransactionSendRpcTransactionError | TransactionSendAmqpTransactionError transactionSendTransactionError) {
+            throw new TransactionSignAndBroadCastError(transactionSendTransactionError);
         }
     }
 
@@ -817,26 +829,6 @@ private EosioTransactionSignatureResponse getSignature(
         return eosioTransactionSignatureResponse;
     }
 
-    /**
-     * Push signed transaction to blockchain.
-     * <p>
-     * Check pushTransaction() flow in "Complete Workflow" document for more details.
-     *
-     * @param pushTransactionRequest the request
-     * @return Response from chain
-     */
-    @NotNull
-    private PushTransactionResponse pushTransaction(PushTransactionRequest pushTransactionRequest)
-            throws TransactionPushTransactionError {
-        try {
-            return this.rpcProvider.pushTransaction(pushTransactionRequest);
-        } catch (PushTransactionRpcError pushTransactionRpcError) {
-            throw new TransactionPushTransactionError(
-                    ErrorConstants.TRANSACTION_PROCESSOR_RPC_PUSH_TRANSACTION,
-                    pushTransactionRpcError);
-        }
-    }
-
     /**
      * Serialize current transaction
      *
@@ -1221,7 +1213,7 @@ public ContextFreeData getContextFreeData() {
     }
 
     /**
-     * Send signed transaction to blockchain.
+     * Queue message to AMQP TRX queue if amqpProvider exists. Otherwise, send signed transaction to blockchain.
      * <p>
      * Check sendTransaction() flow in "Complete Workflow" document for more details.
      *
@@ -1230,31 +1222,34 @@ public ContextFreeData getContextFreeData() {
      */
     @NotNull
     private TransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest)
-            throws TransactionPushTransactionError {
+            throws TransactionSendRpcTransactionError, TransactionSendAmqpTransactionError {
         if (this.amqpProvider != null) {
-            return this.sendAmqpTransaction(sendTransactionRequest);
+            try {
+                return this.sendAmqpTransaction(sendTransactionRequest);
+            } catch (SerializePackedTransactionError serializePackedTransactionError) {
+                throw new TransactionSendAmqpTransactionError(
+                        ErrorConstants.TRANSACTION_PROCESSOR_AMQP_SEND_TRANSACTION,
+                        serializePackedTransactionError);
+            }
         } else {
             try {
                 return this.rpcProvider.sendTransaction(sendTransactionRequest);
             } catch (SendTransactionRpcError pushTransactionRpcError) {
-                throw new TransactionPushTransactionError(
-                        ErrorConstants.TRANSACTION_PROCESSOR_RPC_PUSH_TRANSACTION,
+                throw new TransactionSendRpcTransactionError(
+                        ErrorConstants.TRANSACTION_PROCESSOR_RPC_SEND_TRANSACTION,
                         pushTransactionRpcError);
             }
         }
     }
 
-    private TransactionResponse sendAmqpTransaction(SendTransactionRequest sendTransactionRequest) {
+    private TransactionResponse sendAmqpTransaction(SendTransactionRequest sendTransactionRequest)
+            throws SerializePackedTransactionError {
         AtomicBoolean success = new AtomicBoolean(false);
-        Completable completable = this.amqpProvider.send(sendTransactionRequest.toBinary());
+        String packedTransactionV0 = getPackedTransactionV0(sendTransactionRequest);
+        Completable completable = this.amqpProvider.send(Hex.decode(packedTransactionV0));
 
         // What do we do on error?
-        Completable onComplete = completable.doOnComplete(new io.reactivex.functions.Action() {
-            @Override
-            public void run() throws Exception {
-                success.set(true);
-            }
-        });
+        Completable onComplete = completable.doOnComplete(() -> success.set(true));
 
         // Await response for 5 seconds
         onComplete.blockingAwait(5, TimeUnit.SECONDS);
@@ -1266,5 +1261,13 @@ public void run() throws Exception {
         }
     }
 
+    private String getPackedTransactionV0(SendTransactionRequest sendTransactionRequest)
+            throws SerializePackedTransactionError {
+        String json = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).toJson(sendTransactionRequest);
+        String packedTransactionV0 = this.serializationProvider.serializePackedTransaction(json);
+
+        return PACKED_TRANSACTION_V0_PREFIX + packedTransactionV0;
+    }
+
     //endregion
 }

From a2b5be2166d359369986125b2e75136701300148 Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Wed, 19 Aug 2020 09:58:00 -0400
Subject: [PATCH 17/19] Delete AMQP Config

---
 .../models/amqpProvider/AMQPConfig.java       | 115 ------------------
 1 file changed, 115 deletions(-)
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPConfig.java

diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPConfig.java b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPConfig.java
deleted file mode 100644
index c158171..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPConfig.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package one.block.eosiojava.models.amqpProvider;
-
-/**
- * The config class for AMQP
- */
-public class AMQPConfig {
-
-    /**
-     * The exchange
-     */
-    private String exchangeName;
-
-    /**
-     * The request queue name.
-     */
-    private String requestQueueName;
-
-    /**
-     * The reply-to queue name.
-     */
-    private String replyToQueueName; //TODO::Determine whether or not this is even configurable
-
-    /**
-     * The host
-     */
-    private String hostName;
-
-    /**
-     * Instantiates a new AMQP config.
-     *
-     * @param exchangeName the exchangeName
-     * @param requestQueueName the requestQueueName
-     * @param replyToQueueName the replyToQueueName
-     * @param hostName the hostName
-     */
-    public AMQPConfig(String exchangeName, String requestQueueName, String replyToQueueName, String hostName) {
-        this.setExchangeName(exchangeName);
-        this.setRequestQueueName(requestQueueName);
-        this.setReplyToQueueName(replyToQueueName);
-        this.setHostName(hostName);
-    }
-
-    /**
-     * Gets exchangeName.
-     *
-     * @return the exchangeName
-     */
-    public String getExchangeName() {
-        return this.exchangeName;
-    }
-
-    /**
-     * Sets exchangeName.
-     *
-     * @param exchangeName the exchangeName
-     */
-    public void setExchangeName(String exchangeName) {
-        this.exchangeName = exchangeName;
-    }
-
-    /**
-     * Gets requestQueueName.
-     *
-     * @return the requestQueueName
-     */
-    public String getRequestQueueName() {
-        return this.requestQueueName;
-    }
-
-    /**
-     * Sets requestQueueName.
-     *
-     * @param requestQueueName the requestQueueName
-     */
-    public void setRequestQueueName(String requestQueueName) {
-        this.requestQueueName = requestQueueName;
-    }
-
-    /**
-     * Gets replyToQueueName.
-     *
-     * @return the replyToQueueName
-     */
-    public String getReplyToQueueName() {
-        return this.replyToQueueName;
-    }
-
-    /**
-     * Sets replyToQueueName.
-     *
-     * @param replyToQueueName the replyToQueueName
-     */
-    public void setReplyToQueueName(String replyToQueueName) {
-        this.replyToQueueName = replyToQueueName;
-    }
-
-    /**
-     * Gets hostName.
-     *
-     * @return the hostName
-     */
-    public String getHostName() {
-        return this.hostName;
-    }
-
-    /**
-     * Sets hostName.
-     *
-     * @param hostName the hostName
-     */
-    public void setHostName(String hostName) {
-        this.hostName = hostName;
-    }
-}
-

From b70e57bcebcbb1e9638c8656567e6c706276277c Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Wed, 19 Aug 2020 10:29:45 -0400
Subject: [PATCH 18/19] Remove all references to PushTransaction

---
 README.md                                     |   2 +-
 .../block/eosiojava/error/ErrorConstants.java |  10 +-
 .../rpcProvider/PushTransactionRpcError.java  |  26 ----
 .../TransactionSendAmqpTransactionError.java  |   2 +-
 .../TransactionSendRpcTransactionError.java   |   2 +-
 .../eosiojava/interfaces/IRPCProvider.java    |  16 +--
 .../AMQPMessageFailedResponse.java            |   4 +-
 .../AMQPMessageSuccessResponse.java           |   4 +-
 .../models/rpcProvider/ContextFreeData.java   |   6 +-
 .../models/rpcProvider/Transaction.java       |   2 +-
 .../request/PushTransactionRequest.java       |  27 ----
 .../request/SendTransactionRequest.java       | 134 +++++++++++++++---
 .../request/TransactionRequest.java           | 131 -----------------
 .../response/PushTransactionResponse.java     |  10 --
 .../response/SendTransactionResponse.java     |  37 ++++-
 .../response/TransactionResponse.java         |  31 ----
 .../session/TransactionProcessor.java         |  29 ++--
 .../one/block/eosiojava/RpcModelTest.java     |  44 +++---
 .../NegativeTransactionProcessorTest.java     |  80 +++++++++--
 .../session/TransactionProcessorTest.java     |  54 +++----
 20 files changed, 294 insertions(+), 357 deletions(-)
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/error/rpcProvider/PushTransactionRpcError.java
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/TransactionRequest.java
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
 delete mode 100644 eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/TransactionResponse.java

diff --git a/README.md b/README.md
index 464dea3..458edf5 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,7 @@ actions.add(new Action("eosio.token", "transfer", authorizations, jsonData));
 
 processor.prepare(actions);
 
-PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
+SendTransactionResponse sendTransactionResponse = processor.signAndBroadcast();
 ```
 
 ## Android Example App
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 9bfc879..7f19770 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/ErrorConstants.java
@@ -10,7 +10,6 @@
 import one.block.eosiojava.models.EOSIOName;
 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.GetInfoResponse;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureRequest;
 import one.block.eosiojava.session.TransactionProcessor;
@@ -18,6 +17,7 @@
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureResponse;
 import one.block.eosiojava.models.rpcProvider.response.GetRequiredKeysResponse;
+import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 
 public class ErrorConstants {
     private ErrorConstants(){
@@ -267,9 +267,9 @@ private ErrorConstants(){
     public static final String TRANSACTION_PROCESSOR_GET_SIGN_DESERIALIZE_TRANS_ERROR = "Error happened on calling deserializeTransaction to refresh transaction object with new values";
 
     /**
-     * Error message get thrown if {@link IRPCProvider#pushTransaction(PushTransactionRequest)} returns error.
+     * Error message get thrown if {@link IRPCProvider#sendTransaction(SendTransactionRequest)} returns error.
      */
-    public static final String TRANSACTION_PROCESSOR_RPC_SEND_TRANSACTION = "Error happened on calling pushTransaction RPC call";
+    public static final String TRANSACTION_PROCESSOR_RPC_SEND_TRANSACTION = "Error happened on calling sendTransaction RPC call";
 
     /**
      * Error message get thrown if {@link IAMQPProvider#send(byte[])} returns error.
@@ -287,9 +287,9 @@ private ErrorConstants(){
     public static final String TRANSACTION_PROCESSOR_SIGN_CREATE_SIGN_REQUEST_ERROR = "Error happened on creating signature request for Signature Provider to sign!";
 
     /**
-     * Error message get thrown if error happens during pushing transaction to backend
+     * Error message get thrown if error happens during sending transaction to backend
      */
-    public static final String TRANSACTION_PROCESSOR_BROADCAST_TRANS_ERROR = "Error happened on pushing transaction to chain!";
+    public static final String TRANSACTION_PROCESSOR_BROADCAST_TRANS_ERROR = "Error happened on sending transaction to chain!";
 
     /**
      * Error message get thrown if required keys from {@link GetRequiredKeysResponse} is not subset of keys from {@link ISignatureProvider#getAvailableKeys()}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/rpcProvider/PushTransactionRpcError.java b/eosiojava/src/main/java/one/block/eosiojava/error/rpcProvider/PushTransactionRpcError.java
deleted file mode 100644
index f42c9c1..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/error/rpcProvider/PushTransactionRpcError.java
+++ /dev/null
@@ -1,26 +0,0 @@
-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,
- * pushTransaction().
- */
-public class PushTransactionRpcError extends RpcProviderError {
-
-    public PushTransactionRpcError() {
-    }
-
-    public PushTransactionRpcError(@NotNull String message) {
-        super(message);
-    }
-
-    public PushTransactionRpcError(@NotNull String message,
-            @NotNull Exception exception) {
-        super(message, exception);
-    }
-
-    public PushTransactionRpcError(@NotNull Exception exception) {
-        super(exception);
-    }
-}
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendAmqpTransactionError.java b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendAmqpTransactionError.java
index 00e9546..3dda2e8 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendAmqpTransactionError.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendAmqpTransactionError.java
@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Error class is used when there is an exception while attempting to call pushTransaction() of TransactionProcessor
+ * Error class is used when there is an exception while attempting to call sendTransaction() of TransactionProcessor
  */
 public class TransactionSendAmqpTransactionError extends TransactionProcessorError {
 
diff --git a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendRpcTransactionError.java b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendRpcTransactionError.java
index d2f4985..0fec140 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendRpcTransactionError.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/error/session/TransactionSendRpcTransactionError.java
@@ -3,7 +3,7 @@
 import org.jetbrains.annotations.NotNull;
 
 /**
- * Error class is used when there is an exception while attempting to call pushTransaction() of TransactionProcessor
+ * Error class is used when there is an exception while attempting to call sendTransaction() of TransactionProcessor
  */
 public class TransactionSendRpcTransactionError extends TransactionProcessorError {
 
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 7dd43e6..61955f3 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/interfaces/IRPCProvider.java
@@ -4,18 +4,15 @@
 import one.block.eosiojava.error.rpcProvider.GetInfoRpcError;
 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;
 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;
 
@@ -70,18 +67,7 @@ public interface IRPCProvider {
     /**
      * This method expects a transaction in JSON format and will attempt to apply it to the blockchain.
      *
-     * @param pushTransactionRequest the transaction to push with signatures.
-     * @return the push transaction response
-     * @throws PushTransactionRpcError thrown if there are any exceptions/backend error during the
-     * pushTransaction() process.
-     */
-    @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.
+     * @param sendTransactionRequest the transaction to send with signatures.
      * @return the send transaction response
      * @throws SendTransactionRpcError thrown if there are any exceptions/backend error during the
      * sendTransaction() process.
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageFailedResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageFailedResponse.java
index 0a66434..15e1cfa 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageFailedResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageFailedResponse.java
@@ -1,7 +1,7 @@
 package one.block.eosiojava.models.amqpProvider;
 
-import one.block.eosiojava.models.rpcProvider.response.TransactionResponse;
+import one.block.eosiojava.models.rpcProvider.response.SendTransactionResponse;
 
-public class AMQPMessageFailedResponse extends TransactionResponse {
+public class AMQPMessageFailedResponse extends SendTransactionResponse {
 
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageSuccessResponse.java b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageSuccessResponse.java
index b8859e6..5e764b2 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageSuccessResponse.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/amqpProvider/AMQPMessageSuccessResponse.java
@@ -1,6 +1,6 @@
 package one.block.eosiojava.models.amqpProvider;
 
-import one.block.eosiojava.models.rpcProvider.response.TransactionResponse;
+import one.block.eosiojava.models.rpcProvider.response.SendTransactionResponse;
 
-public class AMQPMessageSuccessResponse extends TransactionResponse {
+public class AMQPMessageSuccessResponse extends SendTransactionResponse {
 }
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/ContextFreeData.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/ContextFreeData.java
index 41e5216..a0e7ab8 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/ContextFreeData.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/ContextFreeData.java
@@ -3,8 +3,9 @@
 import java.nio.ByteBuffer;
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
-import one.block.eosiojava.models.rpcProvider.request.PushTransactionRequest;
+import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureRequest;
+import one.block.eosiojava.interfaces.IAMQPProvider;
 import org.bitcoinj.core.Sha256Hash;
 import org.bouncycastle.util.encoders.Hex;
 import org.jetbrains.annotations.NotNull;
@@ -56,7 +57,8 @@ public byte[] getBytes() {
     }
 
     /**
-     * Gets the hex representation of the data to be used by {@link IRPCProvider#pushTransaction(PushTransactionRequest)}
+     * Gets the hex representation of the data to be used by {@link IRPCProvider#sendTransaction(SendTransactionRequest)}
+     * or {@link IAMQPProvider#send(byte[])} depending on configuration
      * @return the hexed data
      */
     public String getHexed() {
diff --git a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Transaction.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Transaction.java
index 5eab883..4255dc5 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Transaction.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/Transaction.java
@@ -10,7 +10,7 @@
 
 /**
  * The Transaction class which has data of actions for each transaction. It holds the serialized
- * action data that will be pushed to the blockchain.
+ * action data that will be sent to the blockchain.
  */
 public class Transaction implements Serializable {
 
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
deleted file mode 100644
index 57c6980..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/PushTransactionRequest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-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;
-
-/**
- * The request of PushTransactionRequest RPC call {@link one.block.eosiojava.interfaces.IRPCProvider#pushTransaction(PushTransactionRequest)}
- */
-public class PushTransactionRequest extends TransactionRequest {
-
-    /**
-     * Instantiates a new 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 Transaction}.
-     */
-    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
index 6524feb..56bc39f 100644
--- 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
@@ -1,37 +1,131 @@
 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 one.block.eosiojava.utilities.DateFormatter;
-import one.block.eosiojava.utilities.Utils;
 import org.jetbrains.annotations.NotNull;
-import com.google.gson.annotations.SerializedName;
 
-public class SendTransactionRequest extends TransactionRequest {
+/**
+ * The base class for send transaction requests
+ */
+public class SendTransactionRequest {
+
+    /**
+     * 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 SendTransactionRequest.
+     * 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 Transaction}.
+     * @param packTrx the packed Transaction (serialized transaction). It is serialized version
+     * of {@link one.block.eosiojava.models.rpcProvider.Transaction}.
      */
-    public SendTransactionRequest(
-            @NotNull List<String> signatures, int compression,
+    public SendTransactionRequest(@NotNull List<String> signatures, int compression,
             String packagedContextFreeData, @NotNull String packTrx) {
-        super(signatures, compression, packagedContextFreeData, 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;
     }
 
-    public byte[] toBinary() {
-        String sendTransactionRequestAsString = Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).toJson(this);
-        byte[] sendTransactionRequestAsBytes = sendTransactionRequestAsString.getBytes();
-        byte[] prependedTransactionRequestAsBytes = new byte[1 + sendTransactionRequestAsBytes.length];
-        prependedTransactionRequestAsBytes[0] = (char)0;
-        for(int j = 0; j < sendTransactionRequestAsBytes.length; j++) {
-            prependedTransactionRequestAsBytes[j + 1] = sendTransactionRequestAsBytes[j];
-        }
+    /**
+     * Sets packaged context free data in hex
+     *
+     * @param packagedContextFreeData the packaged context free data in hex.
+     */
+    public void setPackagedContextFreeData(String packagedContextFreeData) {
+        this.packagedContextFreeData = packagedContextFreeData;
+    }
 
-        return prependedTransactionRequestAsBytes;
+    /**
+     * 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/request/TransactionRequest.java b/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/TransactionRequest.java
deleted file mode 100644
index feac5e8..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/request/TransactionRequest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-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
deleted file mode 100644
index c04b3a4..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/PushTransactionResponse.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package one.block.eosiojava.models.rpcProvider.response;
-
-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 extends TransactionResponse {
-}
\ 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
index 4578d01..fae6597 100644
--- 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
@@ -1,11 +1,40 @@
 package one.block.eosiojava.models.rpcProvider.response;
 
-import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
+import com.google.gson.annotations.SerializedName;
+import java.util.Map;
 
 /**
- * The response of the sendTransaction() RPC call
- * {@link one.block.eosiojava.interfaces.IRPCProvider#sendTransaction(SendTransactionRequest)}
+ * The base class for send transaction responses
  */
-public class SendTransactionResponse extends TransactionResponse {
+public class SendTransactionResponse {
 
+    /**
+     * The transaction id of the successful transaction.
+     */
+    @SerializedName("transaction_id")
+    private String transactionId;
+
+    /**
+     * The processed transaction
+     */
+    @SerializedName("processed")
+    private Map processed;
+
+    /**
+     * Gets the transaction id of the successful transaction.
+     *
+     * @return The successful transaction id.
+     */
+    public String getTransactionId() {
+        return transactionId;
+    }
+
+    /**
+     * Gets the processed information of the successful transaction.
+     *
+     * @return The processed information.
+     */
+    public Map getProcessed() {
+        return processed;
+    }
 }
\ 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
deleted file mode 100644
index 19d57a4..0000000
--- a/eosiojava/src/main/java/one/block/eosiojava/models/rpcProvider/response/TransactionResponse.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package one.block.eosiojava.models.rpcProvider.response;
-
-import com.google.gson.annotations.SerializedName;
-import java.util.Map;
-
-/**
- * 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 Map processed;
-
-    /**
-     * Gets the transaction id of the successful transaction.
-     *
-     * @return The successful transaction id.
-     */
-    public String getTransactionId() {
-        return transactionId;
-    }
-}
\ 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 c400f78..2e4cabf 100644
--- a/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
+++ b/eosiojava/src/main/java/one/block/eosiojava/session/TransactionProcessor.java
@@ -1,11 +1,7 @@
 package one.block.eosiojava.session;
 
-import static java.util.concurrent.TimeUnit.SECONDS;
-
 import com.google.common.base.Strings;
 import io.reactivex.Completable;
-import io.reactivex.CompletableObserver;
-import io.reactivex.disposables.Disposable;
 import java.io.IOException;
 import java.io.Serializable;
 import java.math.BigInteger;
@@ -14,13 +10,11 @@
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicReference;
 import one.block.eosiojava.error.ErrorConstants;
 import one.block.eosiojava.error.abiProvider.GetAbiError;
 import one.block.eosiojava.error.rpcProvider.GetBlockRpcError;
 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;
@@ -57,7 +51,6 @@
 import one.block.eosiojava.interfaces.ISignatureProvider;
 import one.block.eosiojava.models.amqpProvider.AMQPMessageFailedResponse;
 import one.block.eosiojava.models.amqpProvider.AMQPMessageSuccessResponse;
-import one.block.eosiojava.models.rpcProvider.request.SendTransactionRequest;
 import one.block.eosiojava.models.AbiEosSerializationObject;
 import one.block.eosiojava.models.EOSIOName;
 import one.block.eosiojava.models.rpcProvider.Action;
@@ -66,13 +59,11 @@
 import one.block.eosiojava.models.rpcProvider.TransactionConfig;
 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;
@@ -542,7 +533,7 @@ public boolean sign() throws TransactionSignError {
      *          - An error has been returned from the AMQP TRX queue process. Cause: {@link TransactionSendAmqpTransactionError}
      */
     @NotNull
-    public TransactionResponse broadcast() throws TransactionBroadCastError {
+    public SendTransactionResponse broadcast() throws TransactionBroadCastError {
         if (this.serializedTransaction == null || this.serializedTransaction.isEmpty()) {
             throw new TransactionBroadCastError(
                     ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_SERIALIZED_TRANSACTION_EMPTY);
@@ -567,7 +558,7 @@ public TransactionResponse broadcast() throws TransactionBroadCastError {
     /**
      * Sign and broadcast the transaction and signature/s to chain
      *
-     * @return PushTransactionResponse from blockchain.
+     * @return SendTransactionResponse from blockchain.
      * @throws TransactionSignAndBroadCastError thrown under the following conditions:
      *      <br>
      *          - Exception while creating signature. Cause: {@link TransactionCreateSignatureRequestError}
@@ -583,7 +574,7 @@ public TransactionResponse broadcast() throws TransactionBroadCastError {
      *          - An error has been returned from the AMQP TRX queue process. Cause: {@link TransactionSendAmqpTransactionError}
      */
     @NotNull
-    public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
+    public SendTransactionResponse signAndBroadcast() throws TransactionSignAndBroadCastError {
         EosioTransactionSignatureRequest eosioTransactionSignatureRequest;
         try {
             eosioTransactionSignatureRequest = this.createSignatureRequest();
@@ -608,10 +599,10 @@ public TransactionResponse signAndBroadcast() throws TransactionSignAndBroadCast
         }
 
         // Signatures and serializedTransaction are assigned and finalized in getSignature() method
-        SendTransactionRequest pushTransactionRequest = new SendTransactionRequest(this.signatures,
+        SendTransactionRequest sendTransactionRequest = new SendTransactionRequest(this.signatures,
                 0, this.contextFreeData.getHexed(), this.serializedTransaction);
         try {
-            return this.sendTransaction(pushTransactionRequest);
+            return this.sendTransaction(sendTransactionRequest);
         } catch (TransactionSendRpcTransactionError | TransactionSendAmqpTransactionError transactionSendTransactionError) {
             throw new TransactionSignAndBroadCastError(transactionSendTransactionError);
         }
@@ -1221,7 +1212,7 @@ public ContextFreeData getContextFreeData() {
      * @return Response from chain
      */
     @NotNull
-    private TransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest)
+    private SendTransactionResponse sendTransaction(SendTransactionRequest sendTransactionRequest)
             throws TransactionSendRpcTransactionError, TransactionSendAmqpTransactionError {
         if (this.amqpProvider != null) {
             try {
@@ -1234,15 +1225,15 @@ private TransactionResponse sendTransaction(SendTransactionRequest sendTransacti
         } else {
             try {
                 return this.rpcProvider.sendTransaction(sendTransactionRequest);
-            } catch (SendTransactionRpcError pushTransactionRpcError) {
+            } catch (SendTransactionRpcError sendTransactionRpcError) {
                 throw new TransactionSendRpcTransactionError(
                         ErrorConstants.TRANSACTION_PROCESSOR_RPC_SEND_TRANSACTION,
-                        pushTransactionRpcError);
+                        sendTransactionRpcError);
             }
         }
     }
 
-    private TransactionResponse sendAmqpTransaction(SendTransactionRequest sendTransactionRequest)
+    private SendTransactionResponse sendAmqpTransaction(SendTransactionRequest sendTransactionRequest)
             throws SerializePackedTransactionError {
         AtomicBoolean success = new AtomicBoolean(false);
         String packedTransactionV0 = getPackedTransactionV0(sendTransactionRequest);
diff --git a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
index ed3d6c5..f03176d 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/RpcModelTest.java
@@ -11,12 +11,12 @@
 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;
 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.junit.Before;
 import org.junit.Test;
 
@@ -148,29 +148,29 @@ public void GetRequiredKeysRequestTest() {
     }
 
     /**
-     * Test PushTransactionRequest
+     * Test SendTransactionRequest
      */
     @Test
-    public void PushTransactionRequestTest() {
+    public void SendTransactionRequestTest() {
         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());
+        SendTransactionRequest sendTransactionRequest = this.gson
+                .fromJson(jsonContent, SendTransactionRequest.class);
+        assertNotNull(sendTransactionRequest);
+        assertEquals(0, sendTransactionRequest.getCompression());
         assertEquals(
                 "packed transaction",
-                pushTransactionRequest.getPackTrx());
-        assertEquals("", pushTransactionRequest.getPackagedContextFreeData());
-        assertNotNull(pushTransactionRequest.getSignatures());
-        assertEquals(1, pushTransactionRequest.getSignatures().size());
+                sendTransactionRequest.getPackTrx());
+        assertEquals("", sendTransactionRequest.getPackagedContextFreeData());
+        assertNotNull(sendTransactionRequest.getSignatures());
+        assertEquals(1, sendTransactionRequest.getSignatures().size());
         assertEquals(
                 "signature in EOS format",
-                pushTransactionRequest.getSignatures().get(0));
+                sendTransactionRequest.getSignatures().get(0));
 
         // ToJSON test
-        String toJSON = this.gson.toJson(pushTransactionRequest);
+        String toJSON = this.gson.toJson(sendTransactionRequest);
         assertNotNull(toJSON);
         assertNotEquals("", toJSON);
         assertEquals(jsonContent, toJSON);
@@ -274,21 +274,21 @@ public void GetRequiredKeysResponseTest() {
     }
 
     /**
-     * Test PushTransactionResponse
+     * Test SendTransactionResponse
      */
     @Test
-    public void PushTransactionResponseTest() {
+    public void SendTransactionResponseTest() {
         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.getTransactionId());
+        SendTransactionResponse sendTransactionResponse = this.gson
+                .fromJson(jsonContent, SendTransactionResponse.class);
+        assertNotNull(sendTransactionResponse);
+        assertEquals("dump_transaction_id", sendTransactionResponse.getTransactionId());
+        assertEquals("dump_id", sendTransactionResponse.getProcessed().get("id"));
 
         // ToJSON test
-        String toJSON = this.gson.toJson(pushTransactionResponse);
+        String toJSON = this.gson.toJson(sendTransactionResponse);
         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.
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..c4f94e4 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/NegativeTransactionProcessorTest.java
@@ -17,9 +17,10 @@
 import one.block.eosiojava.error.rpcProvider.GetBlockRpcError;
 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.SerializePackedTransactionError;
 import one.block.eosiojava.error.serializationProvider.SerializeTransactionError;
 import one.block.eosiojava.error.session.TransactionBroadCastError;
 import one.block.eosiojava.error.session.TransactionCreateSignatureRequestError;
@@ -30,11 +31,13 @@
 import one.block.eosiojava.error.session.TransactionPrepareInputError;
 import one.block.eosiojava.error.session.TransactionPrepareRpcError;
 import one.block.eosiojava.error.session.TransactionProcessorConstructorInputError;
-import one.block.eosiojava.error.session.TransactionPushTransactionError;
+import one.block.eosiojava.error.session.TransactionSendAmqpTransactionError;
+import one.block.eosiojava.error.session.TransactionSendRpcTransactionError;
 import one.block.eosiojava.error.session.TransactionSignError;
 import one.block.eosiojava.error.signatureProvider.GetAvailableKeysError;
 import one.block.eosiojava.error.signatureProvider.SignTransactionError;
 import one.block.eosiojava.interfaces.IABIProvider;
+import one.block.eosiojava.interfaces.IAMQPProvider;
 import one.block.eosiojava.interfaces.IRPCProvider;
 import one.block.eosiojava.interfaces.ISerializationProvider;
 import one.block.eosiojava.interfaces.ISignatureProvider;
@@ -46,7 +49,7 @@
 import one.block.eosiojava.models.rpcProvider.TransactionConfig;
 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;
@@ -71,6 +74,7 @@ public class NegativeTransactionProcessorTest {
     public ExpectedException exceptionRule = ExpectedException.none();
 
     private IRPCProvider mockedRpcProvider = mock(IRPCProvider.class);
+    private IAMQPProvider mockedAmqpProvider = mock(IAMQPProvider.class);
     private ISignatureProvider mockedSignatureProvider = mock(ISignatureProvider.class);
     private IABIProvider mockedABIProvider = mock(IABIProvider.class);
     private ISerializationProvider mockedSerializationProvider = mock(ISerializationProvider.class);
@@ -82,6 +86,11 @@ public void setUp() {
                 this.mockedSignatureProvider);
     }
 
+    public void setUpWithAmqpProvider() {
+        this.session = new TransactionSession(this.mockedSerializationProvider, this.mockedRpcProvider, this.mockedABIProvider,
+                this.mockedSignatureProvider, this.mockedAmqpProvider);
+    }
+
     //region negative tests for "prepare"
     @Test
     public void prepare_thenFailWithEmptyActions() throws TransactionPrepareError {
@@ -407,22 +416,73 @@ public void signCallGetSignatureWithTransactionModified_thenFailWithDeserializeT
     //region negative tests for broadcast
 
     @Test
-    public void broadCast_thenFailWithPushTransactionError() throws TransactionBroadCastError {
+    public void broadCast_thenFailWithSendRpcTransactionError() throws TransactionBroadCastError {
+        exceptionRule.expect(TransactionBroadCastError.class);
+        exceptionRule.expectMessage(ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_TRANS_ERROR);
+        exceptionRule.expectCause(IsInstanceOf.<EosioError>instanceOf(TransactionSendRpcTransactionError.class));
+
+        // Mock RpcProvider
+        this.mockGetInfoPositively();
+        this.mockGetBlockPositively();
+        this.mockRequiredKeys(Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class));
+
+        // Mock SendTransaction RPC to throw error
+        try {
+            when(this.mockedRpcProvider.sendTransaction(any(SendTransactionRequest.class))).thenThrow(new SendTransactionRpcError());
+        } catch (SendTransactionRpcError sendTransactionRpcError) {
+            sendTransactionRpcError.printStackTrace();
+            fail("Exception should not be thrown here for mocking sendTransaction");
+        }
+
+        // Mock AbiProvider
+        this.mockGetAbi(EOSIOTOKENABIJSON);
+
+        // mock serialization
+        this.mockSerialize(MOCKED_ACTION_HEX);
+        this.mockSerializeTransaction(MOCKED_TRANSACTION_HEX);
+
+        // Mock signature provider
+        this.mockGetAvailableKey(Arrays.asList("Key1", "Key2"));
+        this.mockSignTransaction(Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN)
+                .fromJson(mockedEosioTransactionSignatureResponseJSON, EosioTransactionSignatureResponse.class));
+
+        TransactionProcessor processor = session.getTransactionProcessor();
+
+        try {
+            processor.prepare(this.defaultActions());
+        } catch (TransactionPrepareError transactionPrepareError) {
+            transactionPrepareError.printStackTrace();
+            fail("Exception should not be thrown here for calling prepare");
+        }
+
+        try {
+            processor.sign();
+        } catch (TransactionSignError transactionSignError) {
+            transactionSignError.printStackTrace();
+            fail("Exception should not be thrown here for calling prepare");
+        }
+
+        processor.broadcast();
+    }
+
+    @Test
+    public void broadCast_thenFailWithSendAmqpTransactionError() throws TransactionBroadCastError {
+        setUpWithAmqpProvider();
         exceptionRule.expect(TransactionBroadCastError.class);
         exceptionRule.expectMessage(ErrorConstants.TRANSACTION_PROCESSOR_BROADCAST_TRANS_ERROR);
-        exceptionRule.expectCause(IsInstanceOf.<EosioError>instanceOf(TransactionPushTransactionError.class));
+        exceptionRule.expectCause(IsInstanceOf.<EosioError>instanceOf(TransactionSendAmqpTransactionError.class));
 
         // Mock RpcProvider
         this.mockGetInfoPositively();
         this.mockGetBlockPositively();
         this.mockRequiredKeys(Utils.getGson(DateFormatter.BACKEND_DATE_PATTERN).fromJson(mockedGetRequiredKeysResponse, GetRequiredKeysResponse.class));
 
-        // Mock PushTransaction RPC to throw error
+        // Mock AMQPProvider send to throw error
         try {
-            when(this.mockedRpcProvider.pushTransaction(any(PushTransactionRequest.class))).thenThrow(new PushTransactionRpcError());
-        } catch (PushTransactionRpcError pushTransactionRpcError) {
-            pushTransactionRpcError.printStackTrace();
-            fail("Exception should not be thrown here for mocking pushTransaction");
+            when(this.mockedSerializationProvider.serializePackedTransaction(any(String.class))).thenThrow(new SerializePackedTransactionError());
+        } catch (SerializePackedTransactionError serializePackedTransactionError) {
+            serializePackedTransactionError.printStackTrace();
+            fail("Exception should not be thrown here for mocking sendTransaction");
         }
 
         // Mock AbiProvider
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 bbcb04c..c566890 100644
--- a/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
+++ b/eosiojava/src/test/java/one/block/eosiojava/session/TransactionProcessorTest.java
@@ -17,7 +17,7 @@
 import one.block.eosiojava.error.rpcProvider.GetBlockRpcError;
 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;
@@ -43,11 +43,11 @@
 import one.block.eosiojava.models.rpcProvider.TransactionConfig;
 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.signatureProvider.EosioTransactionSignatureRequest;
 import one.block.eosiojava.models.signatureProvider.EosioTransactionSignatureResponse;
 import one.block.eosiojava.utilities.DateFormatter;
@@ -144,9 +144,9 @@ public void broadcast() {
         }
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.broadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+            SendTransactionResponse sendTransactionResponse = processor.broadcast();
+            assertNotNull(sendTransactionResponse);
+            assertEquals(DUMP_TRANSACTION_ID, sendTransactionResponse.getTransactionId());
         } catch (TransactionBroadCastError transactionBroadCastError) {
             transactionBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling broadcast");
@@ -160,9 +160,9 @@ public void signAndBroadcast() {
         assertNotNull(processor);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+            SendTransactionResponse sendTransactionResponse = processor.signAndBroadcast();
+            assertNotNull(sendTransactionResponse);
+            assertEquals(DUMP_TRANSACTION_ID, sendTransactionResponse.getTransactionId());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
@@ -377,9 +377,9 @@ public void setRequiredKeys() {
         processor.setRequiredKeys(requiredKeys);
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+            SendTransactionResponse sendTransactionResponse = processor.signAndBroadcast();
+            assertNotNull(sendTransactionResponse);
+            assertEquals(DUMP_TRANSACTION_ID, sendTransactionResponse.getTransactionId());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for calling signAndBroadcast");
@@ -392,7 +392,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(MOCKED_SENDTRANSACTION_RESPONE_JSON, SendTransactionResponse.class));
 
         this.mockAbiProvider(EOSIOTOKENABIJSON);
         this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction);
@@ -415,9 +415,9 @@ public void isAllowTransactionToBeModified() {
         assertTrue(processor.isTransactionModificationAllowed());
 
        try {
-           PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-           assertNotNull(pushTransactionResponse);
-           assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+           SendTransactionResponse sendTransactionResponse = processor.signAndBroadcast();
+           assertNotNull(sendTransactionResponse);
+           assertEquals(DUMP_TRANSACTION_ID, sendTransactionResponse.getTransactionId());
 
            // after signing and broadcast, serialized transaction is updated
            assertEquals(MOCKED_TRANSACTION_HEX_MODIFIED, processor.getSerializedTransaction());
@@ -456,9 +456,9 @@ public void testPresetTransaction() {
         }
 
         try {
-            PushTransactionResponse pushTransactionResponse = processor.signAndBroadcast();
-            assertNotNull(pushTransactionResponse);
-            assertEquals(DUMP_TRANSACTION_ID, pushTransactionResponse.getTransactionId());
+            SendTransactionResponse sendTransactionResponse = processor.signAndBroadcast();
+            assertNotNull(sendTransactionResponse);
+            assertEquals(DUMP_TRANSACTION_ID, sendTransactionResponse.getTransactionId());
         } catch (TransactionSignAndBroadCastError transactionSignAndBroadCastError) {
             transactionSignAndBroadCastError.printStackTrace();
             fail("Exception should not be thrown here for sign and broadcast");
@@ -589,7 +589,7 @@ private void mockDefaultSuccessData() {
                 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(MOCKED_SENDTRANSACTION_RESPONE_JSON, SendTransactionResponse.class));
 
         this.mockAbiProvider(EOSIOTOKENABIJSON);
         this.mockSerializationProvider(MOCKED_ACTION_HEX, MOCKED_TRANSACTION_HEX, mockedDeserilizedTransaction);
@@ -664,7 +664,7 @@ private void mockRPC(
             @Nullable GetInfoResponse getInfoResponse,
             @Nullable GetBlockResponse getBlockResponse,
             @Nullable GetRequiredKeysResponse getRequiredKeysResponse,
-            @Nullable PushTransactionResponse pushTransactionResponse) {
+            @Nullable SendTransactionResponse sendTransactionResponse) {
 
         if (getInfoResponse != null) {
             try {
@@ -693,12 +693,12 @@ private void mockRPC(
             }
         }
 
-        if (pushTransactionResponse != null) {
+        if (sendTransactionResponse != null) {
             try {
-                when(this.mockedRpcProvider.pushTransaction(any(PushTransactionRequest.class))).thenReturn(pushTransactionResponse);
-            } catch (PushTransactionRpcError pushTransactionRpcError) {
-                pushTransactionRpcError.printStackTrace();
-                fail("Exception should not be thrown here for mocking pushTransaction");
+                when(this.mockedRpcProvider.sendTransaction(any(SendTransactionRequest.class))).thenReturn(sendTransactionResponse);
+            } catch (SendTransactionRpcError sendTransactionRpcError) {
+                sendTransactionRpcError.printStackTrace();
+                fail("Exception should not be thrown here for mocking sendTransaction");
             }
         }
     }
@@ -771,7 +771,7 @@ 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 DUMP_TRANSACTION_ID = "17335a29eae22e531966f3775e44f8b02173e780c9549881e01e470ff0ab46ce";
-    private static final String MOCKED_PUSHTRANSACTION_RESPONE_JSON = "{\"transaction_id\":\"" + DUMP_TRANSACTION_ID + "\"}";
+    private static final String MOCKED_SENDTRANSACTION_RESPONE_JSON = "{\"transaction_id\":\"" + DUMP_TRANSACTION_ID + "\"}";
 
     private static final BigInteger headBlockNum = BigInteger.valueOf(31984402L);
     private static final String headBlockTime = "2019-04-01T22:08:40.000";

From 18da11dc26ac73556508b49b2c0463f9c1682cdf Mon Sep 17 00:00:00 2001
From: Jon La Marr <jon.lamarr-ext@block.one>
Date: Wed, 19 Aug 2020 13:12:27 -0400
Subject: [PATCH 19/19] Bump version

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

diff --git a/eosiojava/build.gradle b/eosiojava/build.gradle
index c364c24..707df46 100644
--- a/eosiojava/build.gradle
+++ b/eosiojava/build.gradle
@@ -41,7 +41,7 @@ dependencies {
 
 def libraryGroupId = 'one.block'
 def libraryArtifactId = 'eosiojava'
-def libraryVersion = '0.2.0-amqp8'
+def libraryVersion = '0.2.0-amqp9'
 
 task sourcesJar(type: Jar, dependsOn: classes){
     classifier = 'sources'