we were printing tx hash of half-built transactions, which was pointl…

…ess (#114)

better tx hash log msg

removed double logging

remove main.go that was committed by mistake

made WrapError public so we can reuse it in the codebase

print txhash of failed txs for easier debugging

removed redundant if statement

chainio/clients/avsregistry/writer.go

@@ -13,6 +13,7 @@ import (
 	"github.com/Layr-Labs/eigensdk-go/crypto/bls"
 	"github.com/Layr-Labs/eigensdk-go/logging"
 	"github.com/Layr-Labs/eigensdk-go/types"
+	sdkutils "github.com/Layr-Labs/eigensdk-go/utils"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	gethcommon "github.com/ethereum/go-ethereum/common"
 	gethtypes "github.com/ethereum/go-ethereum/core/types"
@@ -255,8 +256,7 @@ func (w *AvsRegistryChainWriter) RegisterOperatorInQuorumWithAVSRegistryCoordina
 	if err != nil {
 		return nil, errors.New("failed to send tx with err: " + err.Error())
 	}
-	w.logger.Infof("tx hash: %s", tx.Hash().String())
-	w.logger.Info("registered operator with the AVS's registry coordinator")
+	w.logger.Info("succesfully registered operator with AVS registry coordinator", "tx hash", receipt.TxHash.String())
 	return receipt, nil
 }
 
@@ -265,7 +265,7 @@ func (w *AvsRegistryChainWriter) UpdateStakesOfEntireOperatorSetForQuorums(
 	operatorsPerQuorum [][]gethcommon.Address,
 	quorumNumbers []byte,
 ) (*gethtypes.Receipt, error) {
-	w.logger.Info("updating stakes for entire operator set", "quorumNumbers", quorumNumbers)
+	w.logger.Info("updating stakes for entire operator set", "quorumNumbers", sdkutils.ConvertQuorumsBytesToInts(quorumNumbers))
 	noSendTxOpts, err := w.txMgr.GetNoSendTxOpts()
 	if err != nil {
 		return nil, err
@@ -278,8 +278,7 @@ func (w *AvsRegistryChainWriter) UpdateStakesOfEntireOperatorSetForQuorums(
 	if err != nil {
 		return nil, errors.New("failed to send tx with err: " + err.Error())
 	}
-	w.logger.Infof("tx hash: %s", tx.Hash().String())
-	w.logger.Info("updated stakes for entire operator set", "quorumNumbers", quorumNumbers)
+	w.logger.Info("succesfully updated stakes for entire operator set", "tx hash", receipt.TxHash.String(), "quorumNumbers", sdkutils.ConvertQuorumsBytesToInts(quorumNumbers))
 	return receipt, nil
 
 }
@@ -301,8 +300,7 @@ func (w *AvsRegistryChainWriter) UpdateStakesOfOperatorSubsetForAllQuorums(
 	if err != nil {
 		return nil, errors.New("failed to send tx with err: " + err.Error())
 	}
-	w.logger.Infof("tx hash: %s", tx.Hash().String())
-	w.logger.Info("updated stakes of operator subset for all quorums", "operators", operators)
+	w.logger.Info("succesfully updated stakes of operator subset for all quorums", "tx hash", receipt.TxHash.String(), "operators", operators)
 	return receipt, nil
 
 }
@@ -325,7 +323,6 @@ func (w *AvsRegistryChainWriter) DeregisterOperator(
 	if err != nil {
 		return nil, errors.New("failed to send tx with err: " + err.Error())
 	}
-	w.logger.Infof("tx hash: %s", tx.Hash().String())
-	w.logger.Info("deregistered operator with the AVS's registry coordinator")
+	w.logger.Info("succesfully deregistered operator with the AVS's registry coordinator", "tx hash", receipt.TxHash.String())
 	return receipt, nil
 }

chainio/clients/elcontracts/writer.go

@@ -130,7 +130,7 @@ func (w *ELChainWriter) RegisterAsOperator(ctx context.Context, operator types.O
 	if err != nil {
 		return nil, errors.New("failed to send tx with err: " + err.Error())
 	}
-	w.logger.Infof("tx hash: %s", tx.Hash().String())
+	w.logger.Info("tx succesfully included", "tx hash", receipt.TxHash.String())
 
 	return receipt, nil
 }
@@ -156,24 +156,21 @@ func (w *ELChainWriter) UpdateOperatorDetails(
 	if err != nil {
 		return nil, err
 	}
-	_, err = w.txMgr.Send(ctx, tx)
+	receipt, err := w.txMgr.Send(ctx, tx)
 	if err != nil {
 		return nil, errors.New("failed to send tx with err: " + err.Error())
 	}
-	w.logger.Infof("tx hash: %s", tx.Hash().String())
-	w.logger.Infof("updated operator metadata URI for operator %s to EigenLayer", operator.Address)
+	w.logger.Info("succesfully updated operator metadata URI", "tx hash", receipt.TxHash.String(), "operator", operator.Address)
 
 	tx, err = w.delegationManager.UpdateOperatorMetadataURI(noSendTxOpts, operator.MetadataUrl)
 	if err != nil {
 		return nil, err
 	}
-	receipt, err := w.txMgr.Send(ctx, tx)
+	receipt, err = w.txMgr.Send(ctx, tx)
 	if err != nil {
 		return nil, errors.New("failed to send tx with err: " + err.Error())
 	}
-	w.logger.Infof("tx hash: %s", tx.Hash().String())
-
-	w.logger.Infof("updated operator details of operator %s to EigenLayer", operator.Address)
+	w.logger.Info("succesfully updated operator details", "tx hash", receipt.TxHash.String(), "operator", operator.Address)
 	return receipt, nil
 }
 

chainio/txmgr/txmgr.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/Layr-Labs/eigensdk-go/logging"
 	"github.com/Layr-Labs/eigensdk-go/signerv2"
+	sdktypes "github.com/Layr-Labs/eigensdk-go/types"
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -82,19 +83,21 @@ func NewSimpleTxManager(
 func (m *SimpleTxManager) Send(ctx context.Context, tx *types.Transaction) (*types.Receipt, error) {
 
 	// Estimate gas and nonce
-	m.log.Debug("Estimating gas and nonce", "tx", tx.Hash().Hex())
+	// can't print tx hash in logs because the tx changes below when we complete and sign it
+	// so the txHash is meaningless at this point
+	m.log.Debug("Estimating gas and nonce")
 	tx, err := m.estimateGasAndNonce(ctx, tx)
 	if err != nil {
 		return nil, err
 	}
 
-	m.log.Debug("Getting signer for tx", "tx", tx.Hash().Hex())
+	m.log.Debug("Getting signer for tx")
 	signer, err := m.signerFn(ctx, m.sender)
 	if err != nil {
 		return nil, err
 	}
 
-	m.log.Debug("Sending transaction", "tx", tx.Hash().Hex())
+	m.log.Debug("Sending transaction")
 	opts := &bind.TransactOpts{
 		From:      m.sender,
 		Nonce:     new(big.Int).SetUint64(tx.Nonce()),
@@ -117,10 +120,7 @@ func (m *SimpleTxManager) Send(ctx context.Context, tx *types.Transaction) (*typ
 
 	tx, err = contract.RawTransact(opts, tx.Data())
 	if err != nil {
-		return nil, fmt.Errorf("send: failed to send txn: %w", err)
-	}
-	if err != nil {
-		return nil, err
+		return nil, sdktypes.WrapError(fmt.Errorf("send: tx %v failed.", tx.Hash().String()), err)
 	}
 
 	receipt := m.waitForTx(ctx, tx)

signer/basic_signer.go

@@ -9,8 +9,8 @@ import (
 
 	sdkethclient "github.com/Layr-Labs/eigensdk-go/chainio/clients/eth"
 	"github.com/Layr-Labs/eigensdk-go/logging"
-	"github.com/Layr-Labs/eigensdk-go/utils"
 	"github.com/Layr-Labs/eigensdk-go/types"
+	"github.com/Layr-Labs/eigensdk-go/utils"
 
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/accounts/abi"
@@ -165,7 +165,7 @@ func (s *BasicSigner) EnsureTransactionEvaled(tx *gethtypes.Transaction, tag str
 		return nil, fmt.Errorf("Transaction failed (tag: %v, txHash: %v, status: %v, gasUsed: %v)", tag, tx.Hash().Hex(), receipt.Status, receipt.GasUsed)
 	}
 	s.logger.Debug("successfully submitted transaction",
-		"txHash", tx.Hash().Hex(),
+		"txHash", receipt.TxHash.Hex(),
 		"tag", tag,
 		"gasUsed", receipt.GasUsed,
 	)

utils/utils.go

@@ -76,3 +76,11 @@ func IsValidEthereumAddress(address string) bool {
 	re := regexp.MustCompile("^0x[0-9a-fA-F]{40}$")
 	return re.MatchString(address)
 }
+
+func ConvertQuorumsBytesToInts(quorums []byte) []int {
+	var quorumsInts []int
+	for _, quorum := range quorums {
+		quorumsInts = append(quorumsInts, int(quorum))
+	}
+	return quorumsInts
+}