add TransactionReceipt & RawTransaction

src/main/java/org/fisco/bcos/sdk/transaction/core/impl/executor/TransactionBuilder.java

@@ -15,13 +15,13 @@
 package org.fisco.bcos.sdk.transaction.core.impl.executor;
 
 import java.math.BigInteger;
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransaction;
 import org.fisco.bcos.sdk.transaction.core.interf.executor.TransactionBuilderInterface;
+import org.fisco.bcos.sdk.transaction.domain.RawTransaction;
 
 public class TransactionBuilder implements TransactionBuilderInterface {
 
     @Override
-    public BcosTransaction createTransaction(
+    public RawTransaction createTransaction(
             BigInteger gasPrice,
             BigInteger gasLimit,
             String to,
@@ -35,7 +35,7 @@ public BcosTransaction createTransaction(
     }
 
     @Override
-    public BcosTransaction createTransaction(String to, String data, BigInteger groupId) {
+    public RawTransaction createTransaction(String to, String data, BigInteger groupId) {
         // TODO Auto-generated method stub
         return null;
     }

src/main/java/org/fisco/bcos/sdk/transaction/core/impl/executor/TransactionDecoder.java

@@ -16,18 +16,18 @@
 
 import java.util.List;
 import java.util.Map;
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransaction;
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransactionReceipt;
 import org.fisco.bcos.sdk.transaction.core.interf.executor.TransactionDecoderInterface;
 import org.fisco.bcos.sdk.transaction.domain.EventLog;
 import org.fisco.bcos.sdk.transaction.domain.EventResultEntity;
 import org.fisco.bcos.sdk.transaction.domain.InputAndOutputResult;
+import org.fisco.bcos.sdk.transaction.domain.RawTransaction;
+import org.fisco.bcos.sdk.transaction.domain.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.domain.TransactionResponse;
 
 public class TransactionDecoder implements TransactionDecoderInterface {
 
     @Override
-    public BcosTransaction decodeRlp(String hex) {
+    public RawTransaction decodeRlp(String hex) {
         // TODO Auto-generated method stub
         return null;
     }
@@ -53,14 +53,14 @@ public InputAndOutputResult decodeOutputReturnObject(
 
     @Override
     public String decodeEventReturnJson(
-            String contractName, BcosTransactionReceipt transactionReceipt) {
+            String contractName, TransactionReceipt transactionReceipt) {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
     public Map<String, List<List<EventResultEntity>>> decodeEventReturnObject(
-            String contractName, BcosTransactionReceipt transactionReceipt) {
+            String contractName, TransactionReceipt transactionReceipt) {
         // TODO Auto-generated method stub
         return null;
     }
@@ -100,7 +100,7 @@ public String decodeReceiptMessage(String input) {
 
     @Override
     public TransactionResponse decodeTransactionReceipt(
-            String contractName, BcosTransactionReceipt transactionReceipt) {
+            String contractName, TransactionReceipt transactionReceipt) {
         // TODO Auto-generated method stub
         return null;
     }

src/main/java/org/fisco/bcos/sdk/transaction/core/impl/executor/TransactionEncoder.java

@@ -14,14 +14,14 @@
  */
 package org.fisco.bcos.sdk.transaction.core.impl.executor;
 
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransaction;
 import org.fisco.bcos.sdk.crypto.signature.SignatureResult;
 import org.fisco.bcos.sdk.transaction.core.interf.executor.TransactionEncoderInterface;
+import org.fisco.bcos.sdk.transaction.domain.RawTransaction;
 
 public class TransactionEncoder implements TransactionEncoderInterface {
 
     @Override
-    public byte[] encode(BcosTransaction transaction, SignatureResult signature) {
+    public byte[] encode(RawTransaction transaction, SignatureResult signature) {
         // TODO Auto-generated method stub
         return null;
     }

src/main/java/org/fisco/bcos/sdk/transaction/core/impl/executor/TransactionPusher.java

@@ -16,9 +16,9 @@
 
 import java.util.concurrent.CompletableFuture;
 import org.fisco.bcos.sdk.client.RespCallback;
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransactionReceipt;
 import org.fisco.bcos.sdk.client.protocol.response.Call;
 import org.fisco.bcos.sdk.transaction.core.interf.executor.TransactionPusherInterface;
+import org.fisco.bcos.sdk.transaction.domain.TransactionReceipt;
 
 public class TransactionPusher implements TransactionPusherInterface {
 
@@ -29,19 +29,19 @@ public void pushOnly(String signedTransaction) {
     }
 
     @Override
-    public BcosTransactionReceipt push(String signedTransaction) {
+    public TransactionReceipt push(String signedTransaction) {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
-    public <T> BcosTransactionReceipt push(String signedTransaction, RespCallback<T> callback) {
+    public <T> TransactionReceipt push(String signedTransaction, RespCallback<T> callback) {
         // TODO Auto-generated method stub
         return null;
     }
 
     @Override
-    public CompletableFuture<BcosTransactionReceipt> pushAsync(String signedTransaction) {
+    public CompletableFuture<TransactionReceipt> pushAsync(String signedTransaction) {
         // TODO Auto-generated method stub
         return null;
     }

src/main/java/org/fisco/bcos/sdk/transaction/core/impl/executor/TransactionSigner.java

@@ -14,9 +14,9 @@
  */
 package org.fisco.bcos.sdk.transaction.core.impl.executor;
 
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransaction;
 import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair;
 import org.fisco.bcos.sdk.transaction.core.interf.executor.TransactionSignerInterface;
+import org.fisco.bcos.sdk.transaction.domain.RawTransaction;
 
 public class TransactionSigner implements TransactionSignerInterface {
 
@@ -34,7 +34,7 @@ public TransactionSigner(int encryptType, CryptoKeyPair cryptoKeyPair) {
     }
 
     @Override
-    public byte[] sign(BcosTransaction bcosTransaction) {
+    public byte[] sign(RawTransaction rawTransaction) {
         // TODO Auto-generated method stub
         return null;
     }

src/main/java/org/fisco/bcos/sdk/transaction/core/interf/executor/TransactionBuilderInterface.java

@@ -15,7 +15,7 @@
 package org.fisco.bcos.sdk.transaction.core.interf.executor;
 
 import java.math.BigInteger;
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransaction;
+import org.fisco.bcos.sdk.transaction.domain.RawTransaction;
 
 /**
  * TransactionBuilderInterface @Description: TransactionBuilderInterface
@@ -25,7 +25,7 @@
  */
 public interface TransactionBuilderInterface {
 
-    public BcosTransaction createTransaction(
+    public RawTransaction createTransaction(
             BigInteger gasPrice,
             BigInteger gasLimit,
             String to,
@@ -41,7 +41,7 @@ public BcosTransaction createTransaction(
      * @param to, target address
      * @param data, encoded data
      * @param groupId
-     * @return BcosTransaction
+     * @return RawTransaction
      */
-    public BcosTransaction createTransaction(String to, String data, BigInteger groupId);
+    public RawTransaction createTransaction(String to, String data, BigInteger groupId);
 }

src/main/java/org/fisco/bcos/sdk/transaction/core/interf/executor/TransactionDecoderInterface.java

@@ -16,11 +16,11 @@
 
 import java.util.List;
 import java.util.Map;
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransaction;
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransactionReceipt;
 import org.fisco.bcos.sdk.transaction.domain.EventLog;
 import org.fisco.bcos.sdk.transaction.domain.EventResultEntity;
 import org.fisco.bcos.sdk.transaction.domain.InputAndOutputResult;
+import org.fisco.bcos.sdk.transaction.domain.RawTransaction;
+import org.fisco.bcos.sdk.transaction.domain.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.domain.TransactionResponse;
 
 /**
@@ -31,7 +31,7 @@
  */
 public interface TransactionDecoderInterface {
 
-    public BcosTransaction decodeRlp(String hex);
+    public RawTransaction decodeRlp(String hex);
 
     public String decodeCall(String abi, String output);
 
@@ -40,11 +40,10 @@ public interface TransactionDecoderInterface {
     public InputAndOutputResult decodeOutputReturnObject(
             String contractName, String input, String output);
 
-    public String decodeEventReturnJson(
-            String contractName, BcosTransactionReceipt transactionReceipt);
+    public String decodeEventReturnJson(String contractName, TransactionReceipt transactionReceipt);
 
     public Map<String, List<List<EventResultEntity>>> decodeEventReturnObject(
-            String contractName, BcosTransactionReceipt transactionReceipt);
+            String contractName, TransactionReceipt transactionReceipt);
 
     public String decodeEventReturnJson(String contractName, List<EventLog> logList);
 
@@ -60,5 +59,5 @@ public Map<String, List<List<EventResultEntity>>> decodeEventReturnObject(
     public String decodeReceiptMessage(String input);
 
     public TransactionResponse decodeTransactionReceipt(
-            String contractName, BcosTransactionReceipt transactionReceipt);
+            String contractName, TransactionReceipt transactionReceipt);
 }

src/main/java/org/fisco/bcos/sdk/transaction/core/interf/executor/TransactionEncoderInterface.java

@@ -14,8 +14,8 @@
  */
 package org.fisco.bcos.sdk.transaction.core.interf.executor;
 
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransaction;
 import org.fisco.bcos.sdk.crypto.signature.SignatureResult;
+import org.fisco.bcos.sdk.transaction.domain.RawTransaction;
 
 /**
  * TransactionEncoderInterface @Description: TransactionEncoderInterface
@@ -25,5 +25,5 @@
  */
 public interface TransactionEncoderInterface {
 
-    byte[] encode(BcosTransaction transaction, SignatureResult signature);
+    byte[] encode(RawTransaction transaction, SignatureResult signature);
 }

src/main/java/org/fisco/bcos/sdk/transaction/core/interf/executor/TransactionPusherInterface.java

@@ -16,8 +16,8 @@
 
 import java.util.concurrent.CompletableFuture;
 import org.fisco.bcos.sdk.client.RespCallback;
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransactionReceipt;
 import org.fisco.bcos.sdk.client.protocol.response.Call;
+import org.fisco.bcos.sdk.transaction.domain.TransactionReceipt;
 
 /**
  * TransactionPusher @Description: TransactionPusherInterface
@@ -29,11 +29,11 @@ public interface TransactionPusherInterface {
 
     public void pushOnly(String signedTransaction);
 
-    public BcosTransactionReceipt push(String signedTransaction);
+    public TransactionReceipt push(String signedTransaction);
 
-    public <T> BcosTransactionReceipt push(String signedTransaction, RespCallback<T> callback);
+    public <T> TransactionReceipt push(String signedTransaction, RespCallback<T> callback);
 
-    public CompletableFuture<BcosTransactionReceipt> pushAsync(String signedTransaction);
+    public CompletableFuture<TransactionReceipt> pushAsync(String signedTransaction);
 
     public Call push(String from, String to, String encodedFunction);
 }

src/main/java/org/fisco/bcos/sdk/transaction/core/interf/executor/TransactionSignerInterface.java

@@ -14,7 +14,7 @@
  */
 package org.fisco.bcos.sdk.transaction.core.interf.executor;
 
-import org.fisco.bcos.sdk.client.protocol.response.BcosTransaction;
+import org.fisco.bcos.sdk.transaction.domain.RawTransaction;
 
 /**
  * TransactionSignerInterface @Description: TransactionSignerInterface
@@ -24,5 +24,5 @@
  */
 public interface TransactionSignerInterface {
 
-    byte[] sign(BcosTransaction bcosTransaction);
+    byte[] sign(RawTransaction rawTransaction);
 }