Merge pull request #430 from morebtcg/release-3.1.0

Add dag flag

Author: morebtcg

sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java

@@ -103,9 +103,14 @@ static Client build(ConfigOption configOption) throws JniException {
      * @return the groupId
      */
     String getChainId();
+
     /** */
     ConfigOption getConfigOption();
 
+    public boolean getDAG();
+
+    public void setDAG(boolean dag);
+
     // ------------------------- rpc interface begin ------------------------------------------
 
     /**
@@ -555,6 +560,7 @@ void getTransactionReceiptAsync(
     GroupPeers getGroupPeers();
 
     void getGroupPeersAsync(RespCallback<GroupPeers> callback);
+
     /**
      * Peer operation: async get connected peers
      *

sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java

@@ -53,6 +53,10 @@ public class ClientImpl implements Client {
     private Boolean smCrypto;
     // ------------basic group info --------------
 
+    // ------------ runtime info -----------------
+    private boolean dag = false;
+    // ------------ runtime info -----------------
+
     private long blockNumber = 0;
 
     private BcosGroupInfo.GroupInfo groupInfo;
@@ -157,6 +161,16 @@ public Boolean getSmCrypto() {
         return this.smCrypto;
     }
 
+    @Override
+    public boolean getDAG() {
+        return this.dag;
+    }
+
+    @Override
+    public void setDAG(boolean dag) {
+        this.dag = dag;
+    }
+
     @Override
     public CryptoSuite getCryptoSuite() {
         return this.cryptoSuite;

sdk-service/src/main/java/org/fisco/bcos/sdk/client/protocol/model/tars/Transaction.java

@@ -13,7 +13,9 @@
 
 @TarsStruct
 public class Transaction {
+    public static final int EVM_ABI_CODEC = 0x1;
     public static final int LIQUID_SCALE_CODEC = 0x2;
+    public static final int DAG = 0x4;
     public static final int LIQUID_CREATE = 0x8;
 
     @TarsStructProperty(order = 1, isRequire = false)

sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/Contract.java

@@ -22,6 +22,7 @@
 import java.util.*;
 import java.util.stream.Collectors;
 import org.fisco.bcos.sdk.client.Client;
+import org.fisco.bcos.sdk.client.protocol.model.tars.Transaction;
 import org.fisco.bcos.sdk.client.protocol.response.Call;
 import org.fisco.bcos.sdk.codec.ABICodec;
 import org.fisco.bcos.sdk.codec.ABICodecException;
@@ -204,6 +205,24 @@ private static <T extends Contract> T create(
         return contract;
     }
 
+    private int generateTransactionAttribute(String funcName) {
+        int attribute = 0;
+        if (client.isWASM()) {
+            attribute = LIQUID_SCALE_CODEC;
+            if (funcName == FUNC_DEPLOY) {
+                attribute |= LIQUID_CREATE;
+            }
+        } else {
+            attribute |= Transaction.EVM_ABI_CODEC;
+        }
+
+        if (client.getDAG()) {
+            attribute |= Transaction.DAG;
+        }
+
+        return attribute;
+    }
+
     public String getContractAddress() {
         return this.contractAddress;
     }
@@ -292,13 +311,8 @@ protected List<Type> executeCallWithMultipleValueReturn(Function function)
 
     protected void asyncExecuteTransaction(
             byte[] data, String funName, TransactionCallback callback) {
-        int txAttribute = 0;
-        if (client.isWASM()) {
-            txAttribute = LIQUID_SCALE_CODEC;
-            if (funName == FUNC_DEPLOY) {
-                txAttribute |= LIQUID_CREATE;
-            }
-        }
+        int txAttribute = generateTransactionAttribute(funName);
+
         this.transactionProcessor.sendTransactionAsync(
                 this.contractAddress, data, this.credential, txAttribute, callback);
     }
@@ -313,13 +327,8 @@ protected TransactionReceipt executeTransaction(Function function) {
     }
 
     protected TransactionReceipt executeTransaction(byte[] data, String functionName) {
-        int txAttribute = 0;
-        if (client.isWASM()) {
-            txAttribute = LIQUID_SCALE_CODEC;
-            if (functionName == FUNC_DEPLOY) {
-                txAttribute |= LIQUID_CREATE;
-            }
-        }
+        int txAttribute = generateTransactionAttribute(functionName);
+
         return this.transactionProcessor.sendTransactionAndGetReceipt(
                 this.contractAddress, data, this.credential, txAttribute);
     }
@@ -348,13 +357,8 @@ public TransactionReceipt.Logs getLog() {
     }
 
     protected String createSignedTransaction(Function function) {
-        int txAttribute = 0;
-        if (client.isWASM()) {
-            txAttribute = LIQUID_SCALE_CODEC;
-            if (function.getName() == FUNC_DEPLOY) {
-                txAttribute |= LIQUID_CREATE;
-            }
-        }
+        int txAttribute = generateTransactionAttribute(function.getName());
+
         return this.createSignedTransaction(
                 this.contractAddress, this.functionEncoder.encode(function), txAttribute);
     }