From 92ccec0c0498fc1a6c7ea948aecafb83d4b96551 Mon Sep 17 00:00:00 2001 From: James Walker Date: Mon, 24 Jun 2024 11:58:42 -0400 Subject: [PATCH 1/2] remove error check which skips batching retries --- .changeset/tiny-camels-flow.md | 5 +++++ core/chains/evm/logpoller/orm.go | 3 --- 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 .changeset/tiny-camels-flow.md diff --git a/.changeset/tiny-camels-flow.md b/.changeset/tiny-camels-flow.md new file mode 100644 index 00000000000..4076bfb05eb --- /dev/null +++ b/.changeset/tiny-camels-flow.md @@ -0,0 +1,5 @@ +--- +"chainlink": patch +--- + +#bugfix fixed upreachable code bug which could result in stuck txns diff --git a/core/chains/evm/logpoller/orm.go b/core/chains/evm/logpoller/orm.go index b9a1ca39f4a..1d249760736 100644 --- a/core/chains/evm/logpoller/orm.go +++ b/core/chains/evm/logpoller/orm.go @@ -394,9 +394,6 @@ func (o *DSORM) insertLogsWithinTx(ctx context.Context, logs []Log, tx sqlutil.D ON CONFLICT DO NOTHING` _, err := o.ds.NamedExecContext(ctx, query, logs[start:end]) - if err != nil { - return err - } if err != nil { if pkgerrors.Is(err, context.DeadlineExceeded) && batchInsertSize > 500 { // In case of DB timeouts, try to insert again with a smaller batch upto a limit From 0ebdea8c402892f616dcb971e1415d06c9756c12 Mon Sep 17 00:00:00 2001 From: James Walker Date: Mon, 24 Jun 2024 12:31:48 -0400 Subject: [PATCH 2/2] fix typo in changeset --- .changeset/tiny-camels-flow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.changeset/tiny-camels-flow.md b/.changeset/tiny-camels-flow.md index 4076bfb05eb..3271bbb4a39 100644 --- a/.changeset/tiny-camels-flow.md +++ b/.changeset/tiny-camels-flow.md @@ -2,4 +2,4 @@ "chainlink": patch --- -#bugfix fixed upreachable code bug which could result in stuck txns +#bugfix fixed ureachable code bug which could result in stuck txns