Merge branch 'release/0.9.24'

2 files changed, 50 insertions, 43 deletions

diff --git a/rpc/api.go b/rpc/api.go
index b6f6ac3f9..6b37acb03 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -6,6 +6,7 @@ import (
 	"math/big"
 
 	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/logger"
 	"github.com/ethereum/go-ethereum/logger/glog"
@@ -158,16 +159,16 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		v := api.xethAtStateNum(args.BlockNumber).CodeAtBytes(args.Address)
 		*reply = newHexData(v)
 
-	// case "eth_sign":
-	// 	args := new(NewSigArgs)
-	// 	if err := json.Unmarshal(req.Params, &args); err != nil {
-	// 		return err
-	// 	}
-	// 	v, err := api.xeth().Sign(args.From, args.Data, false)
-	// 	if err != nil {
-	// 		return err
-	// 	}
-	// 	*reply = v
+	case "eth_sign":
+		args := new(NewSigArgs)
+		if err := json.Unmarshal(req.Params, &args); err != nil {
+			return err
+		}
+		v, err := api.xeth().Sign(args.From, args.Data, false)
+		if err != nil {
+			return err
+		}
+		*reply = v
 
 	case "eth_sendTransaction", "eth_transact":
 		args := new(NewTxArgs)
@@ -344,7 +345,6 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		return NewNotImplementedError(req.Method)
 
 	case "eth_compileSolidity":
-
 		solc, _ := api.xeth().Solc()
 		if solc == nil {
 			return NewNotAvailableError(req.Method, "solc (solidity compiler) not found")
@@ -562,6 +562,13 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 
 	case "eth_hashrate":
 		*reply = newHexNum(api.xeth().HashRate())
+	case "ext_disasm":
+		args := new(SourceArgs)
+		if err := json.Unmarshal(req.Params, &args); err != nil {
+			return err
+		}
+
+		*reply = vm.Disasm(common.FromHex(args.Source))
 
 	// case "eth_register":
 	// 	// Placeholder for actual type
diff --git a/rpc/args.go b/rpc/args.go
index 27824f12c..686872a59 100644
--- a/rpc/args.go
+++ b/rpc/args.go
@@ -166,45 +166,45 @@ type NewTxArgs struct {
 	BlockNumber int64
 }
 
-// type NewSigArgs struct {
-// 	From string
-// 	Data string
-// }
+type NewSigArgs struct {
+	From string
+	Data string
+}
 
-// func (args *NewSigArgs) UnmarshalJSON(b []byte) (err error) {
-// 	var obj []json.RawMessage
-// 	var ext struct {
-// 		From string
-// 		Data string
-// 	}
+func (args *NewSigArgs) UnmarshalJSON(b []byte) (err error) {
+	var obj []json.RawMessage
+	var ext struct {
+		From string
+		Data string
+	}
 
-// 	// Decode byte slice to array of RawMessages
-// 	if err := json.Unmarshal(b, &obj); err != nil {
-// 		return NewDecodeParamError(err.Error())
-// 	}
+	// Decode byte slice to array of RawMessages
+	if err := json.Unmarshal(b, &obj); err != nil {
+		return NewDecodeParamError(err.Error())
+	}
 
-// 	// Check for sufficient params
-// 	if len(obj) < 1 {
-// 		return NewInsufficientParamsError(len(obj), 1)
-// 	}
+	// Check for sufficient params
+	if len(obj) < 1 {
+		return NewInsufficientParamsError(len(obj), 1)
+	}
 
-// 	// Decode 0th RawMessage to temporary struct
-// 	if err := json.Unmarshal(obj[0], &ext); err != nil {
-// 		return NewDecodeParamError(err.Error())
-// 	}
+	// Decode 0th RawMessage to temporary struct
+	if err := json.Unmarshal(obj[0], &ext); err != nil {
+		return NewDecodeParamError(err.Error())
+	}
 
-// 	if len(ext.From) == 0 {
-// 		return NewValidationError("from", "is required")
-// 	}
+	if len(ext.From) == 0 {
+		return NewValidationError("from", "is required")
+	}
 
-// 	if len(ext.Data) == 0 {
-// 		return NewValidationError("data", "is required")
-// 	}
+	if len(ext.Data) == 0 {
+		return NewValidationError("data", "is required")
+	}
 
-// 	args.From = ext.From
-// 	args.Data = ext.Data
-// 	return nil
-// }
+	args.From = ext.From
+	args.Data = ext.Data
+	return nil
+}
 
 func (args *NewTxArgs) UnmarshalJSON(b []byte) (err error) {
 	var obj []json.RawMessage