|
|
@@ -27,7 +27,6 @@ import (
|
|
|
"github.com/ethereum/go-ethereum/common/hexutil"
|
|
|
"github.com/ethereum/go-ethereum/core/types"
|
|
|
"github.com/ethereum/go-ethereum/event"
|
|
|
- "github.com/ethereum/go-ethereum/internal/ethapi"
|
|
|
"github.com/ethereum/go-ethereum/log"
|
|
|
"github.com/ethereum/go-ethereum/rpc"
|
|
|
"github.com/ethereum/go-ethereum/signer/core"
|
|
|
@@ -191,8 +190,13 @@ func (api *ExternalSigner) SignText(account accounts.Account, text []byte) ([]by
|
|
|
return signature, nil
|
|
|
}
|
|
|
|
|
|
+// signTransactionResult represents the signinig result returned by clef.
|
|
|
+type signTransactionResult struct {
|
|
|
+ Raw hexutil.Bytes `json:"raw"`
|
|
|
+ Tx *types.Transaction `json:"tx"`
|
|
|
+}
|
|
|
+
|
|
|
func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) {
|
|
|
- res := ethapi.SignTransactionResult{}
|
|
|
data := hexutil.Bytes(tx.Data())
|
|
|
var to *common.MixedcaseAddress
|
|
|
if tx.To() != nil {
|
|
|
@@ -208,6 +212,7 @@ func (api *ExternalSigner) SignTx(account accounts.Account, tx *types.Transactio
|
|
|
To: to,
|
|
|
From: common.NewMixedcaseAddress(account.Address),
|
|
|
}
|
|
|
+ var res signTransactionResult
|
|
|
if err := api.client.Call(&res, "account_signTransaction", args); err != nil {
|
|
|
return nil, err
|
|
|
}
|