aboutsummaryrefslogtreecommitdiffstats
path: root/xeth
diff options
context:
space:
mode:
Diffstat (limited to 'xeth')
-rw-r--r--xeth/xeth.go40
1 files changed, 20 insertions, 20 deletions
diff --git a/xeth/xeth.go b/xeth/xeth.go
index 06cd9dc1b..76ca4b9b4 100644
--- a/xeth/xeth.go
+++ b/xeth/xeth.go
@@ -815,22 +815,30 @@ func (self *XEth) ConfirmTransaction(tx string) bool {
return self.frontend.ConfirmTransaction(tx)
}
-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.Bytes())
+func (self *XEth) doSign(from common.Address, hash []byte, didUnlock bool) ([]byte, error) {
+ sig, err := self.backend.AccountManager().Sign(accounts.Account{Address: from.Bytes()}, hash)
if err == accounts.ErrLocked {
if didUnlock {
- return "", fmt.Errorf("signer account still locked after successful unlock")
+ return nil, fmt.Errorf("signer account still locked after successful unlock")
}
if !self.frontend.UnlockAccount(from.Bytes()) {
- return "", fmt.Errorf("could not unlock signer account")
+ return nil, fmt.Errorf("could not unlock signer account")
}
// retry signing, the account should now be unlocked.
- return self.Sign(fromStr, hashStr, true)
+ return self.doSign(from, hash, true)
} else if err != nil {
+ return nil, err
+ }
+ return sig, nil
+}
+
+func (self *XEth) Sign(fromStr, hashStr string, didUnlock bool) (string, error) {
+ var (
+ from = common.HexToAddress(fromStr)
+ hash = common.HexToHash(hashStr)
+ )
+ sig, err := self.doSign(from, hash.Bytes(), didUnlock)
+ if err != nil {
return "", err
}
return common.ToHex(sig), nil
@@ -928,17 +936,9 @@ func (self *XEth) Transact(fromStr, toStr, nonceStr, valueStr, gasStr, gasPriceS
}
func (self *XEth) sign(tx *types.Transaction, from common.Address, didUnlock bool) error {
- sig, err := self.backend.AccountManager().Sign(accounts.Account{Address: from.Bytes()}, tx.Hash().Bytes())
- if err == accounts.ErrLocked {
- if didUnlock {
- return fmt.Errorf("sender account still locked after successful unlock")
- }
- if !self.frontend.UnlockAccount(from.Bytes()) {
- return fmt.Errorf("could not unlock sender account")
- }
- // retry signing, the account should now be unlocked.
- return self.sign(tx, from, true)
- } else if err != nil {
+ hash := tx.Hash().Bytes()
+ sig, err := self.doSign(from, hash, didUnlock)
+ if err != nil {
return err
}
tx.SetSignatureValues(sig)