diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 273aeee31e..e51f0bd8ea 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -44,7 +44,7 @@ func NewTransactor(keyin io.Reader, passphrase string) (*TransactOpts, error) { return NewKeyedTransactor(key.PrivateKey), nil } -// NewKeystoreTransactor is a utility method to easily create a transaction signer from +// NewKeyStoreTransactor is a utility method to easily create a transaction signer from // an decrypted key from a keystore func NewKeyStoreTransactor(keystore *keystore.KeyStore, account accounts.Account) (*TransactOpts, error) { return &TransactOpts{ @@ -83,14 +83,14 @@ func NewKeyedTransactor(key *ecdsa.PrivateKey) *TransactOpts { // NewClefTransactor is a utility method to easily create a transaction signer // with a clef backend. -func NewClefTransactor(clefSigner *external.ExternalSigner, account accounts.Account) *TransactOpts { +func NewClefTransactor(clef *external.ExternalSigner, account accounts.Account) *TransactOpts { return &TransactOpts{ From: account.Address, Signer: func(signer types.Signer, address common.Address, transaction *types.Transaction) (*types.Transaction, error) { if address != account.Address { return nil, errors.New("not authorized to sign this account") } - return clefSigner.SignTx(account, transaction, nil) // ChainId is never used here. + return clef.SignTx(account, transaction, nil) // Clef enforces its own chain id }, } } diff --git a/cmd/checkpoint-admin/common.go b/cmd/checkpoint-admin/common.go index 9a06d99220..107cd1de02 100644 --- a/cmd/checkpoint-admin/common.go +++ b/cmd/checkpoint-admin/common.go @@ -112,10 +112,9 @@ func newContract(client *rpc.Client) (common.Address, *checkpointoracle.Checkpoi // newClefSigner sets up a clef backend and returns a clef transaction signer. func newClefSigner(ctx *cli.Context) *bind.TransactOpts { - clefSigner, err := external.NewExternalSigner(ctx.GlobalString(clefURLFlag.Name)) + clef, err := external.NewExternalSigner(ctx.String(clefURLFlag.Name)) if err != nil { utils.Fatalf("Failed to create clef signer %v", err) } - transactor := bind.NewClefTransactor(clefSigner, accounts.Account{Address: common.HexToAddress(ctx.String(signerFlag.Name))}) - return transactor + return bind.NewClefTransactor(clef, accounts.Account{Address: common.HexToAddress(ctx.String(signerFlag.Name))}) } diff --git a/cmd/checkpoint-admin/exec.go b/cmd/checkpoint-admin/exec.go index a31729681a..1ce975f494 100644 --- a/cmd/checkpoint-admin/exec.go +++ b/cmd/checkpoint-admin/exec.go @@ -58,10 +58,10 @@ var commandSign = cli.Command{ Flags: []cli.Flag{ nodeURLFlag, clefURLFlag, + signerFlag, indexFlag, hashFlag, oracleFlag, - signerFlag, }, Action: utils.MigrateFlags(sign), } @@ -71,10 +71,10 @@ var commandPublish = cli.Command{ Usage: "Publish a checkpoint into the oracle", Flags: []cli.Flag{ nodeURLFlag, - indexFlag, - signaturesFlag, clefURLFlag, signerFlag, + indexFlag, + signaturesFlag, }, Action: utils.MigrateFlags(publish), } @@ -108,6 +108,7 @@ func deploy(ctx *cli.Context) error { transactor, client := newClefSigner(ctx), newClient(ctx) // Deploy the checkpoint oracle + fmt.Println("Sending deploy request to Clef...") oracle, tx, _, err := contract.DeployCheckpointOracle(transactor, client, addrs, big.NewInt(int64(params.CheckpointFrequency)), big.NewInt(int64(params.CheckpointProcessConfirmations)), big.NewInt(int64(needed))) if err != nil { @@ -208,12 +209,14 @@ func sign(ctx *cli.Context) error { return err } } - clef := newRPCClient(ctx.GlobalString(clefURLFlag.Name)) + clef := newRPCClient(ctx.String(clefURLFlag.Name)) p := make(map[string]string) buf := make([]byte, 8) binary.BigEndian.PutUint64(buf, cindex) p["address"] = address.Hex() p["message"] = hexutil.Encode(append(buf, chash.Bytes()...)) + + fmt.Println("Sending signing request to Clef...") if err := clef.Call(&signature, "account_signData", accounts.MimetypeDataWithValidator, signer, p); err != nil { utils.Fatalf("Failed to sign checkpoint, err %v", err) } @@ -298,6 +301,7 @@ func publish(ctx *cli.Context) error { fmt.Printf("Sentry number => %d\nSentry hash => %s\n", recent.Number, recent.Hash().Hex()) // Publish the checkpoint into the oracle + fmt.Println("Sending publish request to Clef...") tx, err := oracle.RegisterCheckpoint(newClefSigner(ctx), checkpoint.SectionIndex, checkpoint.Hash().Bytes(), recent.Number, recent.Hash(), sigs) if err != nil { utils.Fatalf("Register contract failed %v", err) diff --git a/cmd/checkpoint-admin/main.go b/cmd/checkpoint-admin/main.go index 046c6aebf7..1fdec60a0c 100644 --- a/cmd/checkpoint-admin/main.go +++ b/cmd/checkpoint-admin/main.go @@ -60,7 +60,6 @@ func init() { app.Flags = []cli.Flag{ oracleFlag, nodeURLFlag, - clefURLFlag, } cli.CommandHelpTemplate = commandHelperTemplate } diff --git a/signer/core/cliui.go b/signer/core/cliui.go index 46a13f1e4c..381c40be3b 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -171,7 +171,7 @@ func (ui *CommandlineUI) ApproveSignData(request *SignDataRequest) (SignDataResp fmt.Printf("Account: %s\n", request.Address.String()) fmt.Printf("messages:\n") for _, nvt := range request.Messages { - fmt.Printf("%v\n", nvt.Pprint(1)) + fmt.Printf("\u00a0\u00a0%v\n", strings.TrimSpace(nvt.Pprint(1))) } fmt.Printf("raw data: \n%q\n", request.Rawdata) fmt.Printf("data hash: %v\n", request.Hash)