From 68147971734ea1f89f7899b1ca595c2c57e67079 Mon Sep 17 00:00:00 2001 From: gary rong Date: Thu, 4 Jul 2019 03:54:59 +0800 Subject: accounts, cmd, contracts, les: integrate clef for transaction signing (#19783) * accounts, cmd, contracts, les: integrate clef for transaction signing * accounts, cmd/checkpoint-admin, signer/core: minor fixups --- accounts/external/backend.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'accounts/external/backend.go') diff --git a/accounts/external/backend.go b/accounts/external/backend.go index 23037f52d..705c98722 100644 --- a/accounts/external/backend.go +++ b/accounts/external/backend.go @@ -182,18 +182,21 @@ func (api *ExternalSigner) SignText(account accounts.Account, text []byte) ([]by func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) { res := ethapi.SignTransactionResult{} - to := common.NewMixedcaseAddress(*tx.To()) data := hexutil.Bytes(tx.Data()) + var to *common.MixedcaseAddress + if tx.To() != nil { + t := common.NewMixedcaseAddress(*tx.To()) + to = &t + } args := &core.SendTxArgs{ Data: &data, Nonce: hexutil.Uint64(tx.Nonce()), Value: hexutil.Big(*tx.Value()), Gas: hexutil.Uint64(tx.Gas()), GasPrice: hexutil.Big(*tx.GasPrice()), - To: &to, + To: to, From: common.NewMixedcaseAddress(account.Address), } - if err := api.client.Call(&res, "account_signTransaction", args); err != nil { return nil, err } -- cgit v1.2.3