diff --git a/.changeset/four-eggs-invite.md b/.changeset/four-eggs-invite.md new file mode 100644 index 00000000000..46dac304a10 --- /dev/null +++ b/.changeset/four-eggs-invite.md @@ -0,0 +1,5 @@ +--- +"chainlink": patch +--- + +configuration updates diff --git a/core/config/capabilities_config.go b/core/config/capabilities_config.go index 45f2d740329..2e239b43673 100644 --- a/core/config/capabilities_config.go +++ b/core/config/capabilities_config.go @@ -11,17 +11,17 @@ type CapabilitiesExternalRegistry interface { RelayID() types.RelayID } -type GatewayConnectorConfig interface { +type GatewayConnector interface { ChainIDForNodeKey() string NodeAddress() string DonID() string - Gateways() []ConnectorGatewayConfig + Gateways() []ConnectorGateway WsHandshakeTimeoutMillis() uint32 AuthMinChallengeLen() int AuthTimestampToleranceSec() uint32 } -type ConnectorGatewayConfig interface { +type ConnectorGateway interface { ID() string URL() string } @@ -30,5 +30,5 @@ type Capabilities interface { Peering() P2P Dispatcher() Dispatcher ExternalRegistry() CapabilitiesExternalRegistry - GatewayConnectorConfig() GatewayConnectorConfig + GatewayConnector() GatewayConnector } diff --git a/core/config/docs/core.toml b/core/config/docs/core.toml index fbba4ca9376..3f0ee8ac4f0 100644 --- a/core/config/docs/core.toml +++ b/core/config/docs/core.toml @@ -509,25 +509,25 @@ DeltaReconcile = '1m' # Default # but the host and port must be fully specified and cannot be empty. You can specify `0.0.0.0` (IPv4) or `::` (IPv6) to listen on all interfaces, but that is not recommended. ListenAddresses = ['1.2.3.4:9999', '[a52d:0:a88:1274::abcd]:1337'] # Example -[Capabilities.GatewayConnectorConfig] -# ChainIDForNodeKey is the ChainID of the network -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' # Default -# NodeAddress is Workflow Node address +[Capabilities.GatewayConnector] +# ChainIDForNodeKey is the ChainID of the network associated with a private key to be used for authentication with Gateway nodes +ChainIDForNodeKey = '11155111' # Example +# NodeAddress is the address of the desired private key to be used for authentication with Gateway nodes NodeAddress = '0x68902d681c28119f9b2531473a417088bf008e59' # Example # DonID is the Id of the Don DonID = 'example_don' # Example # WsHandshakeTimeoutMillis is Websocket handshake timeout WsHandshakeTimeoutMillis = 1000 # Example -# AuthMinChallengeLen is the minimum number of bytes in Authentication +# AuthMinChallengeLen is the minimum number of bytes in authentication challenge payload AuthMinChallengeLen = 10 # Example # AuthTimestampToleranceSec is Authentication timestamp tolerance AuthTimestampToleranceSec = 10 # Example -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] # ID of the Gateway ID = 'example_gateway' # Example # URL of the Gateway -URL = 'ws://localhost:8081/node' # Example +URL = 'wss://localhost:8081/node' # Example [Keeper] # **ADVANCED** diff --git a/core/config/toml/types.go b/core/config/toml/types.go index 8adadcf412d..29386dc3156 100644 --- a/core/config/toml/types.go +++ b/core/config/toml/types.go @@ -1480,17 +1480,17 @@ func (drl *DispatcherRateLimit) setFrom(f *DispatcherRateLimit) { } } -type GatewayConnectorConfig struct { +type GatewayConnector struct { ChainIDForNodeKey *string NodeAddress *string DonID *string - Gateways []ConnectorGatewayConfig + Gateways []ConnectorGateway WsHandshakeTimeoutMillis *uint32 AuthMinChallengeLen *int AuthTimestampToleranceSec *uint32 } -func (r *GatewayConnectorConfig) setFrom(f *GatewayConnectorConfig) { +func (r *GatewayConnector) setFrom(f *GatewayConnector) { if f.ChainIDForNodeKey != nil { r.ChainIDForNodeKey = f.ChainIDForNodeKey } @@ -1503,7 +1503,6 @@ func (r *GatewayConnectorConfig) setFrom(f *GatewayConnectorConfig) { r.DonID = f.DonID } - // TODO: verify this copy by reference is ok, or does array need to be copied by value if f.Gateways != nil { r.Gateways = f.Gateways } @@ -1521,23 +1520,23 @@ func (r *GatewayConnectorConfig) setFrom(f *GatewayConnectorConfig) { } } -type ConnectorGatewayConfig struct { +type ConnectorGateway struct { ID *string URL *string } type Capabilities struct { - Peering P2P `toml:",omitempty"` - Dispatcher Dispatcher `toml:",omitempty"` - ExternalRegistry ExternalRegistry `toml:",omitempty"` - GatewayConnectorConfig GatewayConnectorConfig `toml:", omitempty"` + Peering P2P `toml:",omitempty"` + Dispatcher Dispatcher `toml:",omitempty"` + ExternalRegistry ExternalRegistry `toml:",omitempty"` + GatewayConnector GatewayConnector `toml:",omitempty"` } func (c *Capabilities) setFrom(f *Capabilities) { c.Peering.setFrom(&f.Peering) c.ExternalRegistry.setFrom(&f.ExternalRegistry) c.Dispatcher.setFrom(&f.Dispatcher) - c.GatewayConnectorConfig.setFrom(&f.GatewayConnectorConfig) + c.GatewayConnector.setFrom(&f.GatewayConnector) } type ThresholdKeyShareSecrets struct { diff --git a/core/services/chainlink/config_capabilities.go b/core/services/chainlink/config_capabilities.go index 8f4d5e2c27c..b2bab4a6dcf 100644 --- a/core/services/chainlink/config_capabilities.go +++ b/core/services/chainlink/config_capabilities.go @@ -62,9 +62,9 @@ func (r *dispatcherRateLimit) PerSenderBurst() int { return *r.r.PerSenderBurst } -func (c *capabilitiesConfig) GatewayConnectorConfig() config.GatewayConnectorConfig { - return &gatewayConnectorConfig{ - c: c.c.GatewayConnectorConfig, +func (c *capabilitiesConfig) GatewayConnector() config.GatewayConnector { + return &gatewayConnector{ + c: c.c.GatewayConnector, } } @@ -88,49 +88,49 @@ func (c *capabilitiesExternalRegistry) Address() string { return *c.c.Address } -type gatewayConnectorConfig struct { - c toml.GatewayConnectorConfig +type gatewayConnector struct { + c toml.GatewayConnector } -func (c *gatewayConnectorConfig) ChainIDForNodeKey() string { +func (c *gatewayConnector) ChainIDForNodeKey() string { return *c.c.ChainIDForNodeKey } -func (c *gatewayConnectorConfig) NodeAddress() string { +func (c *gatewayConnector) NodeAddress() string { return *c.c.NodeAddress } -func (c *gatewayConnectorConfig) DonID() string { +func (c *gatewayConnector) DonID() string { return *c.c.DonID } -func (c *gatewayConnectorConfig) Gateways() []config.ConnectorGatewayConfig { - t := []config.ConnectorGatewayConfig{} +func (c *gatewayConnector) Gateways() []config.ConnectorGateway { + t := []config.ConnectorGateway{} for index, element := range c.c.Gateways { - t[index] = &connectorGatewayConfig{element} + t[index] = &connectorGateway{element} } return t } -func (c *gatewayConnectorConfig) WsHandshakeTimeoutMillis() uint32 { +func (c *gatewayConnector) WsHandshakeTimeoutMillis() uint32 { return *c.c.WsHandshakeTimeoutMillis } -func (c *gatewayConnectorConfig) AuthMinChallengeLen() int { +func (c *gatewayConnector) AuthMinChallengeLen() int { return *c.c.AuthMinChallengeLen } -func (c *gatewayConnectorConfig) AuthTimestampToleranceSec() uint32 { +func (c *gatewayConnector) AuthTimestampToleranceSec() uint32 { return *c.c.AuthTimestampToleranceSec } -type connectorGatewayConfig struct { - c toml.ConnectorGatewayConfig +type connectorGateway struct { + c toml.ConnectorGateway } -func (c *connectorGatewayConfig) ID() string { +func (c *connectorGateway) ID() string { return *c.c.ID } -func (c *connectorGatewayConfig) URL() string { +func (c *connectorGateway) URL() string { return *c.c.URL } diff --git a/core/services/chainlink/config_test.go b/core/services/chainlink/config_test.go index 0aeea2555b0..a650517d1f3 100644 --- a/core/services/chainlink/config_test.go +++ b/core/services/chainlink/config_test.go @@ -462,15 +462,15 @@ func TestConfig_Marshal(t *testing.T) { PerSenderBurst: ptr(50), }, }, - GatewayConnectorConfig: toml.GatewayConnectorConfig{ - ChainIDForNodeKey: ptr("0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed"), - NodeAddress: ptr(""), - DonID: ptr(""), - WsHandshakeTimeoutMillis: ptr[uint32](0), - AuthMinChallengeLen: ptr[int](0), - AuthTimestampToleranceSec: ptr[uint32](0), - Gateways: []toml.ConnectorGatewayConfig{ - {ID: ptr(""), URL: ptr("")}, + GatewayConnector: toml.GatewayConnector{ + ChainIDForNodeKey: ptr("11155111"), + NodeAddress: ptr("0x68902d681c28119f9b2531473a417088bf008e59"), + DonID: ptr("example_don"), + WsHandshakeTimeoutMillis: ptr[uint32](100), + AuthMinChallengeLen: ptr[int](10), + AuthTimestampToleranceSec: ptr[uint32](10), + Gateways: []toml.ConnectorGateway{ + {ID: ptr("example_gateway"), URL: ptr("wss://localhost:8081/node")}, }, }, } diff --git a/core/services/chainlink/testdata/config-empty-effective.toml b/core/services/chainlink/testdata/config-empty-effective.toml index d446e07c5a4..9bddd2a9152 100644 --- a/core/services/chainlink/testdata/config-empty-effective.toml +++ b/core/services/chainlink/testdata/config-empty-effective.toml @@ -268,14 +268,14 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/core/services/chainlink/testdata/config-full.toml b/core/services/chainlink/testdata/config-full.toml index 506fc567e8a..20bfe78c1b4 100644 --- a/core/services/chainlink/testdata/config-full.toml +++ b/core/services/chainlink/testdata/config-full.toml @@ -278,17 +278,17 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' -NodeAddress = '' -DonID = '' -WsHandshakeTimeoutMillis = 0 -AuthMinChallengeLen = 0 -AuthTimestampToleranceSec = 0 - -[[Capabilities.GatewayConnectorConfig.Gateways]] -ID = '' -URL = '' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '11155111' +NodeAddress = '0x68902d681c28119f9b2531473a417088bf008e59' +DonID = 'example_don' +WsHandshakeTimeoutMillis = 100 +AuthMinChallengeLen = 10 +AuthTimestampToleranceSec = 10 + +[[Capabilities.GatewayConnector.Gateways]] +ID = 'example_gateway' +URL = 'wss://localhost:8081/node' [[EVM]] ChainID = '1' diff --git a/core/services/chainlink/testdata/config-multi-chain-effective.toml b/core/services/chainlink/testdata/config-multi-chain-effective.toml index 20270f7ab64..5c450fefe1b 100644 --- a/core/services/chainlink/testdata/config-multi-chain-effective.toml +++ b/core/services/chainlink/testdata/config-multi-chain-effective.toml @@ -268,15 +268,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/core/web/resolver/testdata/config-empty-effective.toml b/core/web/resolver/testdata/config-empty-effective.toml index d446e07c5a4..9bddd2a9152 100644 --- a/core/web/resolver/testdata/config-empty-effective.toml +++ b/core/web/resolver/testdata/config-empty-effective.toml @@ -268,14 +268,14 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/core/web/resolver/testdata/config-full.toml b/core/web/resolver/testdata/config-full.toml index 7d93b4c81a9..b031019ffb1 100644 --- a/core/web/resolver/testdata/config-full.toml +++ b/core/web/resolver/testdata/config-full.toml @@ -278,17 +278,17 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' -NodeAddress = '' -DonID = '' -WsHandshakeTimeoutMillis = 0 -AuthMinChallengeLen = 0 -AuthTimestampToleranceSec = 0 - -[[Capabilities.GatewayConnectorConfig.Gateways]] -ID = '' -URL = '' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '11155111' +NodeAddress = '0x68902d681c28119f9b2531473a417088bf008e59' +DonID = 'example_don' +WsHandshakeTimeoutMillis = 100 +AuthMinChallengeLen = 10 +AuthTimestampToleranceSec = 10 + +[[Capabilities.GatewayConnector.Gateways]] +ID = 'example_gateway' +URL = 'wss://localhost:8081/node' [[EVM]] ChainID = '1' diff --git a/core/web/resolver/testdata/config-multi-chain-effective.toml b/core/web/resolver/testdata/config-multi-chain-effective.toml index 24c514374c0..0b1cdf775d5 100644 --- a/core/web/resolver/testdata/config-multi-chain-effective.toml +++ b/core/web/resolver/testdata/config-multi-chain-effective.toml @@ -268,15 +268,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/docs/CONFIG.md b/docs/CONFIG.md index 02f571c06ed..4350374bb8a 100644 --- a/docs/CONFIG.md +++ b/docs/CONFIG.md @@ -1393,10 +1393,10 @@ ListenAddresses = ['1.2.3.4:9999', '[a52d:0:a88:1274::abcd]:1337'] # Example ListenAddresses is the addresses the peer will listen to on the network in `host:port` form as accepted by `net.Listen()`, but the host and port must be fully specified and cannot be empty. You can specify `0.0.0.0` (IPv4) or `::` (IPv6) to listen on all interfaces, but that is not recommended. -## Capabilities.GatewayConnectorConfig +## Capabilities.GatewayConnector ```toml -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' # Default +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '11155111' # Example NodeAddress = '0x68902d681c28119f9b2531473a417088bf008e59' # Example DonID = 'example_don' # Example WsHandshakeTimeoutMillis = 1000 # Example @@ -1407,15 +1407,15 @@ AuthTimestampToleranceSec = 10 # Example ### ChainIDForNodeKey ```toml -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' # Default +ChainIDForNodeKey = '11155111' # Example ``` -ChainIDForNodeKey is the ChainID of the network +ChainIDForNodeKey is the ChainID of the network associated with a private key to be used for authentication with Gateway nodes ### NodeAddress ```toml NodeAddress = '0x68902d681c28119f9b2531473a417088bf008e59' # Example ``` -NodeAddress is Workflow Node address +NodeAddress is the address of the desired private key to be used for authentication with Gateway nodes ### DonID ```toml @@ -1433,7 +1433,7 @@ WsHandshakeTimeoutMillis is Websocket handshake timeout ```toml AuthMinChallengeLen = 10 # Example ``` -AuthMinChallengeLen is the minimum number of bytes in Authentication +AuthMinChallengeLen is the minimum number of bytes in authentication challenge payload ### AuthTimestampToleranceSec ```toml @@ -1441,11 +1441,11 @@ AuthTimestampToleranceSec = 10 # Example ``` AuthTimestampToleranceSec is Authentication timestamp tolerance -## Capabilities.GatewayConnectorConfig.Gateways +## Capabilities.GatewayConnector.Gateways ```toml -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = 'example_gateway' # Example -URL = 'ws://localhost:8081/node' # Example +URL = 'wss://localhost:8081/node' # Example ``` @@ -1457,7 +1457,7 @@ ID of the Gateway ### URL ```toml -URL = 'ws://localhost:8081/node' # Example +URL = 'wss://localhost:8081/node' # Example ``` URL of the Gateway diff --git a/main_test.go b/main_test.go index 88bd35819a4..419a4af0517 100644 --- a/main_test.go +++ b/main_test.go @@ -60,7 +60,7 @@ func TestScripts(t *testing.T) { Dir: path, Setup: commonEnv, ContinueOnError: true, - UpdateScripts: true, // uncomment to update golden files + // UpdateScripts: true, // uncomment to update golden files }) }) return nil diff --git a/testdata/scripts/node/db/help.txtar b/testdata/scripts/node/db/help.txtar index c0f6b459320..ccdf3431786 100644 --- a/testdata/scripts/node/db/help.txtar +++ b/testdata/scripts/node/db/help.txtar @@ -9,11 +9,14 @@ USAGE: chainlink node db command [command options] [arguments...] COMMANDS: - version Display the current database version. - status Display the current database migration status. - migrate Migrate the database to the latest version. - rollback Roll back the database to a previous . Rolls back a single migration if no version specified. - delete-chain Commands for cleaning up chain specific db tables. WARNING: This will ERASE ALL chain specific data referred to by --type and --id options for the specified database, referred to by CL_DATABASE_URL env variable or by the Database.URL field in a secrets TOML config. + reset Drop, create and migrate database. Useful for setting up the database in order to run tests or resetting the dev database. WARNING: This will ERASE ALL DATA for the specified database, referred to by CL_DATABASE_URL env variable or by the Database.URL field in a secrets TOML config. + preparetest Reset database and load fixtures. + version Display the current database version. + status Display the current database migration status. + migrate Migrate the database to the latest version. + rollback Roll back the database to a previous . Rolls back a single migration if no version specified. + create-migration Create a new migration. + delete-chain Commands for cleaning up chain specific db tables. WARNING: This will ERASE ALL chain specific data referred to by --type and --id options for the specified database, referred to by CL_DATABASE_URL env variable or by the Database.URL field in a secrets TOML config. OPTIONS: --help, -h show help diff --git a/testdata/scripts/node/validate/default.txtar b/testdata/scripts/node/validate/default.txtar index 3e7358574de..04ecec5252e 100644 --- a/testdata/scripts/node/validate/default.txtar +++ b/testdata/scripts/node/validate/default.txtar @@ -280,15 +280,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/testdata/scripts/node/validate/defaults-override.txtar b/testdata/scripts/node/validate/defaults-override.txtar index a831a2834ee..c6b34a20449 100644 --- a/testdata/scripts/node/validate/defaults-override.txtar +++ b/testdata/scripts/node/validate/defaults-override.txtar @@ -341,15 +341,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar index fa67ceccf00..c8f326fd446 100644 --- a/testdata/scripts/node/validate/disk-based-logging-disabled.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-disabled.txtar @@ -324,15 +324,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar index 62cd10be01d..aba7ab87c28 100644 --- a/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar +++ b/testdata/scripts/node/validate/disk-based-logging-no-dir.txtar @@ -324,15 +324,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/testdata/scripts/node/validate/disk-based-logging.txtar b/testdata/scripts/node/validate/disk-based-logging.txtar index 9c93f189105..2930324254c 100644 --- a/testdata/scripts/node/validate/disk-based-logging.txtar +++ b/testdata/scripts/node/validate/disk-based-logging.txtar @@ -324,15 +324,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar index 33b32de2828..c8f8a5a0e17 100644 --- a/testdata/scripts/node/validate/invalid-ocr-p2p.txtar +++ b/testdata/scripts/node/validate/invalid-ocr-p2p.txtar @@ -309,15 +309,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/testdata/scripts/node/validate/invalid.txtar b/testdata/scripts/node/validate/invalid.txtar index 6ba97963981..e74e0358ba0 100644 --- a/testdata/scripts/node/validate/invalid.txtar +++ b/testdata/scripts/node/validate/invalid.txtar @@ -314,15 +314,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/testdata/scripts/node/validate/valid.txtar b/testdata/scripts/node/validate/valid.txtar index adb0243a98f..8abaa359582 100644 --- a/testdata/scripts/node/validate/valid.txtar +++ b/testdata/scripts/node/validate/valid.txtar @@ -321,15 +321,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = '' diff --git a/testdata/scripts/node/validate/warnings.txtar b/testdata/scripts/node/validate/warnings.txtar index b8ed7e13d41..5b2c7d80d7a 100644 --- a/testdata/scripts/node/validate/warnings.txtar +++ b/testdata/scripts/node/validate/warnings.txtar @@ -303,15 +303,15 @@ Address = '' NetworkID = 'evm' ChainID = '1' -[Capabilities.GatewayConnectorConfig] -ChainIDForNodeKey = '0xfd29Dd9C980D715a64dace97F7A2AB98bcaE0fed' +[Capabilities.GatewayConnector] +ChainIDForNodeKey = '' NodeAddress = '' DonID = '' WsHandshakeTimeoutMillis = 0 AuthMinChallengeLen = 0 AuthTimestampToleranceSec = 0 -[[Capabilities.GatewayConnectorConfig.Gateways]] +[[Capabilities.GatewayConnector.Gateways]] ID = '' URL = ''