cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

mobile: use bind.NewKeyedTransactor instead of duplicating (#20888)

Browse Source 
It's better to reuse the existing code to create a keyed transactor
than to rewrite the logic again.
This commit is contained in:
Marius van der Wijden 2020-04-03 14:11:04 +02:00 committed by GitHub
parent be9172a7ac
commit 98eab2dbe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mobile/bind.go
View File

@ -19,7 +19,6 @@
package geth
import (
"errors"
"math/big"
"strings"
@ -28,7 +27,6 @@ import (
"github.com/ethereum/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto"
)
// Signer is an interface defining the callback when a contract requires a
@ -82,28 +80,14 @@ func NewTransactOpts() *TransactOpts {
return new(TransactOpts)
}
// NewKeyedTransactor is a utility method to easily create a transaction signer
// NewKeyedTransactOpts is a utility method to easily create a transaction signer
// from a single private key.
func NewKeyedTransactOpts(keyJson []byte, passphrase string) (*TransactOpts, error) {
key, err := keystore.DecryptKey(keyJson, passphrase)
if err != nil {
return nil, err
}
keyAddr := crypto.PubkeyToAddress(key.PrivateKey.PublicKey)
opts := bind.TransactOpts{
From: keyAddr,
Signer: func(signer types.Signer, address common.Address, tx *types.Transaction) (*types.Transaction, error) {
if address != keyAddr {
return nil, errors.New("not authorized to sign this account")
}
signature, err := crypto.Sign(signer.Hash(tx).Bytes(), key.PrivateKey)
if err != nil {
return nil, err
}
return tx.WithSignature(signer, signature)
},
}
return &TransactOpts{opts}, nil
return &TransactOpts{*bind.NewKeyedTransactor(key.PrivateKey)}, nil
}
func (opts *TransactOpts) GetFrom() *Address { return &Address{opts.opts.From} }