From bab46d7927e33592a1692e2968547f48317ac7f7 Mon Sep 17 00:00:00 2001 From: Geert G <117188496+cll-gg@users.noreply.github.com> Date: Thu, 27 Feb 2025 15:32:14 +0000 Subject: [PATCH] WIP --- core/chains/evm/txm/metrics.go | 6 ++++++ core/chains/evm/txm/txm.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/core/chains/evm/txm/metrics.go b/core/chains/evm/txm/metrics.go index fdccacd7365..edffbcd6b10 100644 --- a/core/chains/evm/txm/metrics.go +++ b/core/chains/evm/txm/metrics.go @@ -96,12 +96,18 @@ func (m *txmMetrics) RecordTimeUntilTxConfirmed(ctx context.Context, duration fl } func (m *txmMetrics) EmitTxMessage(ctx context.Context, tx common.Hash, fromAddress common.Address, toAddress common.Address, nonce string) error { + message := &svrv1.TxMessage{ Hash: tx.String(), FromAddress: fromAddress.String(), ToAddress: toAddress.String(), Nonce: nonce, + // CreatedAt: time.Now().UnixMicro(), + // ChainId: m.chainID.String(), + // FeedAddress: m.Get("feedAddress"), + // FeedName: m.Get("feedName"), } + fmt.Printf("Emitting tx message: %v\n", message) // TODO(gg): remove messageBytes, err := proto.Marshal(message) if err != nil { diff --git a/core/chains/evm/txm/txm.go b/core/chains/evm/txm/txm.go index d065db001b3..da0b83efeee 100644 --- a/core/chains/evm/txm/txm.go +++ b/core/chains/evm/txm/txm.go @@ -358,7 +358,7 @@ func (t *Txm) sendTransactionWithError(ctx context.Context, tx *types.Transactio return err } if pendingNonce <= *tx.Nonce { - return fmt.Errorf("Pending nonce for txID: %v didn't increase. PendingNonce: %d, TxNonce: %d. TxErr: %w", tx.ID, pendingNonce, *tx.Nonce, txErr) + return fmt.Errorf("pending nonce for txID: %v didn't increase. PendingNonce: %d, TxNonce: %d. TxErr: %w", tx.ID, pendingNonce, *tx.Nonce, txErr) } } diff --git a/go.mod b/go.mod index 6ffb117780e..922b15fe2a6 100644 --- a/go.mod +++ b/go.mod @@ -319,7 +319,7 @@ require ( github.com/sasha-s/go-deadlock v0.3.5 // indirect github.com/sethvargo/go-retry v0.2.4 // indirect github.com/shirou/gopsutil v3.21.11+incompatible // indirect - github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 + github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250227132844-5581683e4bad github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect github.com/sourcegraph/conc v0.3.0 // indirect github.com/spf13/afero v1.12.0 // indirect diff --git a/go.sum b/go.sum index 6860ae1bdcb..6f28289ef2a 100644 --- a/go.sum +++ b/go.sum @@ -1036,8 +1036,8 @@ github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0 h1:xRgu/kMkxcY4 github.com/smartcontractkit/chainlink-protos/orchestrator v0.5.0/go.mod h1:m/A3lqD7ms/RsQ9BT5P2uceYY0QX5mIt4KQxT2G6qEo= github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 h1:L6KJ4kGv/yNNoCk8affk7Y1vAY0qglPMXC/hevV/IsA= github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6/go.mod h1:FRwzI3hGj4CJclNS733gfcffmqQ62ONCkbGi49s658w= -github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 h1:c77Gi/APraqwbBO8fbd/5JY2wW+MSIpYg8Uma9MEZFE= -github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= +github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250227132844-5581683e4bad h1:UyQa97E8XX9QPBqK/qLb5M0Zx8yc10giMfiOBXXixrI= +github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250227132844-5581683e4bad/go.mod h1:TcOliTQU6r59DwG4lo3U+mFM9WWyBHGuFkkxQpvSujo= github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a h1:C+XavZQ0rBOpOrh45LUhdOsvtI8OQ0XZKI5pi+GP6h4= github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a/go.mod h1:aFm1QC/n99mVeBDtv0SE0co56+IECY6Y1fR3OfNYy3c= github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=