fix: use simple encrypted keysigner

primev · Jun 4, 2024 · 9e2970d · 9e2970d
1 parent 6185764
commit 9e2970d
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 114 deletions.
diff --git a/oracle/cmd/main.go b/oracle/cmd/main.go
@@ -398,7 +398,7 @@ func newLogger(lvl, logFmt, tags string, sink io.Writer) (*slog.Logger, error) {
 
 func setupKeySigner(c *cli.Context) (keysigner.KeySigner, error) {
 	if c.IsSet(optionKeystorePath.Name) {
-		return keysigner.NewKeystoreSigner(c.String(optionKeystorePath.Name), c.String(optionKeystorePassword.Name))
+		return keysigner.NewEncryptedSigner(c.String(optionKeystorePath.Name), c.String(optionKeystorePassword.Name))
 	}
-	return keysigner.NewPrivateKeySigner(c.String(optionPrivKeyFile.Name))
+	return keysigner.NewSigner(c.String(optionPrivKeyFile.Name))
 }
diff --git a/p2p/cmd/main.go b/p2p/cmd/main.go
@@ -381,7 +381,7 @@ func launchNodeWithConfig(c *cli.Context) error {
 
 func newKeySigner(c *cli.Context) (ks.KeySigner, error) {
 	if c.IsSet(optionKeystorePath.Name) {
-		return ks.NewKeystoreSigner(c.String(optionKeystorePath.Name), c.String(optionKeystorePassword.Name))
+		return ks.NewEncryptedSigner(c.String(optionKeystorePath.Name), c.String(optionKeystorePassword.Name))
 	}
-	return ks.NewPrivateKeySigner(c.String(optionPrivKeyFile.Name))
+	return ks.NewSigner(c.String(optionPrivKeyFile.Name))
 }
diff --git a/p2p/pkg/p2p/libp2p/libp2p.go b/p2p/pkg/p2p/libp2p/libp2p.go
@@ -76,7 +76,6 @@ func New(opts *Options) (*Service, error) {
 	if err != nil {
 		return nil, fmt.Errorf("failed to get priv key: %w", err)
 	}
-	defer opts.KeySigner.ZeroPrivateKey(privKey)
 
 	padded32BytePrivKey := util.PadKeyTo32Bytes(privKey.D)
 	libp2pKey, err := libp2pcrypto.UnmarshalSecp256k1PrivateKey(padded32BytePrivKey)

diff --git a/x/contracts/txmonitor/txmonitor.go b/x/contracts/txmonitor/txmonitor.go
@@ -22,6 +22,7 @@ var (
 
 var (
 	ErrTxnCancelled  = errors.New("transaction was cancelled")
+	ErrTxnFailed     = errors.New("transaction failed")
 	ErrMonitorClosed = errors.New("monitor was closed")
 )
 
@@ -222,7 +223,6 @@ func (m *Monitor) Sent(ctx context.Context, tx *types.Transaction) {
 		r := <-res
 		status := "success"
 		if r.Err != nil {
-			m.logger.Error("transaction failed", "err", r.Err)
 			status = fmt.Sprintf("failed: %v", r.Err)
 		}
 		if err := m.saver.Update(context.Background(), tx.Hash(), status); err != nil {
@@ -353,13 +353,27 @@ func (m *Monitor) check(ctx context.Context, newBlock uint64, lastNonce uint64)
 					m.notify(nonce, txHashes[start+i], Result{nil, ErrTxnCancelled})
 					continue
 				}
+				m.logger.Error("failed to get receipt", "error", r.Err, "txHash", txHashes[start+i])
+				continue
+			}
+			if r.Receipt.Status != types.ReceiptStatusSuccessful {
 				tt, err := m.helper.TraceTransaction(ctx, txHashes[start+i])
 				if err != nil {
-					m.logger.Error("retrieving transaction trace failed", "error", err)
+					m.logger.Error(
+						"retrieving transaction trace failed",
+						"error", err,
+						"txHash", txHashes[start+i],
+					)
+				} else {
+					m.logger.Error("transaction failed",
+						"transaction_trace", tt,
+						"txHash", txHashes[start+i],
+					)
 				}
-				m.logger.Error("failed to get receipt", "error", r.Err, "transaction_trace", tt)
+				m.notify(nonce, txHashes[start+i], Result{r.Receipt, ErrTxnFailed})
 				continue
 			}
+
 			m.notify(nonce, txHashes[start+i], Result{r.Receipt, nil})
 		}
 	}

diff --git a/x/keysigner/keysigner.go b/x/keysigner/keysigner.go
@@ -18,7 +18,6 @@ type KeySigner interface {
 	SignTx(tx *types.Transaction, chainID *big.Int) (*types.Transaction, error)
 	GetAddress() common.Address
 	GetPrivateKey() (*ecdsa.PrivateKey, error)
-	ZeroPrivateKey(key *ecdsa.PrivateKey)
 	GetAuth(chainID *big.Int) (*bind.TransactOpts, error)
 	GetAuthWithCtx(ctx context.Context, chainID *big.Int) (*bind.TransactOpts, error)
 }
diff --git a/x/keysigner/keystoresigner.go b/x/keysigner/keystoresigner.go
diff --git a/x/keysigner/privatekeysigner.go b/x/keysigner/privatekeysigner.go
@@ -16,12 +16,12 @@ import (
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
-type PrivateKeySigner struct {
+type Signer struct {
 	path    string
 	privKey *ecdsa.PrivateKey
 }
 
-func NewPrivateKeySigner(path string) (*PrivateKeySigner, error) {
+func NewSigner(path string) (*Signer, error) {
 	privKeyFile, err := resolveFilePath(path)
 	if err != nil {
 		return nil, fmt.Errorf("failed to get private key file path: %w", err)
@@ -36,33 +36,50 @@ func NewPrivateKeySigner(path string) (*PrivateKeySigner, error) {
 		return nil, fmt.Errorf("failed to load private key from file '%s': %w", privKeyFile, err)
 	}
 
-	return &PrivateKeySigner{
+	return &Signer{
 		path:    privKeyFile,
 		privKey: privKey,
 	}, nil
 }
 
-func (pks *PrivateKeySigner) SignHash(hash []byte) ([]byte, error) {
+func NewEncryptedSigner(path, password string) (*Signer, error) {
+	privKeyFile, err := resolveFilePath(path)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get private key file path: %w", err)
+	}
+
+	privKey, err := extractPrivateKey(privKeyFile, password)
+	if err != nil {
+		return nil, fmt.Errorf("failed to extract private key: %w", err)
+	}
+
+	return &Signer{
+		path:    privKeyFile,
+		privKey: privKey,
+	}, nil
+}
+
+func (pks *Signer) SignHash(hash []byte) ([]byte, error) {
 	return crypto.Sign(hash, pks.privKey)
 }
 
-func (pks *PrivateKeySigner) SignTx(tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) {
+func (pks *Signer) SignTx(tx *types.Transaction, chainID *big.Int) (*types.Transaction, error) {
 	return types.SignTx(tx, types.NewLondonSigner(chainID), pks.privKey)
 }
 
-func (pks *PrivateKeySigner) GetAddress() common.Address {
+func (pks *Signer) GetAddress() common.Address {
 	return crypto.PubkeyToAddress(pks.privKey.PublicKey)
 }
 
-func (pks *PrivateKeySigner) GetPrivateKey() (*ecdsa.PrivateKey, error) {
+func (pks *Signer) GetPrivateKey() (*ecdsa.PrivateKey, error) {
 	return pks.privKey, nil
 }
 
-func (pks *PrivateKeySigner) GetAuth(chainID *big.Int) (*bind.TransactOpts, error) {
+func (pks *Signer) GetAuth(chainID *big.Int) (*bind.TransactOpts, error) {
 	return bind.NewKeyedTransactorWithChainID(pks.privKey, chainID)
 }
 
-func (pks *PrivateKeySigner) GetAuthWithCtx(ctx context.Context, chainID *big.Int) (*bind.TransactOpts, error) {
+func (pks *Signer) GetAuthWithCtx(ctx context.Context, chainID *big.Int) (*bind.TransactOpts, error) {
 	opts, err := pks.GetAuth(chainID)
 	if err != nil {
 		return nil, err
@@ -71,11 +88,7 @@ func (pks *PrivateKeySigner) GetAuthWithCtx(ctx context.Context, chainID *big.In
 	return opts, nil
 }
 
-// ZeroPrivateKey does nothing because the private key for PKS persists in memory
-// and should not be deleted.
-func (pks *PrivateKeySigner) ZeroPrivateKey(key *ecdsa.PrivateKey) {}
-
-func (pks *PrivateKeySigner) String() string {
+func (pks *Signer) String() string {
 	return pks.path
 }