[api] fix revert message in eth_call (#3922)

iotexproject · Aug 16, 2023 · 55b5a58 · 55b5a58
1 parent 26297f1
commit 55b5a58
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/api/web3server.go b/api/web3server.go
@@ -21,6 +21,8 @@ import (
 	"github.com/tidwall/gjson"
 	"go.opentelemetry.io/otel/attribute"
 	"go.uber.org/zap"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 
 	"github.com/iotexproject/iotex-core/action"
 	rewardingabi "github.com/iotexproject/iotex-core/action/protocol/rewarding/ethabi"
@@ -387,10 +389,13 @@ func (svr *web3Handler) call(in *gjson.Result) (interface{}, error) {
 		return "0x" + ret, nil
 	}
 	exec, _ := action.NewExecution(to, 0, value, gasLimit, big.NewInt(0), data)
-	ret, _, err := svr.coreService.ReadContract(context.Background(), callerAddr, exec)
+	ret, receipt, err := svr.coreService.ReadContract(context.Background(), callerAddr, exec)
 	if err != nil {
 		return nil, err
 	}
+	if receipt != nil && len(receipt.GetExecutionRevertMsg()) > 0 {
+		return "0x" + ret, status.Error(codes.InvalidArgument, "execution reverted: "+receipt.GetExecutionRevertMsg())
+	}
 	return "0x" + ret, nil
 }
 

diff --git a/api/web3server_marshal.go b/api/web3server_marshal.go
@@ -29,8 +29,9 @@ type (
 	}
 
 	errMessage struct {
-		Code    int    `json:"code"`
-		Message string `json:"message"`
+		Code    int         `json:"code"`
+		Message string      `json:"message"`
+		Data    interface{} `json:"data,omitempty"`
 	}
 
 	streamResponse struct {
@@ -124,6 +125,7 @@ func (obj *web3Response) MarshalJSON() ([]byte, error) {
 		Error: errMessage{
 			Code:    errCode,
 			Message: errMsg,
+			Data:    obj.result,
 		},
 	})
 }