From 1bb92c5e20e1d108aec31523ab670259bc40b805 Mon Sep 17 00:00:00 2001 From: lukaszcl <120112546+lukaszcl@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:41:19 +0100 Subject: [PATCH 1/5] Update toml keys for secrets --- .../setup-create-base64-config-live-testnets/action.yml | 4 ++-- .github/actions/setup-create-base64-config/action.yml | 4 ++-- .github/actions/setup-merge-base64-config/action.yml | 4 ++-- .github/workflows/automation-load-tests.yml | 2 +- .github/workflows/automation-ondemand-tests.yml | 2 +- .github/workflows/client-compatibility-tests.yml | 2 +- .github/workflows/integration-staging-tests.yml | 4 ++-- integration-tests/testconfig/automation/example.toml | 6 +++--- integration-tests/testconfig/functions/example.toml | 6 +++--- integration-tests/testconfig/keeper/example.toml | 6 +++--- integration-tests/testconfig/log_poller/example.toml | 6 +++--- integration-tests/testconfig/node/example.toml | 6 +++--- integration-tests/testconfig/ocr/example.toml | 6 +++--- integration-tests/testconfig/ocr2/example.toml | 6 +++--- integration-tests/testconfig/vrfv2/example.toml | 6 +++--- integration-tests/testconfig/vrfv2plus/example.toml | 6 +++--- 16 files changed, 38 insertions(+), 38 deletions(-) diff --git a/.github/actions/setup-create-base64-config-live-testnets/action.yml b/.github/actions/setup-create-base64-config-live-testnets/action.yml index 5bf83191b59..89d6a5e05d6 100644 --- a/.github/actions/setup-create-base64-config-live-testnets/action.yml +++ b/.github/actions/setup-create-base64-config-live-testnets/action.yml @@ -94,7 +94,7 @@ runs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" [Logging] run_id="$RUN_ID" @@ -105,7 +105,7 @@ runs: [Logging.Loki] tenant_id="$LOKI_TENANT_ID" endpoint="$LOKI_URL" - basic_auth="$LOKI_BASIC_AUTH" + basic_auth_secret="$LOKI_BASIC_AUTH" [Logging.Grafana] base_url="$GRAFANA_URL" diff --git a/.github/actions/setup-create-base64-config/action.yml b/.github/actions/setup-create-base64-config/action.yml index 55e5924bd76..013221bb41e 100644 --- a/.github/actions/setup-create-base64-config/action.yml +++ b/.github/actions/setup-create-base64-config/action.yml @@ -96,7 +96,7 @@ runs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" [Logging] test_log_collect=$test_log_collect @@ -108,7 +108,7 @@ runs: [Logging.Loki] tenant_id="$LOKI_TENANT_ID" endpoint="$LOKI_ENDPOINT" - basic_auth="$LOKI_BASIC_AUTH" + basic_auth_secret="$LOKI_BASIC_AUTH" [Logging.Grafana] base_url="$GRAFANA_URL" diff --git a/.github/actions/setup-merge-base64-config/action.yml b/.github/actions/setup-merge-base64-config/action.yml index 9651242f8f1..d7e8d885c4f 100644 --- a/.github/actions/setup-merge-base64-config/action.yml +++ b/.github/actions/setup-merge-base64-config/action.yml @@ -42,9 +42,9 @@ runs: [Logging.Loki] tenant_id="$LOKI_TENANT_ID" endpoint="$LOKI_URL" - basic_auth="$LOKI_BASIC_AUTH" + basic_auth_secret="$LOKI_BASIC_AUTH" # legacy, you only need this to access the cloud version - # bearer_token="bearer_token" + # bearer_token_secret="bearer_token" EOF echo "$decoded_toml" >> final_config.toml diff --git a/.github/workflows/automation-load-tests.yml b/.github/workflows/automation-load-tests.yml index ad68e470a4d..0db980453ad 100644 --- a/.github/workflows/automation-load-tests.yml +++ b/.github/workflows/automation-load-tests.yml @@ -53,7 +53,7 @@ jobs: cat << EOF > config.toml server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" EOF echo "$decoded_toml" >> final_config.toml diff --git a/.github/workflows/automation-ondemand-tests.yml b/.github/workflows/automation-ondemand-tests.yml index a996399b93d..01acacee68d 100644 --- a/.github/workflows/automation-ondemand-tests.yml +++ b/.github/workflows/automation-ondemand-tests.yml @@ -218,7 +218,7 @@ jobs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" EOF BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0) diff --git a/.github/workflows/client-compatibility-tests.yml b/.github/workflows/client-compatibility-tests.yml index 4d895cbfc5b..a1d5b9b6d23 100644 --- a/.github/workflows/client-compatibility-tests.yml +++ b/.github/workflows/client-compatibility-tests.yml @@ -202,7 +202,7 @@ jobs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" [PrivateEthereumNetwork] consensus_type="pos" diff --git a/.github/workflows/integration-staging-tests.yml b/.github/workflows/integration-staging-tests.yml index ea0691b7ca5..6851a4ec3f1 100644 --- a/.github/workflows/integration-staging-tests.yml +++ b/.github/workflows/integration-staging-tests.yml @@ -89,7 +89,7 @@ jobs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" [Logging] run_id="$RUN_ID" @@ -100,7 +100,7 @@ jobs: [Logging.Loki] tenant_id="$LOKI_TENANT_ID" endpoint="$LOKI_URL" - basic_auth="$LOKI_BASIC_AUTH" + basic_auth_secret="$LOKI_BASIC_AUTH" [Logging.Grafana] base_url="$GRAFANA_URL" diff --git a/integration-tests/testconfig/automation/example.toml b/integration-tests/testconfig/automation/example.toml index a8e0510d83c..7a3d33951ba 100644 --- a/integration-tests/testconfig/automation/example.toml +++ b/integration-tests/testconfig/automation/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/functions/example.toml b/integration-tests/testconfig/functions/example.toml index 7628fbeee32..b96b39b0409 100644 --- a/integration-tests/testconfig/functions/example.toml +++ b/integration-tests/testconfig/functions/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use simulated network [Network] diff --git a/integration-tests/testconfig/keeper/example.toml b/integration-tests/testconfig/keeper/example.toml index 6bdd6537bc3..d76fff343e7 100644 --- a/integration-tests/testconfig/keeper/example.toml +++ b/integration-tests/testconfig/keeper/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/log_poller/example.toml b/integration-tests/testconfig/log_poller/example.toml index 90ec89a3ed1..88922e3fedb 100644 --- a/integration-tests/testconfig/log_poller/example.toml +++ b/integration-tests/testconfig/log_poller/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/node/example.toml b/integration-tests/testconfig/node/example.toml index 55ee1ffccf1..e6777bc8352 100644 --- a/integration-tests/testconfig/node/example.toml +++ b/integration-tests/testconfig/node/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/ocr/example.toml b/integration-tests/testconfig/ocr/example.toml index 6cbdbef1555..b8eb891ba33 100644 --- a/integration-tests/testconfig/ocr/example.toml +++ b/integration-tests/testconfig/ocr/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/ocr2/example.toml b/integration-tests/testconfig/ocr2/example.toml index 6cbdbef1555..b8eb891ba33 100644 --- a/integration-tests/testconfig/ocr2/example.toml +++ b/integration-tests/testconfig/ocr2/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/vrfv2/example.toml b/integration-tests/testconfig/vrfv2/example.toml index bc826ebe05e..e62e56791d3 100644 --- a/integration-tests/testconfig/vrfv2/example.toml +++ b/integration-tests/testconfig/vrfv2/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/vrfv2plus/example.toml b/integration-tests/testconfig/vrfv2plus/example.toml index 6595dce18ca..7aae2a15dfa 100644 --- a/integration-tests/testconfig/vrfv2plus/example.toml +++ b/integration-tests/testconfig/vrfv2plus/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] From fb0dde4dfb04858b1288f75a8a66184a35207c59 Mon Sep 17 00:00:00 2001 From: lukaszcl <120112546+lukaszcl@users.noreply.github.com> Date: Thu, 15 Feb 2024 16:43:06 +0100 Subject: [PATCH 2/5] Bump CTF (unreleased version) --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 366594098ec..de91382f5d8 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -25,7 +25,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240213113935-001c2f4befd4 - github.com/smartcontractkit/chainlink-testing-framework v1.23.2 + github.com/smartcontractkit/chainlink-testing-framework v1.23.5-0.20240215135013-e2ba1eb0def4 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20240112202000-6359502d2ff1 diff --git a/integration-tests/go.sum b/integration-tests/go.sum index df94da9318d..59d33be67e5 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1473,8 +1473,8 @@ github.com/segmentio/ksuid v1.0.4/go.mod h1:/XUiZBD3kVx5SmUOl55voK5yeAbBNNIed+2O github.com/sercand/kuberesolver/v5 v5.1.1 h1:CYH+d67G0sGBj7q5wLK61yzqJJ8gLLC8aeprPTHb6yY= github.com/sercand/kuberesolver/v5 v5.1.1/go.mod h1:Fs1KbKhVRnB2aDWN12NjKCB+RgYMWZJ294T3BtmVCpQ= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= -github.com/sergi/go-diff v1.2.0 h1:XU+rvMAioB0UC3q1MFrIQy4Vo5/4VsRDQQXHsEya6xQ= -github.com/sergi/go-diff v1.2.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8= +github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I= github.com/sethvargo/go-retry v0.2.4 h1:T+jHEQy/zKJf5s95UkguisicE0zuF9y7+/vgz08Ocec= github.com/sethvargo/go-retry v0.2.4/go.mod h1:1afjQuvh7s4gflMObvjLPaWgluLLyhA1wmVZ6KLpICw= github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= @@ -1515,8 +1515,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240213161921-c4d342b761b github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240213161921-c4d342b761b0/go.mod h1:JiykN+8W5TA4UD2ClrzQCVvcH3NcyLEVv7RwY0busrw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0 h1:7m9PVtccb8/pvKTXMaGuyceFno1icRyC2SFH7KG7+70= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0/go.mod h1:SZ899lZYQ0maUulWbZg+SWqabHQ1wTbyk3jT8wJfyo8= -github.com/smartcontractkit/chainlink-testing-framework v1.23.2 h1:haXPd9Pg++Zs5/QIZnhFd9RElmz/d0+4nNeletUg9ZM= -github.com/smartcontractkit/chainlink-testing-framework v1.23.2/go.mod h1:StIOdxvwd8AMO6xuBtmD6FQfJXktEn/mJJEr7728BTc= +github.com/smartcontractkit/chainlink-testing-framework v1.23.5-0.20240215135013-e2ba1eb0def4 h1:wxSr+hvx9p5dzAdoMjA1PDWjTcfo/YrvE6SgY0HkUc0= +github.com/smartcontractkit/chainlink-testing-framework v1.23.5-0.20240215135013-e2ba1eb0def4/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 h1:TFe+FvzxClblt6qRfqEhUfa4kFQx5UobuoFGO2W4mMo= From 6139dae3ae94e0fdbe1ec2aa02e50492ed580be5 Mon Sep 17 00:00:00 2001 From: lukaszcl <120112546+lukaszcl@users.noreply.github.com> Date: Thu, 22 Feb 2024 14:58:57 +0100 Subject: [PATCH 3/5] Bump CTF --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index ae2ac344c9b..1e03a02289b 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -24,7 +24,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240221153538-1ea85cf3dc6c - github.com/smartcontractkit/chainlink-testing-framework v1.23.6 + github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20240215150045-fe2ba71b2f0a diff --git a/integration-tests/go.sum b/integration-tests/go.sum index fe81cc3ac68..7579bd469fe 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1519,8 +1519,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19e/go.mod h1:JiykN+8W5TA4UD2ClrzQCVvcH3NcyLEVv7RwY0busrw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0 h1:7m9PVtccb8/pvKTXMaGuyceFno1icRyC2SFH7KG7+70= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0/go.mod h1:SZ899lZYQ0maUulWbZg+SWqabHQ1wTbyk3jT8wJfyo8= -github.com/smartcontractkit/chainlink-testing-framework v1.23.6 h1:krjJswtgQ/J4kBgFpC7Tyh8wSFfWiGGUsADg6BG/EGw= -github.com/smartcontractkit/chainlink-testing-framework v1.23.6/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= +github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b h1:5joaOr/wkH/DG/Oigl3nTH7+9JrhVFes7h0N5+CGn7I= +github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 h1:TFe+FvzxClblt6qRfqEhUfa4kFQx5UobuoFGO2W4mMo= From 6fdc4a807d5c91e629142618c84cf6ed52dc344a Mon Sep 17 00:00:00 2001 From: lukaszcl <120112546+lukaszcl@users.noreply.github.com> Date: Thu, 22 Feb 2024 15:06:15 +0100 Subject: [PATCH 4/5] Fix go mod --- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 174ea743c23..80e15f6c4a7 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -16,7 +16,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240221153538-1ea85cf3dc6c - github.com/smartcontractkit/chainlink-testing-framework v1.23.6 + github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8 github.com/smartcontractkit/libocr v0.0.0-20240215150045-fe2ba71b2f0a diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 1aaac86bd00..2572589cb28 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1502,8 +1502,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19e/go.mod h1:JiykN+8W5TA4UD2ClrzQCVvcH3NcyLEVv7RwY0busrw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0 h1:7m9PVtccb8/pvKTXMaGuyceFno1icRyC2SFH7KG7+70= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0/go.mod h1:SZ899lZYQ0maUulWbZg+SWqabHQ1wTbyk3jT8wJfyo8= -github.com/smartcontractkit/chainlink-testing-framework v1.23.6 h1:krjJswtgQ/J4kBgFpC7Tyh8wSFfWiGGUsADg6BG/EGw= -github.com/smartcontractkit/chainlink-testing-framework v1.23.6/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= +github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b h1:5joaOr/wkH/DG/Oigl3nTH7+9JrhVFes7h0N5+CGn7I= +github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= From e6e828f628ddc32da8706b6f0fe1fa795fb242f4 Mon Sep 17 00:00:00 2001 From: lukaszcl <120112546+lukaszcl@users.noreply.github.com> Date: Mon, 26 Feb 2024 17:34:10 +0100 Subject: [PATCH 5/5] Bump CTF --- integration-tests/go.mod | 2 +- integration-tests/go.sum | 4 ++-- integration-tests/load/go.mod | 2 +- integration-tests/load/go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/integration-tests/go.mod b/integration-tests/go.mod index a78949bbdae..cf3f065d812 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -24,7 +24,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240221153538-1ea85cf3dc6c - github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b + github.com/smartcontractkit/chainlink-testing-framework v1.24.1 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20240215150045-fe2ba71b2f0a diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 3af8df181a1..05717c79210 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1519,8 +1519,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19e/go.mod h1:JiykN+8W5TA4UD2ClrzQCVvcH3NcyLEVv7RwY0busrw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0 h1:7m9PVtccb8/pvKTXMaGuyceFno1icRyC2SFH7KG7+70= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0/go.mod h1:SZ899lZYQ0maUulWbZg+SWqabHQ1wTbyk3jT8wJfyo8= -github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b h1:5joaOr/wkH/DG/Oigl3nTH7+9JrhVFes7h0N5+CGn7I= -github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= +github.com/smartcontractkit/chainlink-testing-framework v1.24.1 h1:a9iBDWI6LayLFu989kt7Hadw5Y0C9K3LU+s+JIamogE= +github.com/smartcontractkit/chainlink-testing-framework v1.24.1/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 h1:TFe+FvzxClblt6qRfqEhUfa4kFQx5UobuoFGO2W4mMo= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index 5f3de5a4ad0..016d8c5c91a 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -16,7 +16,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240221153538-1ea85cf3dc6c - github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b + github.com/smartcontractkit/chainlink-testing-framework v1.24.1 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8 github.com/smartcontractkit/libocr v0.0.0-20240215150045-fe2ba71b2f0a diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index 2bf79e11644..803c56b8d71 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1502,8 +1502,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19e/go.mod h1:JiykN+8W5TA4UD2ClrzQCVvcH3NcyLEVv7RwY0busrw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0 h1:7m9PVtccb8/pvKTXMaGuyceFno1icRyC2SFH7KG7+70= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0/go.mod h1:SZ899lZYQ0maUulWbZg+SWqabHQ1wTbyk3jT8wJfyo8= -github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b h1:5joaOr/wkH/DG/Oigl3nTH7+9JrhVFes7h0N5+CGn7I= -github.com/smartcontractkit/chainlink-testing-framework v1.23.7-0.20240222135624-e1902d8b7f7b/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= +github.com/smartcontractkit/chainlink-testing-framework v1.24.1 h1:a9iBDWI6LayLFu989kt7Hadw5Y0C9K3LU+s+JIamogE= +github.com/smartcontractkit/chainlink-testing-framework v1.24.1/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss=