diff --git a/integration-tests/capabilities/environment-cache.toml b/integration-tests/capabilities/environment-cache.toml index 0cd80495f57..5579e25a0c1 100755 --- a/integration-tests/capabilities/environment-cache.toml +++ b/integration-tests/capabilities/environment-cache.toml @@ -12,14 +12,14 @@ contracts_dir = '' [blockchain_a.out] use_cache = true family = 'evm' -container_name = 'blockchain-node-940e6' +container_name = 'blockchain-node-20bf8' chain_id = '1337' [[blockchain_a.out.nodes]] ws_url = 'ws://127.0.0.1:8545' http_url = 'http://127.0.0.1:8545' -docker_internal_ws_url = 'ws://blockchain-node-940e6:8545' -docker_internal_http_url = 'http://blockchain-node-940e6:8545' +docker_internal_ws_url = 'ws://blockchain-node-20bf8:8545' +docker_internal_http_url = 'http://blockchain-node-20bf8:8545' [nodeset] nodes = 5 @@ -46,7 +46,7 @@ docker_ctx = '../..' pull_image = false capabilities = [] capabilities_container_dir = '' -test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@localhost:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@localhost:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-940e6:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-940e6:8545'\n\t\t\t" +test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@localhost:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@localhost:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-20bf8:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-20bf8:8545'\n\t\t\t" user_config_overrides = " [Feature]\n\t\t\tLogPoller = true\n\n\t\t\t[OCR2]\n\t\t\tEnabled = true\n\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t[P2P.V2]\n\t\t\tEnabled = true\n\t\t\tListenAddresses = ['0.0.0.0:5001']\n " test_secrets_overrides = '' user_secrets_overrides = '' @@ -62,9 +62,9 @@ name = '' docker_file = 'plugins/chainlink.Dockerfile' docker_ctx = '../..' pull_image = false -capabilities = ['./streams-linux-amd64', './cron-linux-amd64'] +capabilities = ['./cron-linux-amd64'] capabilities_container_dir = '' -test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@node0:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@node0:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-940e6:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-940e6:8545'\n\n\t\t\t\t[EVM.Workflow]\n\t\t\t\tFromAddress = '0x01EcEe29ac18D849717Cf3f5D699B419424B9582'\n\t\t\t\tForwarderAddress = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9'\n\t\t\t\tGasLimitDefault = 400_000\n\n\t\t\t\t[Capabilities.ExternalRegistry]\n\t\t\t\tAddress = '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512'\n\t\t\t\tNetworkID = 'evm'\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[Capabilities.WorkflowRegistry]\n\t\t\t\tAddress = \"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9\"\n\t\t\t\tNetworkID = \"evm\"\n\t\t\t\tChainID = \"1337\"\n\n\t\t\t\t[Capabilities.GatewayConnector]\n\t\t\t\tDonID = \"1\"\n\t\t\t\tChainIDForNodeKey = \"1337\"\n\t\t\t\tNodeAddress = '0x01EcEe29ac18D849717Cf3f5D699B419424B9582'\n\n\t\t\t\t[[Capabilities.GatewayConnector.Gateways]]\n\t\t\t\tId = \"por_gateway\"\n\t\t\t\tURL = \"ws://node0:5003/node\"\n\t\t\t" +test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@node0:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@node0:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-20bf8:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-20bf8:8545'\n\n\t\t\t\t[EVM.Workflow]\n\t\t\t\tFromAddress = '0x115a95F02DDfe904A23431142342B23344BEfd94'\n\t\t\t\tForwarderAddress = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9'\n\t\t\t\tGasLimitDefault = 400_000\n\n\t\t\t\t[Capabilities.ExternalRegistry]\n\t\t\t\tAddress = '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512'\n\t\t\t\tNetworkID = 'evm'\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[Capabilities.WorkflowRegistry]\n\t\t\t\tAddress = \"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9\"\n\t\t\t\tNetworkID = \"evm\"\n\t\t\t\tChainID = \"1337\"\n\n\t\t\t\t[Capabilities.GatewayConnector]\n\t\t\t\tDonID = \"1\"\n\t\t\t\tChainIDForNodeKey = \"1337\"\n\t\t\t\tNodeAddress = '0x115a95F02DDfe904A23431142342B23344BEfd94'\n\n\t\t\t\t[[Capabilities.GatewayConnector.Gateways]]\n\t\t\t\tId = \"por_gateway\"\n\t\t\t\tURL = \"ws://node0:5003/node\"\n\t\t\t" user_config_overrides = " [Feature]\n\t\t\tLogPoller = true\n\n\t\t\t[OCR2]\n\t\t\tEnabled = true\n\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t[P2P.V2]\n\t\t\tEnabled = true\n\t\t\tListenAddresses = ['0.0.0.0:5001']\n " test_secrets_overrides = '' user_secrets_overrides = '' @@ -80,9 +80,9 @@ name = '' docker_file = 'plugins/chainlink.Dockerfile' docker_ctx = '../..' pull_image = false -capabilities = ['./streams-linux-amd64', './cron-linux-amd64'] +capabilities = ['./cron-linux-amd64'] capabilities_container_dir = '' -test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@node0:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@node0:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-940e6:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-940e6:8545'\n\n\t\t\t\t[EVM.Workflow]\n\t\t\t\tFromAddress = '0x5c15059bF2bCe32765B09CCa224E2854039CAC3c'\n\t\t\t\tForwarderAddress = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9'\n\t\t\t\tGasLimitDefault = 400_000\n\n\t\t\t\t[Capabilities.ExternalRegistry]\n\t\t\t\tAddress = '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512'\n\t\t\t\tNetworkID = 'evm'\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[Capabilities.WorkflowRegistry]\n\t\t\t\tAddress = \"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9\"\n\t\t\t\tNetworkID = \"evm\"\n\t\t\t\tChainID = \"1337\"\n\n\t\t\t\t[Capabilities.GatewayConnector]\n\t\t\t\tDonID = \"1\"\n\t\t\t\tChainIDForNodeKey = \"1337\"\n\t\t\t\tNodeAddress = '0x5c15059bF2bCe32765B09CCa224E2854039CAC3c'\n\n\t\t\t\t[[Capabilities.GatewayConnector.Gateways]]\n\t\t\t\tId = \"por_gateway\"\n\t\t\t\tURL = \"ws://node0:5003/node\"\n\t\t\t" +test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@node0:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@node0:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-20bf8:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-20bf8:8545'\n\n\t\t\t\t[EVM.Workflow]\n\t\t\t\tFromAddress = '0x63F966C47CCd0c2758fad34E80E1664117ff39BE'\n\t\t\t\tForwarderAddress = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9'\n\t\t\t\tGasLimitDefault = 400_000\n\n\t\t\t\t[Capabilities.ExternalRegistry]\n\t\t\t\tAddress = '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512'\n\t\t\t\tNetworkID = 'evm'\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[Capabilities.WorkflowRegistry]\n\t\t\t\tAddress = \"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9\"\n\t\t\t\tNetworkID = \"evm\"\n\t\t\t\tChainID = \"1337\"\n\n\t\t\t\t[Capabilities.GatewayConnector]\n\t\t\t\tDonID = \"1\"\n\t\t\t\tChainIDForNodeKey = \"1337\"\n\t\t\t\tNodeAddress = '0x63F966C47CCd0c2758fad34E80E1664117ff39BE'\n\n\t\t\t\t[[Capabilities.GatewayConnector.Gateways]]\n\t\t\t\tId = \"por_gateway\"\n\t\t\t\tURL = \"ws://node0:5003/node\"\n\t\t\t" user_config_overrides = " [Feature]\n\t\t\tLogPoller = true\n\n\t\t\t[OCR2]\n\t\t\tEnabled = true\n\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t[P2P.V2]\n\t\t\tEnabled = true\n\t\t\tListenAddresses = ['0.0.0.0:5001']\n " test_secrets_overrides = '' user_secrets_overrides = '' @@ -98,9 +98,9 @@ name = '' docker_file = 'plugins/chainlink.Dockerfile' docker_ctx = '../..' pull_image = false -capabilities = ['./streams-linux-amd64', './cron-linux-amd64'] +capabilities = ['./cron-linux-amd64'] capabilities_container_dir = '' -test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@node0:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@node0:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-940e6:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-940e6:8545'\n\n\t\t\t\t[EVM.Workflow]\n\t\t\t\tFromAddress = '0xeEaF950304624c300D4F37a90B803773B7cf3f8f'\n\t\t\t\tForwarderAddress = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9'\n\t\t\t\tGasLimitDefault = 400_000\n\n\t\t\t\t[Capabilities.ExternalRegistry]\n\t\t\t\tAddress = '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512'\n\t\t\t\tNetworkID = 'evm'\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[Capabilities.WorkflowRegistry]\n\t\t\t\tAddress = \"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9\"\n\t\t\t\tNetworkID = \"evm\"\n\t\t\t\tChainID = \"1337\"\n\n\t\t\t\t[Capabilities.GatewayConnector]\n\t\t\t\tDonID = \"1\"\n\t\t\t\tChainIDForNodeKey = \"1337\"\n\t\t\t\tNodeAddress = '0xeEaF950304624c300D4F37a90B803773B7cf3f8f'\n\n\t\t\t\t[[Capabilities.GatewayConnector.Gateways]]\n\t\t\t\tId = \"por_gateway\"\n\t\t\t\tURL = \"ws://node0:5003/node\"\n\t\t\t" +test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@node0:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@node0:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-20bf8:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-20bf8:8545'\n\n\t\t\t\t[EVM.Workflow]\n\t\t\t\tFromAddress = '0x384f432f5eB4970f24852eF77846104d1F66EBc5'\n\t\t\t\tForwarderAddress = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9'\n\t\t\t\tGasLimitDefault = 400_000\n\n\t\t\t\t[Capabilities.ExternalRegistry]\n\t\t\t\tAddress = '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512'\n\t\t\t\tNetworkID = 'evm'\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[Capabilities.WorkflowRegistry]\n\t\t\t\tAddress = \"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9\"\n\t\t\t\tNetworkID = \"evm\"\n\t\t\t\tChainID = \"1337\"\n\n\t\t\t\t[Capabilities.GatewayConnector]\n\t\t\t\tDonID = \"1\"\n\t\t\t\tChainIDForNodeKey = \"1337\"\n\t\t\t\tNodeAddress = '0x384f432f5eB4970f24852eF77846104d1F66EBc5'\n\n\t\t\t\t[[Capabilities.GatewayConnector.Gateways]]\n\t\t\t\tId = \"por_gateway\"\n\t\t\t\tURL = \"ws://node0:5003/node\"\n\t\t\t" user_config_overrides = " [Feature]\n\t\t\tLogPoller = true\n\n\t\t\t[OCR2]\n\t\t\tEnabled = true\n\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t[P2P.V2]\n\t\t\tEnabled = true\n\t\t\tListenAddresses = ['0.0.0.0:5001']\n " test_secrets_overrides = '' user_secrets_overrides = '' @@ -116,9 +116,9 @@ name = '' docker_file = 'plugins/chainlink.Dockerfile' docker_ctx = '../..' pull_image = false -capabilities = ['./streams-linux-amd64', './cron-linux-amd64'] +capabilities = ['./cron-linux-amd64'] capabilities_container_dir = '' -test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@node0:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWFkWLQNJcn1sZYxEUs8JnboUrW5NUJXBUPzjD4Aek7NgA@node0:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-940e6:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-940e6:8545'\n\n\t\t\t\t[EVM.Workflow]\n\t\t\t\tFromAddress = '0x64896d590294a3EB6A60069b29d066a1F22683f7'\n\t\t\t\tForwarderAddress = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9'\n\t\t\t\tGasLimitDefault = 400_000\n\n\t\t\t\t[Capabilities.ExternalRegistry]\n\t\t\t\tAddress = '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512'\n\t\t\t\tNetworkID = 'evm'\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[Capabilities.WorkflowRegistry]\n\t\t\t\tAddress = \"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9\"\n\t\t\t\tNetworkID = \"evm\"\n\t\t\t\tChainID = \"1337\"\n\n\t\t\t\t[Capabilities.GatewayConnector]\n\t\t\t\tDonID = \"1\"\n\t\t\t\tChainIDForNodeKey = \"1337\"\n\t\t\t\tNodeAddress = '0x64896d590294a3EB6A60069b29d066a1F22683f7'\n\n\t\t\t\t[[Capabilities.GatewayConnector.Gateways]]\n\t\t\t\tId = \"por_gateway\"\n\t\t\t\tURL = \"ws://node0:5003/node\"\n\t\t\t" +test_config_overrides = "\n\t\t\t\t[Feature]\n\t\t\t\tLogPoller = true\n\n\t\t\t\t[OCR2]\n\t\t\t\tEnabled = true\n\t\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t\t[P2P.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:5001']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@node0:5001']\n\n\t\t\t\t[Capabilities.Peering.V2]\n\t\t\t\tEnabled = true\n\t\t\t\tListenAddresses = ['0.0.0.0:6690']\n\t\t\t\t# assuming that node0 is the bootstrap node\n\t\t\t\tDefaultBootstrappers = ['12D3KooWL3GF4qwx9jBuhnmdLhtJnhNCCfcd7HLRKLUpCkUxwnU9@node0:6690']\n\n\t\t\t\t# This is needed for the target capability to be initialized\n\t\t\t\t[[EVM]]\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[[EVM.Nodes]]\n\t\t\t\tName = 'anvil'\n\t\t\t\tWSURL = 'ws://blockchain-node-20bf8:8545'\n\t\t\t\tHTTPURL = 'http://blockchain-node-20bf8:8545'\n\n\t\t\t\t[EVM.Workflow]\n\t\t\t\tFromAddress = '0x3190382b6a5003288D3d428A2BA28f59004D0be6'\n\t\t\t\tForwarderAddress = '0xCf7Ed3AccA5a467e9e704C703E8D87F634fB0Fc9'\n\t\t\t\tGasLimitDefault = 400_000\n\n\t\t\t\t[Capabilities.ExternalRegistry]\n\t\t\t\tAddress = '0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512'\n\t\t\t\tNetworkID = 'evm'\n\t\t\t\tChainID = '1337'\n\n\t\t\t\t[Capabilities.WorkflowRegistry]\n\t\t\t\tAddress = \"0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9\"\n\t\t\t\tNetworkID = \"evm\"\n\t\t\t\tChainID = \"1337\"\n\n\t\t\t\t[Capabilities.GatewayConnector]\n\t\t\t\tDonID = \"1\"\n\t\t\t\tChainIDForNodeKey = \"1337\"\n\t\t\t\tNodeAddress = '0x3190382b6a5003288D3d428A2BA28f59004D0be6'\n\n\t\t\t\t[[Capabilities.GatewayConnector.Gateways]]\n\t\t\t\tId = \"por_gateway\"\n\t\t\t\tURL = \"ws://node0:5003/node\"\n\t\t\t" user_config_overrides = " [Feature]\n\t\t\tLogPoller = true\n\n\t\t\t[OCR2]\n\t\t\tEnabled = true\n\t\t\tDatabaseTimeout = '1s'\n\n\t\t\t[P2P.V2]\n\t\t\tEnabled = true\n\t\t\tListenAddresses = ['0.0.0.0:5001']\n " test_secrets_overrides = '' user_secrets_overrides = '' @@ -132,8 +132,8 @@ use_cache = true [nodeset.out.db_out] url = 'postgresql://chainlink:thispasswordislongenough@127.0.0.1:13000/chainlink?sslmode=disable' -container_name = 'ns-postgresql-bc3de' -docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-bc3de:5432/chainlink?sslmode=disable' +container_name = 'ns-postgresql-63207' +docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-63207:5432/chainlink?sslmode=disable' jd_url = '' jd_docker_internal_url = '' @@ -152,7 +152,7 @@ internal_ip = '172.18.0.4' [nodeset.out.cl_nodes.postgresql] url = 'postgresql://chainlink:thispasswordislongenough@127.0.0.1:13000/db_0?sslmode=disable' container_name = '' -docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-bc3de:5432/db_0?sslmode=disable' +docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-63207:5432/db_0?sslmode=disable' jd_url = '' jd_docker_internal_url = '' @@ -166,12 +166,12 @@ container_name = 'node1' url = 'http://127.0.0.1:10001' docker_internal_url = 'http://node1:6688' p2p_docker_internal_url = 'http://node1:6690' -internal_ip = '172.18.0.7' +internal_ip = '172.18.0.8' [nodeset.out.cl_nodes.postgresql] url = 'postgresql://chainlink:thispasswordislongenough@127.0.0.1:13000/db_1?sslmode=disable' container_name = '' -docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-bc3de:5432/db_1?sslmode=disable' +docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-63207:5432/db_1?sslmode=disable' jd_url = '' jd_docker_internal_url = '' @@ -185,12 +185,12 @@ container_name = 'node2' url = 'http://127.0.0.1:10002' docker_internal_url = 'http://node2:6688' p2p_docker_internal_url = 'http://node2:6690' -internal_ip = '172.18.0.5' +internal_ip = '172.18.0.6' [nodeset.out.cl_nodes.postgresql] url = 'postgresql://chainlink:thispasswordislongenough@127.0.0.1:13000/db_2?sslmode=disable' container_name = '' -docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-bc3de:5432/db_2?sslmode=disable' +docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-63207:5432/db_2?sslmode=disable' jd_url = '' jd_docker_internal_url = '' @@ -204,12 +204,12 @@ container_name = 'node3' url = 'http://127.0.0.1:10003' docker_internal_url = 'http://node3:6688' p2p_docker_internal_url = 'http://node3:6690' -internal_ip = '172.18.0.6' +internal_ip = '172.18.0.7' [nodeset.out.cl_nodes.postgresql] url = 'postgresql://chainlink:thispasswordislongenough@127.0.0.1:13000/db_3?sslmode=disable' container_name = '' -docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-bc3de:5432/db_3?sslmode=disable' +docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-63207:5432/db_3?sslmode=disable' jd_url = '' jd_docker_internal_url = '' @@ -223,11 +223,11 @@ container_name = 'node4' url = 'http://127.0.0.1:10004' docker_internal_url = 'http://node4:6688' p2p_docker_internal_url = 'http://node4:6690' -internal_ip = '172.18.0.8' +internal_ip = '172.18.0.5' [nodeset.out.cl_nodes.postgresql] url = 'postgresql://chainlink:thispasswordislongenough@127.0.0.1:13000/db_4?sslmode=disable' container_name = '' -docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-bc3de:5432/db_4?sslmode=disable' +docker_internal_url = 'postgresql://chainlink:thispasswordislongenough@ns-postgresql-63207:5432/db_4?sslmode=disable' jd_url = '' jd_docker_internal_url = '' diff --git a/integration-tests/capabilities/environment.toml b/integration-tests/capabilities/environment.toml index 6de37c9d199..f60c1e989e8 100644 --- a/integration-tests/capabilities/environment.toml +++ b/integration-tests/capabilities/environment.toml @@ -31,7 +31,7 @@ [[nodeset.node_specs]] [nodeset.node_specs.node] - capabilities = ["./streams-linux-amd64", "./cron-linux-amd64"] + capabilities = ["./cron-linux-amd64"] docker_ctx = "../.." docker_file = "plugins/chainlink.Dockerfile" user_config_overrides = """ @@ -50,7 +50,7 @@ [[nodeset.node_specs]] [nodeset.node_specs.node] - capabilities = ["./streams-linux-amd64", "./cron-linux-amd64"] + capabilities = ["./cron-linux-amd64"] docker_ctx = "../.." docker_file = "plugins/chainlink.Dockerfile" user_config_overrides = """ @@ -69,7 +69,7 @@ [[nodeset.node_specs]] [nodeset.node_specs.node] - capabilities = ["./streams-linux-amd64", "./cron-linux-amd64"] + capabilities = ["./cron-linux-amd64"] docker_ctx = "../.." docker_file = "plugins/chainlink.Dockerfile" user_config_overrides = """ @@ -88,7 +88,7 @@ [[nodeset.node_specs]] [nodeset.node_specs.node] - capabilities = ["./streams-linux-amd64", "./cron-linux-amd64"] + capabilities = ["./cron-linux-amd64"] docker_ctx = "../.." docker_file = "plugins/chainlink.Dockerfile" user_config_overrides = """ diff --git a/integration-tests/capabilities/streams-linux-amd64 b/integration-tests/capabilities/streams-linux-amd64 deleted file mode 100755 index 1f311c023c5..00000000000 Binary files a/integration-tests/capabilities/streams-linux-amd64 and /dev/null differ diff --git a/integration-tests/capabilities/workflow_test.go b/integration-tests/capabilities/workflow_test.go index a5aa686d229..1bc3bd58b57 100644 --- a/integration-tests/capabilities/workflow_test.go +++ b/integration-tests/capabilities/workflow_test.go @@ -336,12 +336,6 @@ func TestWorkflow(t *testing.T) { require.NoError(t, capabilitiesRegistryInstance.AddCapabilities( []cr_wrapper.CapabilitiesRegistryCapability{ - { - LabelledName: "mock-streams-trigger", - Version: "1.0.0", - CapabilityType: 0, // TRIGGER - ResponseType: 0, // REPORT - }, { LabelledName: "offchain_reporting", Version: "1.0.0", @@ -749,17 +743,6 @@ func TestWorkflow(t *testing.T) { wg.Add(1) go func() { defer wg.Done() - - scJobSpec := ` - type = "standardcapabilities" - schemaVersion = 1 - name = "streams-capabilities" - command="/home/capabilities/streams-linux-amd64" - ` - response, _, err2 := nodeClient.CreateJobRaw(scJobSpec) - assert.NoError(t, err2) - assert.Empty(t, response.Errors) - cronJobSpec := ` type = "standardcapabilities" schemaVersion = 1 @@ -769,8 +752,8 @@ func TestWorkflow(t *testing.T) { config = "" ` - response, _, err3 := nodeClient.CreateJobRaw(cronJobSpec) - assert.NoError(t, err3) + response, _, errCron := nodeClient.CreateJobRaw(cronJobSpec) + assert.NoError(t, errCron) assert.Empty(t, response.Errors) computeJobSpec := ` @@ -789,8 +772,8 @@ func TestWorkflow(t *testing.T) { """ ` - response, _, err4 := nodeClient.CreateJobRaw(computeJobSpec) - assert.NoError(t, err4) + response, _, errCompute := nodeClient.CreateJobRaw(computeJobSpec) + assert.NoError(t, errCompute) assert.Empty(t, response.Errors) consensusJobSpec := fmt.Sprintf(` @@ -830,8 +813,8 @@ func TestWorkflow(t *testing.T) { nodesInfo[i].OcrKeyBundleID, ) fmt.Println("consensusJobSpec", consensusJobSpec) - response, _, err2 = nodeClient.CreateJobRaw(consensusJobSpec) - assert.NoError(t, err2) + response, _, errCons := nodeClient.CreateJobRaw(consensusJobSpec) + assert.NoError(t, errCons) assert.Empty(t, response.Errors) }() } @@ -904,10 +887,6 @@ func TestWorkflow(t *testing.T) { CapabilityId: capabilitiesRegistryInstance.ExistingHashedCapabilitiesIDs[3], Config: []byte(""), }, - { - CapabilityId: capabilitiesRegistryInstance.ExistingHashedCapabilitiesIDs[4], - Config: []byte(""), - }, }, true, // is public true, // accepts workflows