Merge remote-tracking branch 'origin/v2.3.3_qc' into v2.3.1_qc_empty_getstate

# Conflicts: # sandbox/tx_handler.go

Merge remote-tracking branch 'origin/v2.3.3_qc' into v2.3.1_qc_empty_getstate
# Conflicts: # sandbox/tx_handler.go
4e5854db · gh lu · 1182affc · c21c7bce · 4e5854db · 4e5854db
Commit 4e5854db authored Feb 09, 2023 by gh lu
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 10 deletions

sandbox/tx_handler.go sandbox/tx_handler.go +1 -1

sdk/response.go sdk/response.go +2 -8

sdk/sdk.go sdk/sdk.go +1 -1

No files found.
--- a/sandbox/tx_handler.go
+++ b/sandbox/tx_handler.go
@@ -200,7 +200,7 @@ func (h *TxHandler) handleTxRequest(msg *protogo.DockerVMMessage) error {
 		// - rset: rset can not be dropped for fail
 		//  - from simContext: simContext already has such keys, value is not important
 		//  - from wset: simContext don't have such keys, but it will not cause conflict for applying simContext,
-		//               because even if other txs are written first, the read value is the same as cached in wset
+		//               because even if other txs are written first, the read set here will eventually be dropped
 		txResponse.Code = protogo.DockerVMCode_FAIL
 		txResponse.Result = []byte(response.Message)
 		txResponse.Message = "Fail"

--- a/sdk/response.go
+++ b/sdk/response.go
@@ -20,6 +20,8 @@ const (
 	ERROR = 1
 )

+var SuccessResponse = protogo.Response{Status: OK, Payload: []byte("ok")}
+
 // Success ...
 func Success(payload []byte) protogo.Response {
 	return protogo.Response{
@@ -28,14 +30,6 @@ func Success(payload []byte) protogo.Response {
 	}
 }

-// Success normal
-func SuccessNormal() protogo.Response {
-	return protogo.Response{
-		Status:  OK,
-		Payload: []byte("success"),
-	}
-}
-
 // Error ...
 func Error(msg string) protogo.Response {
 	return protogo.Response{

--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -646,7 +646,7 @@ func (s *SDK) CallContract(contractName, method string, args map[string][]byte)
 		return protogo.Response{
 			Status:  ERROR,
 			Message: result.SysCallMessage.Message,
-			Payload: nil,
+			Payload: result.SysCallMessage.Payload[KeyCallContractResp],
 		}
 	}