Commit a487396b authored by Daniel A. Nagy's avatar Daniel A. Nagy

eth_sign added to API for signing arbitrary data.

parent e94aa421
...@@ -163,7 +163,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err ...@@ -163,7 +163,7 @@ func (api *EthereumApi) GetRequestReply(req *RpcRequest, reply *interface{}) err
if err := json.Unmarshal(req.Params, &args); err != nil { if err := json.Unmarshal(req.Params, &args); err != nil {
return err return err
} }
v, err := api.xeth.Sign(args.From, args.Data) v, err := api.xeth().Sign(args.From, args.Data, false)
if err != nil { if err != nil {
return err return err
} }
......
...@@ -813,25 +813,25 @@ func (self *XEth) ConfirmTransaction(tx string) bool { ...@@ -813,25 +813,25 @@ func (self *XEth) ConfirmTransaction(tx string) bool {
return self.frontend.ConfirmTransaction(tx) 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 ( var (
from = common.HexToAddress(fromStr) from = common.HexToAddress(fromStr)
hash = common.HexToHash(hashStr) 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 err == accounts.ErrLocked {
if didUnlock { 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()) { 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. // retry signing, the account should now be unlocked.
return self.Sign(fromStr, hashStr) return self.Sign(fromStr, hashStr, true)
} else if err != nil { } 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) { func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceStr, codeStr string) (string, error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment