From 28ed0db8a789a57da97c179ed6cdf4a82b517d3e Mon Sep 17 00:00:00 2001 From: FelixFan1992 Date: Tue, 28 May 2024 15:55:22 -0400 Subject: [PATCH] update --- core/scripts/go.mod | 2 +- core/scripts/go.sum | 4 ++-- core/services/ocr2/delegate.go | 1 + core/services/relay/evm/ocr2keeper.go | 5 +---- go.mod | 2 +- go.sum | 4 ++-- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 8 files changed, 11 insertions(+), 13 deletions(-) diff --git a/core/scripts/go.mod b/core/scripts/go.mod index 63401cfe78e..060b7f63666 100644 --- a/core/scripts/go.mod +++ b/core/scripts/go.mod @@ -21,7 +21,7 @@ require ( github.com/prometheus/client_golang v1.17.0 github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46 github.com/smartcontractkit/chainlink-vrf v0.0.0-20240222010609-cd67d123c772 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20240419185742-fd3cab206b2c diff --git a/core/scripts/go.sum b/core/scripts/go.sum index 0d92fa2a55a..213d6fa1dd0 100644 --- a/core/scripts/go.sum +++ b/core/scripts/go.sum @@ -1185,8 +1185,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac h1:1MFOP6jv5jB+czyYGvzVuJyfyoahtgcp6C6Bd/OI4K0= github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac/go.mod h1:rXJCbZ6fwGG6fakkyF8h7a7HSPSRUeqxDnYapRYGoKo= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303 h1:iyLE5c2YFxy89t2v5u+aQOHqRE4c+sCMze70KIo07mI= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303/go.mod h1:DUZccDEW98n+J1mhdWGO7wr/Njad9p9Fzks839JN7Rs= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46 h1:0HsGMT7Rr1jwS1FkaXH0Hktp4SXKeTAz03pq6mxaf5A= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46/go.mod h1:DUZccDEW98n+J1mhdWGO7wr/Njad9p9Fzks839JN7Rs= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d h1:5tgMC5Gi2UAOKZ+m28W8ubjLeR0pQCAcrz6eQ0rW510= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo= diff --git a/core/services/ocr2/delegate.go b/core/services/ocr2/delegate.go index 1b9f486e04e..0fdf6a28108 100644 --- a/core/services/ocr2/delegate.go +++ b/core/services/ocr2/delegate.go @@ -450,6 +450,7 @@ func (d *Delegate) ServicesForSpec(ctx context.Context, jb job.Job) ([]job.Servi return d.newServicesOCR2VRF(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc) case types.OCR2Keeper: + // chain.Config().EVM().ChainType() return d.newServicesOCR2Keepers(ctx, lggr, jb, bootstrapPeers, kb, ocrDB, lc) case types.Functions: diff --git a/core/services/relay/evm/ocr2keeper.go b/core/services/relay/evm/ocr2keeper.go index 71aa6bdc223..ab2cc185880 100644 --- a/core/services/relay/evm/ocr2keeper.go +++ b/core/services/relay/evm/ocr2keeper.go @@ -180,9 +180,6 @@ func (t *ocr3keeperProviderContractTransmitter) Transmit( aoss []ocrtypes.AttributedOnchainSignature, ) error { - // possibly decode reportWithInfo.Report into automation_compatible_utils.IAutomationV21PlusCommonReport if - // the Info approach is not working - // for zk chains, the batch size should be set to 1 in order to figure out which upkeep is responsible for a possible // overflown tx if len(reportWithInfo.Info.UpkeepIDs) == 1 { @@ -190,7 +187,7 @@ func (t *ocr3keeperProviderContractTransmitter) Transmit( uid := reportWithInfo.Info.UpkeepIDs[0] err := t.txStatusStore.SaveTxInfo(id, uid) if err != nil { - t.lggr.Errorf("failed to save tx info into tx status key %s for upkeep ID %s", id.String(), uid) + t.lggr.Errorf("failed to save tx info into tx status key %s for upkeep ID %s due to %s", id.String(), uid, err.Error()) } } diff --git a/go.mod b/go.mod index 42bbb72eb73..3cad2da9fc1 100644 --- a/go.mod +++ b/go.mod @@ -72,7 +72,7 @@ require ( github.com/shopspring/decimal v1.3.1 github.com/smartcontractkit/chain-selectors v1.0.10 github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46 github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240508101745-af1ed7bc8a69 github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 github.com/smartcontractkit/chainlink-feeds v0.0.0-20240522213638-159fb2d99917 diff --git a/go.sum b/go.sum index f2252115278..4587c58e4c0 100644 --- a/go.sum +++ b/go.sum @@ -1171,8 +1171,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac h1:1MFOP6jv5jB+czyYGvzVuJyfyoahtgcp6C6Bd/OI4K0= github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac/go.mod h1:rXJCbZ6fwGG6fakkyF8h7a7HSPSRUeqxDnYapRYGoKo= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303 h1:iyLE5c2YFxy89t2v5u+aQOHqRE4c+sCMze70KIo07mI= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303/go.mod h1:DUZccDEW98n+J1mhdWGO7wr/Njad9p9Fzks839JN7Rs= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46 h1:0HsGMT7Rr1jwS1FkaXH0Hktp4SXKeTAz03pq6mxaf5A= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46/go.mod h1:DUZccDEW98n+J1mhdWGO7wr/Njad9p9Fzks839JN7Rs= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240508101745-af1ed7bc8a69 h1:Sec/GpBpUVaTEax1kSHlTvkzF/+d3w5roAQXaj5+SLA= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240508101745-af1ed7bc8a69/go.mod h1:ZQKf+0OLzCLYIisH/OdOIQuFRI6bDuw+jPBTATyHfFM= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 8cdd295e293..7bbf42c9c22 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -27,7 +27,7 @@ require ( github.com/shopspring/decimal v1.3.1 github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac - github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303 + github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46 github.com/smartcontractkit/chainlink-testing-framework v1.28.15 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index a4e9a0f32e4..2ccefa369a3 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1512,8 +1512,8 @@ github.com/smartcontractkit/chain-selectors v1.0.10 h1:t9kJeE6B6G+hKD0GYR4kGJSCq github.com/smartcontractkit/chain-selectors v1.0.10/go.mod h1:d4Hi+E1zqjy9HqMkjBE5q1vcG9VGgxf5VxiRHfzi2kE= github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac h1:1MFOP6jv5jB+czyYGvzVuJyfyoahtgcp6C6Bd/OI4K0= github.com/smartcontractkit/chainlink-automation v1.0.4-0.20240524162733-edb4cfa975ac/go.mod h1:rXJCbZ6fwGG6fakkyF8h7a7HSPSRUeqxDnYapRYGoKo= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303 h1:iyLE5c2YFxy89t2v5u+aQOHqRE4c+sCMze70KIo07mI= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240524173852-a74b009c7303/go.mod h1:DUZccDEW98n+J1mhdWGO7wr/Njad9p9Fzks839JN7Rs= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46 h1:0HsGMT7Rr1jwS1FkaXH0Hktp4SXKeTAz03pq6mxaf5A= +github.com/smartcontractkit/chainlink-common v0.1.7-0.20240528182638-55b1360b3c46/go.mod h1:DUZccDEW98n+J1mhdWGO7wr/Njad9p9Fzks839JN7Rs= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d h1:5tgMC5Gi2UAOKZ+m28W8ubjLeR0pQCAcrz6eQ0rW510= github.com/smartcontractkit/chainlink-cosmos v0.4.1-0.20240524214833-c362c2ebbd2d/go.mod h1:0UNuO3nDt9MFsZPaHJBEUolxVkN0iC69j1ccDp95e8k= github.com/smartcontractkit/chainlink-data-streams v0.0.0-20240220203239-09be0ea34540 h1:xFSv8561jsLtF6gYZr/zW2z5qUUAkcFkApin2mnbYTo=