Merge branch 'feature/contract' of github.com:ChainSQL/java-chainsql-api into feature/contract

cruanEzhou · cruanEzhou · commit 0b390e6e9b4f · 2020-04-28T09:51:53.000+08:00
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java b/chainsql/src/main/java/com/peersafe/chainsql/core/Chainsql.java
@@ -408,18 +408,16 @@ JSONObject prepareSigned() {
 			}
 			mTxJson.put("Account",this.connection.address);
 
-			if(mTxJson.getInt("OpType") == Constant.opType.get("t_grant") &&
+			if(mTxJson.has("OpType") && mTxJson.getInt("OpType") == Constant.opType.get("t_grant") &&
 					!this.connection.address.equals(connection.scope)){
 				mTxJson.put("Owner",  connection.scope);
 			}
 
-
 			if (this.connection.userCert != null) {
 				String sCert = Util.toHexString(this.connection.userCert);
 				mTxJson.put("Certificate", sCert);
 			}
 
-
 			//for cross chain
 			if(crossChainArgs != null){
 				mTxJson.put("TxnLgrSeq", crossChainArgs.txnLedgerSeq);
diff --git a/chainsql/src/main/java/com/peersafe/chainsql/core/Table.java b/chainsql/src/main/java/com/peersafe/chainsql/core/Table.java
@@ -285,6 +285,11 @@ private JSONObject prepareSQLStatement() {
 		
 		txjson.put("Account", this.connection.address);
 
+		if (this.connection.userCert != null) {
+			String sCert = Util.toHexString(this.connection.userCert);
+			txjson.put("Certificate", sCert);
+		}
+
 		if(this.autoFillField != null){
 			txjson.put("AutoFillField", Util.toHexString(this.autoFillField));
 		}

Original file line number	Diff line number	Diff line change
`@@ -408,18 +408,16 @@ JSONObject prepareSigned() {`
`408`	`408`	`}`
`409`	`409`	`mTxJson.put("Account",this.connection.address);`
`410`	`410`
`411`		`- if(mTxJson.getInt("OpType") == Constant.opType.get("t_grant") &&`
	`411`	`+ if(mTxJson.has("OpType") && mTxJson.getInt("OpType") == Constant.opType.get("t_grant") &&`
`412`	`412`	`!this.connection.address.equals(connection.scope)){`
`413`	`413`	`mTxJson.put("Owner", connection.scope);`
`414`	`414`	`}`
`415`	`415`
`416`		`-`
`417`	`416`	`if (this.connection.userCert != null) {`
`418`	`417`	`String sCert = Util.toHexString(this.connection.userCert);`
`419`	`418`	`mTxJson.put("Certificate", sCert);`
`420`	`419`	`}`
`421`	`420`
`422`		`-`
`423`	`421`	`//for cross chain`
`424`	`422`	`if(crossChainArgs != null){`
`425`	`423`	`mTxJson.put("TxnLgrSeq", crossChainArgs.txnLedgerSeq);`