Stores onchain_signing_strategy values in the DB

smartcontractkit · Apr 22, 2024 · d65d070 · d65d070
1 parent f89596a
commit d65d070
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/core/services/job/job_orm_test.go b/core/services/job/job_orm_test.go
@@ -67,6 +67,11 @@ observationSource = """
 chainID = 1
 fromBlock = 1000
 
+[onchainSigningStrategy]
+strategyName = 'single-chain'
+[onchainSigningStrategy.config]
+publicKey = '8fa807463ad73f9ee855cfd60ba406dcf98a2855b3dd8af613107b0f6890a707'
+
 [pluginConfig]
 serverURL = 'wss://localhost:8080'
 serverPubKey = '8fa807463ad73f9ee855cfd60ba406dcf98a2855b3dd8af613107b0f6890a707'

diff --git a/core/services/job/orm.go b/core/services/job/orm.go
@@ -284,10 +284,10 @@ func (o *orm) CreateJob(jb *Job, qopts ...pg.QOpt) error {
 				}
 			}
 
-			sql := `INSERT INTO ocr2_oracle_specs (contract_id, feed_id, relay, relay_config, plugin_type, plugin_config, p2pv2_bootstrappers, ocr_key_bundle_id, transmitter_id,
+			sql := `INSERT INTO ocr2_oracle_specs (contract_id, feed_id, relay, relay_config, plugin_type, plugin_config, onchain_signing_strategy, p2pv2_bootstrappers, ocr_key_bundle_id, transmitter_id,
 					blockchain_timeout, contract_config_tracker_poll_interval, contract_config_confirmations,
 					created_at, updated_at)
-			VALUES (:contract_id, :feed_id, :relay, :relay_config, :plugin_type, :plugin_config, :p2pv2_bootstrappers, :ocr_key_bundle_id, :transmitter_id,
+			VALUES (:contract_id, :feed_id, :relay, :relay_config, :plugin_type, :plugin_config, :onchain_signing_strategy, :p2pv2_bootstrappers, :ocr_key_bundle_id, :transmitter_id,
 					 :blockchain_timeout, :contract_config_tracker_poll_interval, :contract_config_confirmations,
 					NOW(), NOW())
 			RETURNING id;`

diff --git a/core/services/ocr2/database_test.go b/core/services/ocr2/database_test.go
@@ -41,9 +41,9 @@ func MustInsertOCROracleSpec(t *testing.T, db *sqlx.DB, transmitterAddress types
 
 	require.NoError(t, db.Get(&spec, `INSERT INTO ocr2_oracle_specs (
 relay, relay_config, contract_id, p2pv2_bootstrappers, ocr_key_bundle_id, monitoring_endpoint, transmitter_id, 
-blockchain_timeout, contract_config_tracker_poll_interval, contract_config_confirmations, plugin_type, plugin_config, created_at, updated_at) VALUES (
+blockchain_timeout, contract_config_tracker_poll_interval, contract_config_confirmations, plugin_type, plugin_config, onchain_signing_strategy, created_at, updated_at) VALUES (
 'ethereum', '{}', $1, '{}', $2, $3, $4,
-0, 0, 0, 'median', $5, NOW(), NOW()
+0, 0, 0, 'median', $5, '$', NOW(), NOW()
 ) RETURNING *`, cltest.NewEIP55Address().String(), cltest.DefaultOCR2KeyBundleID, "chain.link:1234", transmitterAddress.String(), jsonConfig))
 	return spec
 }

diff --git a/core/store/migrate/migrations/0234_generic_plugin_multichain_keybundle_.sql b/core/store/migrate/migrations/0234_generic_plugin_multichain_keybundle_.sql
@@ -0,0 +1,11 @@
+-- +goose Up
+-- +goose StatementBegin
+ALTER TABLE ocr2_oracle_specs
+    ADD COLUMN onchain_signing_strategy JSONB NOT NULL DEFAULT '{}';
+-- +goose StatementEnd
+
+-- +goose Down
+-- +goose StatementBegin
+ALTER TABLE ocr2_oracle_specs
+    DROP COLUMN onchain_signing_strategy;
+-- +goose StatementEnd