diff --git a/.github/actions/setup-ccip-devenv/action.yml b/.github/actions/setup-ccip-devenv/action.yml index 7855ef1ce..092424590 100644 --- a/.github/actions/setup-ccip-devenv/action.yml +++ b/.github/actions/setup-ccip-devenv/action.yml @@ -11,7 +11,7 @@ inputs: # builds the verifier/devenv Docker images, while go.mod pins the `ccv up` tooling # that generates their configs. A mismatch across config-format changes (e.g. #1193 # bootstrap monitoring.Config) makes the verifier container exit on startup. - default: 3368a3af3d848ab0073f0ce64b48b625be3605c8 + default: f56568515e8ad749f71e437342fa170f4ec12a0b canton-ref: description: >- chainlink-canton git ref. Leave empty to use the ref that triggered the workflow. diff --git a/.gitignore b/.gitignore index 128048c90..161187529 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ navigator.log .idea .vscode .cursor/ +.tmp/ .DS_Store go.work @@ -23,3 +24,4 @@ eds/prod_testnet_canton.local.secrets.toml scripts/prod_mainnet/.env scripts/prod_mainnet/.env.example .env.prod-testnet.local +.for-agents/ \ No newline at end of file diff --git a/ccip/devenv/env-canton-evm.toml b/ccip/devenv/env-canton-evm.toml index 06c45048a..b55256f3a 100644 --- a/ccip/devenv/env-canton-evm.toml +++ b/ccip/devenv/env-canton-evm.toml @@ -4,13 +4,16 @@ cl_nodes_funding_link = 50 ## Environment configuration define the topology. Eventually the topology should be the only config that is needed. [environment_topology] indexer_address = ["http://indexer-1:8100"] -pyroscope_url = "http://host.docker.internal:4040" -[environment_topology.monitoring] +[environment_topology.Monitoring] +LogLevel = 'info' + +[environment_topology.Monitoring.Pyroscope] Enabled = true -Type = "beholder" +URL = "http://host.docker.internal:4040" -[environment_topology.monitoring.Beholder] +[environment_topology.Monitoring.Beholder] +Enabled = true InsecureConnection = true OtelExporterHTTPEndpoint = "host.docker.internal:4318" LogStreamingEnabled = false @@ -256,10 +259,14 @@ execution_interval = 15_000_000_000 LogLevel = 'info' [indexer.indexer_config.Monitoring] -Enabled = true -Type = 'beholder' +LogLevel = 'info' + +[indexer.indexer_config.Monitoring.Pyroscope] +Enabled = false +URL = '' [indexer.indexer_config.Monitoring.Beholder] +Enabled = true InsecureConnection = true CACertFile = '' OtelExporterGRPCEndpoint = '' diff --git a/go.mod b/go.mod index fd71fd3cd..11e117d71 100644 --- a/go.mod +++ b/go.mod @@ -35,9 +35,9 @@ require ( github.com/smartcontractkit/chain-selectors v1.0.104 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260702144426-865f1e5fe90d github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d - github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703085752-3368a3af3d84 - github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703085752-3368a3af3d84 - github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703085752-3368a3af3d84 + github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703162011-f56568515e8a + github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703162011-f56568515e8a + github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 github.com/smartcontractkit/chainlink-deployments-framework v0.114.2 github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.6-0.20260630120514-36abe27604df diff --git a/go.sum b/go.sum index abbd7083f..903bf0e45 100644 --- a/go.sum +++ b/go.sum @@ -1161,12 +1161,12 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139/go.mod h1:1WcontO9PeuKdUf5HXfs3nuICtzUvFNnyCmrHkTCF9Y= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d h1:ur6iz6AwuK6iBoAAAM8KMlEJb5Y7ihlJ4fk0acw2mJw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d/go.mod h1:7VW7TwL0yIOQIoe39YwUfwYkt9P79tDR4Pb0h/Q7P3E= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703085752-3368a3af3d84 h1:ye6iLO9DMQpPv7ekOfLfucgKt/20sePme4ISeHBu934= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703085752-3368a3af3d84/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703085752-3368a3af3d84 h1:iizBs022xhqg1ZCdk0JvjAK5QHfG1db8/zqzh4qL1Ko= -github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703085752-3368a3af3d84/go.mod h1:UocRvvOzExogwiuXzJFZWeI9y3ryYogOQoq7492w5LY= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703085752-3368a3af3d84 h1:zyhk5wJcmF7pCfZDKTeR4pneVyCQ7O2calzD83yi4dg= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703085752-3368a3af3d84/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703162011-f56568515e8a h1:rXuvcGb+VcKxI3a4mapfirLa9bKbZMlShUh8p/cScQw= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703162011-f56568515e8a/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703162011-f56568515e8a h1:s25fM9Aava98G+c95eQYFlfa1+6My46gg526WfysP90= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703162011-f56568515e8a/go.mod h1:UocRvvOzExogwiuXzJFZWeI9y3ryYogOQoq7492w5LY= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a h1:FAaAqMOqX4H/g2OXdQj01gNlKajeBF8SDZO2WhHbSPc= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260702145243-1bc05d9d7d3a h1:NFRZ6oiM7aTJ5Kz1G8t7izxB4on9qoTPCI5PTHeVP+8= github.com/smartcontractkit/chainlink-ccv/integration/evm v0.0.0-20260702145243-1bc05d9d7d3a/go.mod h1:3PUKLvizVRdanwr5NkLeTWnQIYsT3VmGKZPUqAcLfus= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 h1:5z3LQ27MJmhiaeqp9S2TzbF5Wm4GGvUKAYOtE9AauR8= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index e4a41d141..5dd137781 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -10,7 +10,6 @@ replace github.com/smartcontractkit/chainlink-canton/party-ceremony => ../party- replace github.com/fbsobreira/gotron-sdk => github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20251014120029-d73d15cc23f7 replace ( - github.com/smartcontractkit/chainlink-ccip => github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260629123053-9119c0d88425 github.com/smartcontractkit/chainlink-sui => github.com/smartcontractkit/chainlink-sui v0.0.0-20260610194843-349ea43d69ce github.com/smartcontractkit/chainlink-sui/deployment => github.com/smartcontractkit/chainlink-sui/deployment v0.0.0-20260610194843-349ea43d69ce // Pin codec to v1.2.x: chainlink-evm's generated code uses GenVersion/GenHelper removed in v1.3.0 @@ -28,8 +27,8 @@ require ( github.com/smartcontractkit/chainlink-canton/party-ceremony v0.0.0-00010101000000-000000000000 github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260702144426-865f1e5fe90d github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d - github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703085752-3368a3af3d84 - github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703085752-3368a3af3d84 + github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703162011-f56568515e8a + github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703162011-f56568515e8a github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 github.com/smartcontractkit/chainlink-deployments-framework v0.114.2 github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad @@ -267,7 +266,7 @@ require ( github.com/smartcontractkit/chainlink-aptos v0.0.0-20260428085939-5c70de12dbfc // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260129103204-4c8453dd8139 // indirect github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139 // indirect - github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703085752-3368a3af3d84 // indirect + github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a // indirect github.com/smartcontractkit/chainlink-common/keystore v1.0.2 // indirect github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260427132147-1ef18876ae9b // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 235ca38ec..7817c066f 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -707,8 +707,8 @@ github.com/smartcontractkit/chain-selectors v1.0.104 h1:/n9pPGM5W/+r1eHoWZv4VwX9 github.com/smartcontractkit/chain-selectors v1.0.104/go.mod h1:qy7whtgG5g+7z0jt0nRyii9bLND9m15NZTzuQPkMZ5w= github.com/smartcontractkit/chainlink-aptos v0.0.0-20260428085939-5c70de12dbfc h1:Um9FBcf0JNSFuGbxgccDG1vM3cNrMGy0SdJ7r6VbX0o= github.com/smartcontractkit/chainlink-aptos v0.0.0-20260428085939-5c70de12dbfc/go.mod h1:zfE2R7887kiwXkGTHKPe5NBgwhFwIC3pnA2uAxrbvig= -github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260629123053-9119c0d88425 h1:nYaDvRaHHwwurRuedyRjEGZUwdASsa3T3B7Tm0uFVG8= -github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260629123053-9119c0d88425/go.mod h1:ndN8/vHFhrs6pR2OZd9AwHVgMvA/Ezz8AJPYnZj2eVE= +github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260428205619-2db1389501a1 h1:p0nFrTYrOQzDhWYm6suaM5CoWiXV5NV7llHnp6/Kn/8= +github.com/smartcontractkit/chainlink-ccip v0.1.1-solana.0.20260428205619-2db1389501a1/go.mod h1:1XxxpkgCmG/z6y30yRuVrcxre6zixIVX3xzi706Db/8= github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260702144426-865f1e5fe90d h1:6rdGrDTCmjgfVgUCZEW+WDWN5YwHSZk2dnL+oNmbxg0= github.com/smartcontractkit/chainlink-ccip/chains/evm v0.0.0-20260702144426-865f1e5fe90d/go.mod h1:4tOS1KUc55ZCVpjBAwbgBM2hjdGaD4MbvmSq5Js8zPA= github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260129103204-4c8453dd8139 h1:jkChf04hhdiMBApbb+lLDxHMY62Md6UeM7v++GSw3K8= @@ -717,12 +717,12 @@ github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260 github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260129103204-4c8453dd8139/go.mod h1:1WcontO9PeuKdUf5HXfs3nuICtzUvFNnyCmrHkTCF9Y= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d h1:ur6iz6AwuK6iBoAAAM8KMlEJb5Y7ihlJ4fk0acw2mJw= github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260702144426-865f1e5fe90d/go.mod h1:7VW7TwL0yIOQIoe39YwUfwYkt9P79tDR4Pb0h/Q7P3E= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703085752-3368a3af3d84 h1:ye6iLO9DMQpPv7ekOfLfucgKt/20sePme4ISeHBu934= -github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703085752-3368a3af3d84/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= -github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703085752-3368a3af3d84 h1:iizBs022xhqg1ZCdk0JvjAK5QHfG1db8/zqzh4qL1Ko= -github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703085752-3368a3af3d84/go.mod h1:UocRvvOzExogwiuXzJFZWeI9y3ryYogOQoq7492w5LY= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703085752-3368a3af3d84 h1:zyhk5wJcmF7pCfZDKTeR4pneVyCQ7O2calzD83yi4dg= -github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703085752-3368a3af3d84/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703162011-f56568515e8a h1:rXuvcGb+VcKxI3a4mapfirLa9bKbZMlShUh8p/cScQw= +github.com/smartcontractkit/chainlink-ccv v0.0.2-0.20260703162011-f56568515e8a/go.mod h1:3XQmy2zQHrmufebP7dM+x595+gghxzyIKxK9wv91Rh8= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703162011-f56568515e8a h1:s25fM9Aava98G+c95eQYFlfa1+6My46gg526WfysP90= +github.com/smartcontractkit/chainlink-ccv/build/devenv v0.0.2-0.20260703162011-f56568515e8a/go.mod h1:UocRvvOzExogwiuXzJFZWeI9y3ryYogOQoq7492w5LY= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a h1:FAaAqMOqX4H/g2OXdQj01gNlKajeBF8SDZO2WhHbSPc= +github.com/smartcontractkit/chainlink-ccv/deployment v0.0.2-0.20260703162011-f56568515e8a/go.mod h1:MUp3G8xL8EDpQOo5Me+HabfOMRgFqRYDGliAmW0nVx0= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89 h1:5z3LQ27MJmhiaeqp9S2TzbF5Wm4GGvUKAYOtE9AauR8= github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89/go.mod h1:G2AII0QmWzXx8Ag9IKnGN3h/gwwNnhHUOCviJievdvo= github.com/smartcontractkit/chainlink-common/keystore v1.0.2 h1:AWisx4JT3QV8tcgh6J5NCrex+wAgTYpWyHsyNPSXzsQ=