From a487396b764c8dac409f9ee1ef32c29c4cefb7d9 Mon Sep 17 00:00:00 2001
From: "Daniel A. Nagy" <nagy.da@gmail.com>
Date: Fri, 8 May 2015 16:36:13 +0200
Subject: [PATCH] eth_sign added to API for signing arbitrary data.

---
 rpc/api.go   |  2 +-
 xeth/xeth.go | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/rpc/api.go b/rpc/api.go
index 28ba41c86e..7fab589f2d 100644
--- a/rpc/api.go
+++ b/rpc/api.go
@@ -163,7 +163,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
 		if err := json.Unmarshal(req.Params, &args); err != nil {
 			return err
 		}
-		v, err := api.xeth.Sign(args.From, args.Data)
+		v, err := api.xeth().Sign(args.From, args.Data, false)
 		if err != nil {
 			return err
 		}
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 2ca0e80d71..dc2d4f06f4 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -813,25 +813,25 @@ func (self *XEth) ConfirmTransaction(tx string) bool {
 	return self.frontend.ConfirmTransaction(tx)
 }
 
-func (self *XEth) Sign(fromStr, hashStr string) (string, error) {
+func (self *XEth) Sign(fromStr, hashStr string, didUnlock bool) (string, error) {
 	var (
 		from = common.HexToAddress(fromStr)
 		hash = common.HexToHash(hashStr)
 	)
-	sig, err := self.backend.AccountManager().Sign(accounts.Account{Address: from.Bytes()}, hash)
+	sig, err := self.backend.AccountManager().Sign(accounts.Account{Address: from.Bytes()}, hash.Bytes())
 	if err == accounts.ErrLocked {
 		if didUnlock {
-			return fmt.Errorf("signer account still locked after successful unlock")
+			return "", fmt.Errorf("signer account still locked after successful unlock")
 		}
 		if !self.frontend.UnlockAccount(from.Bytes()) {
-			return fmt.Errorf("could not unlock signer account")
+			return "", fmt.Errorf("could not unlock signer account")
 		}
 		// retry signing, the account should now be unlocked.
-		return self.Sign(fromStr, hashStr)
+		return self.Sign(fromStr, hashStr, true)
 	} else if err != nil {
-		return err
+		return "", err
 	}
-	return common.toHex(sig)
+	return common.ToHex(sig), nil
 }
 
 func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceStr, codeStr string) (string, error) {