From 1168674bdeaba1f0793e92b4600aaf8f1ff99cb5 Mon Sep 17 00:00:00 2001
From: Street <5597260+MStreet3@users.noreply.github.com>
Date: Mon, 25 Nov 2024 12:45:55 +0200
Subject: [PATCH 01/11] feat(workflows): adds orm methods for managing specs
 (#15356)

* feat(workflows): adds orm methods for managing specs

* refactor(migrations+job): use text instead of int for status in db

* chore(syncer/orm): fail on get with no rows found
---
 core/services/job/models.go                   |  27 ++-
 core/services/workflows/syncer/mocks/orm.go   | 168 ++++++++++++++----
 core/services/workflows/syncer/orm.go         | 115 +++++++++++-
 core/services/workflows/syncer/orm_test.go    | 145 +++++++++++++++
 .../0260_add_status_workflow_spec.sql         |   9 +
 5 files changed, 421 insertions(+), 43 deletions(-)
 create mode 100644 core/store/migrate/migrations/0260_add_status_workflow_spec.sql

diff --git a/core/services/job/models.go b/core/services/job/models.go
index 423a297c8da..26d563c7ac8 100644
--- a/core/services/job/models.go
+++ b/core/services/job/models.go
@@ -869,21 +869,30 @@ const (
 	DefaultSpecType                  = ""
 )
 
+type WorkflowSpecStatus string
+
+const (
+	WorkflowSpecStatusActive  WorkflowSpecStatus = "active"
+	WorkflowSpecStatusPaused  WorkflowSpecStatus = "paused"
+	WorkflowSpecStatusDefault WorkflowSpecStatus = ""
+)
+
 type WorkflowSpec struct {
 	ID       int32  `toml:"-"`
 	Workflow string `toml:"workflow"`           // the raw representation of the workflow
 	Config   string `toml:"config" db:"config"` // the raw representation of the config
 	// fields derived from the yaml spec, used for indexing the database
 	// note: i tried to make these private, but translating them to the database seems to require them to be public
-	WorkflowID    string           `toml:"-" db:"workflow_id"`    // Derived. Do not modify. the CID of the workflow.
-	WorkflowOwner string           `toml:"-" db:"workflow_owner"` // Derived. Do not modify. the owner of the workflow.
-	WorkflowName  string           `toml:"-" db:"workflow_name"`  // Derived. Do not modify. the name of the workflow.
-	BinaryURL     string           `db:"binary_url"`
-	ConfigURL     string           `db:"config_url"`
-	SecretsID     sql.NullInt64    `db:"secrets_id"`
-	CreatedAt     time.Time        `toml:"-"`
-	UpdatedAt     time.Time        `toml:"-"`
-	SpecType      WorkflowSpecType `toml:"spec_type" db:"spec_type"`
+	WorkflowID    string             `toml:"-" db:"workflow_id"`    // Derived. Do not modify. the CID of the workflow.
+	WorkflowOwner string             `toml:"-" db:"workflow_owner"` // Derived. Do not modify. the owner of the workflow.
+	WorkflowName  string             `toml:"-" db:"workflow_name"`  // Derived. Do not modify. the name of the workflow.
+	Status        WorkflowSpecStatus `db:"status"`
+	BinaryURL     string             `db:"binary_url"`
+	ConfigURL     string             `db:"config_url"`
+	SecretsID     sql.NullInt64      `db:"secrets_id"`
+	CreatedAt     time.Time          `toml:"-"`
+	UpdatedAt     time.Time          `toml:"-"`
+	SpecType      WorkflowSpecType   `toml:"spec_type" db:"spec_type"`
 	sdkWorkflow   *sdk.WorkflowSpec
 	rawSpec       []byte
 	config        []byte
diff --git a/core/services/workflows/syncer/mocks/orm.go b/core/services/workflows/syncer/mocks/orm.go
index 19c459fa0ee..2bb116cba4f 100644
--- a/core/services/workflows/syncer/mocks/orm.go
+++ b/core/services/workflows/syncer/mocks/orm.go
@@ -81,59 +81,50 @@ func (_c *ORM_Create_Call) RunAndReturn(run func(context.Context, string, string
 	return _c
 }
 
-// CreateWorkflowSpec provides a mock function with given fields: ctx, spec
-func (_m *ORM) CreateWorkflowSpec(ctx context.Context, spec *job.WorkflowSpec) (int64, error) {
-	ret := _m.Called(ctx, spec)
+// DeleteWorkflowSpec provides a mock function with given fields: ctx, owner, name
+func (_m *ORM) DeleteWorkflowSpec(ctx context.Context, owner string, name string) error {
+	ret := _m.Called(ctx, owner, name)
 
 	if len(ret) == 0 {
-		panic("no return value specified for CreateWorkflowSpec")
+		panic("no return value specified for DeleteWorkflowSpec")
 	}
 
-	var r0 int64
-	var r1 error
-	if rf, ok := ret.Get(0).(func(context.Context, *job.WorkflowSpec) (int64, error)); ok {
-		return rf(ctx, spec)
-	}
-	if rf, ok := ret.Get(0).(func(context.Context, *job.WorkflowSpec) int64); ok {
-		r0 = rf(ctx, spec)
+	var r0 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) error); ok {
+		r0 = rf(ctx, owner, name)
 	} else {
-		r0 = ret.Get(0).(int64)
+		r0 = ret.Error(0)
 	}
 
-	if rf, ok := ret.Get(1).(func(context.Context, *job.WorkflowSpec) error); ok {
-		r1 = rf(ctx, spec)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
+	return r0
 }
 
-// ORM_CreateWorkflowSpec_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'CreateWorkflowSpec'
-type ORM_CreateWorkflowSpec_Call struct {
+// ORM_DeleteWorkflowSpec_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'DeleteWorkflowSpec'
+type ORM_DeleteWorkflowSpec_Call struct {
 	*mock.Call
 }
 
-// CreateWorkflowSpec is a helper method to define mock.On call
+// DeleteWorkflowSpec is a helper method to define mock.On call
 //   - ctx context.Context
-//   - spec *job.WorkflowSpec
-func (_e *ORM_Expecter) CreateWorkflowSpec(ctx interface{}, spec interface{}) *ORM_CreateWorkflowSpec_Call {
-	return &ORM_CreateWorkflowSpec_Call{Call: _e.mock.On("CreateWorkflowSpec", ctx, spec)}
+//   - owner string
+//   - name string
+func (_e *ORM_Expecter) DeleteWorkflowSpec(ctx interface{}, owner interface{}, name interface{}) *ORM_DeleteWorkflowSpec_Call {
+	return &ORM_DeleteWorkflowSpec_Call{Call: _e.mock.On("DeleteWorkflowSpec", ctx, owner, name)}
 }
 
-func (_c *ORM_CreateWorkflowSpec_Call) Run(run func(ctx context.Context, spec *job.WorkflowSpec)) *ORM_CreateWorkflowSpec_Call {
+func (_c *ORM_DeleteWorkflowSpec_Call) Run(run func(ctx context.Context, owner string, name string)) *ORM_DeleteWorkflowSpec_Call {
 	_c.Call.Run(func(args mock.Arguments) {
-		run(args[0].(context.Context), args[1].(*job.WorkflowSpec))
+		run(args[0].(context.Context), args[1].(string), args[2].(string))
 	})
 	return _c
 }
 
-func (_c *ORM_CreateWorkflowSpec_Call) Return(_a0 int64, _a1 error) *ORM_CreateWorkflowSpec_Call {
-	_c.Call.Return(_a0, _a1)
+func (_c *ORM_DeleteWorkflowSpec_Call) Return(_a0 error) *ORM_DeleteWorkflowSpec_Call {
+	_c.Call.Return(_a0)
 	return _c
 }
 
-func (_c *ORM_CreateWorkflowSpec_Call) RunAndReturn(run func(context.Context, *job.WorkflowSpec) (int64, error)) *ORM_CreateWorkflowSpec_Call {
+func (_c *ORM_DeleteWorkflowSpec_Call) RunAndReturn(run func(context.Context, string, string) error) *ORM_DeleteWorkflowSpec_Call {
 	_c.Call.Return(run)
 	return _c
 }
@@ -425,6 +416,66 @@ func (_c *ORM_GetSecretsURLHash_Call) RunAndReturn(run func([]byte, []byte) ([]b
 	return _c
 }
 
+// GetWorkflowSpec provides a mock function with given fields: ctx, owner, name
+func (_m *ORM) GetWorkflowSpec(ctx context.Context, owner string, name string) (*job.WorkflowSpec, error) {
+	ret := _m.Called(ctx, owner, name)
+
+	if len(ret) == 0 {
+		panic("no return value specified for GetWorkflowSpec")
+	}
+
+	var r0 *job.WorkflowSpec
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) (*job.WorkflowSpec, error)); ok {
+		return rf(ctx, owner, name)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, string, string) *job.WorkflowSpec); ok {
+		r0 = rf(ctx, owner, name)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*job.WorkflowSpec)
+		}
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, string, string) error); ok {
+		r1 = rf(ctx, owner, name)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// ORM_GetWorkflowSpec_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetWorkflowSpec'
+type ORM_GetWorkflowSpec_Call struct {
+	*mock.Call
+}
+
+// GetWorkflowSpec is a helper method to define mock.On call
+//   - ctx context.Context
+//   - owner string
+//   - name string
+func (_e *ORM_Expecter) GetWorkflowSpec(ctx interface{}, owner interface{}, name interface{}) *ORM_GetWorkflowSpec_Call {
+	return &ORM_GetWorkflowSpec_Call{Call: _e.mock.On("GetWorkflowSpec", ctx, owner, name)}
+}
+
+func (_c *ORM_GetWorkflowSpec_Call) Run(run func(ctx context.Context, owner string, name string)) *ORM_GetWorkflowSpec_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(string), args[2].(string))
+	})
+	return _c
+}
+
+func (_c *ORM_GetWorkflowSpec_Call) Return(_a0 *job.WorkflowSpec, _a1 error) *ORM_GetWorkflowSpec_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *ORM_GetWorkflowSpec_Call) RunAndReturn(run func(context.Context, string, string) (*job.WorkflowSpec, error)) *ORM_GetWorkflowSpec_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // Update provides a mock function with given fields: ctx, secretsURL, contents
 func (_m *ORM) Update(ctx context.Context, secretsURL string, contents string) (int64, error) {
 	ret := _m.Called(ctx, secretsURL, contents)
@@ -483,6 +534,63 @@ func (_c *ORM_Update_Call) RunAndReturn(run func(context.Context, string, string
 	return _c
 }
 
+// UpsertWorkflowSpec provides a mock function with given fields: ctx, spec
+func (_m *ORM) UpsertWorkflowSpec(ctx context.Context, spec *job.WorkflowSpec) (int64, error) {
+	ret := _m.Called(ctx, spec)
+
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertWorkflowSpec")
+	}
+
+	var r0 int64
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *job.WorkflowSpec) (int64, error)); ok {
+		return rf(ctx, spec)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *job.WorkflowSpec) int64); ok {
+		r0 = rf(ctx, spec)
+	} else {
+		r0 = ret.Get(0).(int64)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *job.WorkflowSpec) error); ok {
+		r1 = rf(ctx, spec)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// ORM_UpsertWorkflowSpec_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpsertWorkflowSpec'
+type ORM_UpsertWorkflowSpec_Call struct {
+	*mock.Call
+}
+
+// UpsertWorkflowSpec is a helper method to define mock.On call
+//   - ctx context.Context
+//   - spec *job.WorkflowSpec
+func (_e *ORM_Expecter) UpsertWorkflowSpec(ctx interface{}, spec interface{}) *ORM_UpsertWorkflowSpec_Call {
+	return &ORM_UpsertWorkflowSpec_Call{Call: _e.mock.On("UpsertWorkflowSpec", ctx, spec)}
+}
+
+func (_c *ORM_UpsertWorkflowSpec_Call) Run(run func(ctx context.Context, spec *job.WorkflowSpec)) *ORM_UpsertWorkflowSpec_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*job.WorkflowSpec))
+	})
+	return _c
+}
+
+func (_c *ORM_UpsertWorkflowSpec_Call) Return(_a0 int64, _a1 error) *ORM_UpsertWorkflowSpec_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *ORM_UpsertWorkflowSpec_Call) RunAndReturn(run func(context.Context, *job.WorkflowSpec) (int64, error)) *ORM_UpsertWorkflowSpec_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // NewORM creates a new instance of ORM. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
 func NewORM(t interface {
diff --git a/core/services/workflows/syncer/orm.go b/core/services/workflows/syncer/orm.go
index d43dbe09b78..4a5be9d1a58 100644
--- a/core/services/workflows/syncer/orm.go
+++ b/core/services/workflows/syncer/orm.go
@@ -2,7 +2,8 @@ package syncer
 
 import (
 	"context"
-	"errors"
+	"database/sql"
+	"time"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
@@ -33,7 +34,15 @@ type WorkflowSecretsDS interface {
 }
 
 type WorkflowSpecsDS interface {
-	CreateWorkflowSpec(ctx context.Context, spec *job.WorkflowSpec) (int64, error)
+	// UpsertWorkflowSpec inserts or updates a workflow spec.  Updates on conflict of workflow name
+	// and owner
+	UpsertWorkflowSpec(ctx context.Context, spec *job.WorkflowSpec) (int64, error)
+
+	// GetWorkflowSpec returns the workflow spec for the given owner and name.
+	GetWorkflowSpec(ctx context.Context, owner, name string) (*job.WorkflowSpec, error)
+
+	// DeleteWorkflowSpec deletes the workflow spec for the given owner and name.
+	DeleteWorkflowSpec(ctx context.Context, owner, name string) error
 }
 
 type ORM interface {
@@ -149,6 +158,104 @@ func (orm *orm) GetSecretsURLHash(owner, secretsURL []byte) ([]byte, error) {
 	return crypto.Keccak256(append(owner, secretsURL...))
 }
 
-func (orm *orm) CreateWorkflowSpec(ctx context.Context, spec *job.WorkflowSpec) (int64, error) {
-	return 0, errors.New("not implemented")
+func (orm *orm) UpsertWorkflowSpec(ctx context.Context, spec *job.WorkflowSpec) (int64, error) {
+	var id int64
+
+	query := `
+		INSERT INTO workflow_specs (
+			workflow,
+			config,
+			workflow_id,
+			workflow_owner,
+			workflow_name,
+			status,
+			binary_url,
+			config_url,
+			secrets_id,
+			created_at,
+			updated_at,
+			spec_type
+		) VALUES (
+			:workflow,
+			:config,
+			:workflow_id,
+			:workflow_owner,
+			:workflow_name,
+			:status,
+			:binary_url,
+			:config_url,
+			:secrets_id,
+			:created_at,
+			:updated_at,
+			:spec_type
+		) ON CONFLICT (workflow_owner, workflow_name) DO UPDATE
+		SET
+			workflow = EXCLUDED.workflow,
+			config = EXCLUDED.config,
+			workflow_id = EXCLUDED.workflow_id,
+			workflow_owner = EXCLUDED.workflow_owner,
+			workflow_name = EXCLUDED.workflow_name,
+			status = EXCLUDED.status,
+			binary_url = EXCLUDED.binary_url,
+			config_url = EXCLUDED.config_url,
+			secrets_id = EXCLUDED.secrets_id,
+			created_at = EXCLUDED.created_at,
+			updated_at = EXCLUDED.updated_at,
+			spec_type = EXCLUDED.spec_type
+		RETURNING id
+	`
+
+	stmt, err := orm.ds.PrepareNamedContext(ctx, query)
+	if err != nil {
+		return 0, err
+	}
+	defer stmt.Close()
+
+	spec.UpdatedAt = time.Now()
+	err = stmt.QueryRowxContext(ctx, spec).Scan(&id)
+
+	if err != nil {
+		return 0, err
+	}
+
+	return id, nil
+}
+
+func (orm *orm) GetWorkflowSpec(ctx context.Context, owner, name string) (*job.WorkflowSpec, error) {
+	query := `
+		SELECT *
+		FROM workflow_specs
+		WHERE workflow_owner = $1 AND workflow_name = $2
+	`
+
+	var spec job.WorkflowSpec
+	err := orm.ds.GetContext(ctx, &spec, query, owner, name)
+	if err != nil {
+		return nil, err
+	}
+
+	return &spec, nil
+}
+
+func (orm *orm) DeleteWorkflowSpec(ctx context.Context, owner, name string) error {
+	query := `
+		DELETE FROM workflow_specs
+		WHERE workflow_owner = $1 AND workflow_name = $2
+	`
+
+	result, err := orm.ds.ExecContext(ctx, query, owner, name)
+	if err != nil {
+		return err
+	}
+
+	rowsAffected, err := result.RowsAffected()
+	if err != nil {
+		return err
+	}
+
+	if rowsAffected == 0 {
+		return sql.ErrNoRows // No spec deleted
+	}
+
+	return nil
 }
diff --git a/core/services/workflows/syncer/orm_test.go b/core/services/workflows/syncer/orm_test.go
index 8b9f685bb52..1be4e54f472 100644
--- a/core/services/workflows/syncer/orm_test.go
+++ b/core/services/workflows/syncer/orm_test.go
@@ -1,12 +1,15 @@
 package syncer
 
 import (
+	"database/sql"
 	"encoding/hex"
 	"testing"
+	"time"
 
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/job"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/crypto"
 
 	"github.com/stretchr/testify/assert"
@@ -51,3 +54,145 @@ func TestWorkflowArtifactsORM_GetAndUpdate(t *testing.T) {
 	require.NoError(t, err)
 	assert.Equal(t, "new contents", contents)
 }
+
+func Test_UpsertWorkflowSpec(t *testing.T) {
+	db := pgtest.NewSqlxDB(t)
+	ctx := testutils.Context(t)
+	lggr := logger.TestLogger(t)
+	orm := &orm{ds: db, lggr: lggr}
+
+	t.Run("inserts new spec", func(t *testing.T) {
+		spec := &job.WorkflowSpec{
+			Workflow:      "test_workflow",
+			Config:        "test_config",
+			WorkflowID:    "cid-123",
+			WorkflowOwner: "owner-123",
+			WorkflowName:  "Test Workflow",
+			Status:        job.WorkflowSpecStatusActive,
+			BinaryURL:     "http://example.com/binary",
+			ConfigURL:     "http://example.com/config",
+			CreatedAt:     time.Now(),
+			SpecType:      job.WASMFile,
+		}
+
+		_, err := orm.UpsertWorkflowSpec(ctx, spec)
+		require.NoError(t, err)
+
+		// Verify the record exists in the database
+		var dbSpec job.WorkflowSpec
+		err = db.Get(&dbSpec, `SELECT * FROM workflow_specs WHERE workflow_owner = $1 AND workflow_name = $2`, spec.WorkflowOwner, spec.WorkflowName)
+		require.NoError(t, err)
+		require.Equal(t, spec.Workflow, dbSpec.Workflow)
+	})
+
+	t.Run("updates existing spec", func(t *testing.T) {
+		spec := &job.WorkflowSpec{
+			Workflow:      "test_workflow",
+			Config:        "test_config",
+			WorkflowID:    "cid-123",
+			WorkflowOwner: "owner-123",
+			WorkflowName:  "Test Workflow",
+			Status:        job.WorkflowSpecStatusActive,
+			BinaryURL:     "http://example.com/binary",
+			ConfigURL:     "http://example.com/config",
+			CreatedAt:     time.Now(),
+			SpecType:      job.WASMFile,
+		}
+
+		_, err := orm.UpsertWorkflowSpec(ctx, spec)
+		require.NoError(t, err)
+
+		// Update the status
+		spec.Status = job.WorkflowSpecStatusPaused
+
+		_, err = orm.UpsertWorkflowSpec(ctx, spec)
+		require.NoError(t, err)
+
+		// Verify the record is updated in the database
+		var dbSpec job.WorkflowSpec
+		err = db.Get(&dbSpec, `SELECT * FROM workflow_specs WHERE workflow_owner = $1 AND workflow_name = $2`, spec.WorkflowOwner, spec.WorkflowName)
+		require.NoError(t, err)
+		require.Equal(t, spec.Config, dbSpec.Config)
+		require.Equal(t, spec.Status, dbSpec.Status)
+	})
+}
+
+func Test_DeleteWorkflowSpec(t *testing.T) {
+	db := pgtest.NewSqlxDB(t)
+	ctx := testutils.Context(t)
+	lggr := logger.TestLogger(t)
+	orm := &orm{ds: db, lggr: lggr}
+
+	t.Run("deletes a workflow spec", func(t *testing.T) {
+		spec := &job.WorkflowSpec{
+			Workflow:      "test_workflow",
+			Config:        "test_config",
+			WorkflowID:    "cid-123",
+			WorkflowOwner: "owner-123",
+			WorkflowName:  "Test Workflow",
+			Status:        job.WorkflowSpecStatusActive,
+			BinaryURL:     "http://example.com/binary",
+			ConfigURL:     "http://example.com/config",
+			CreatedAt:     time.Now(),
+			SpecType:      job.WASMFile,
+		}
+
+		id, err := orm.UpsertWorkflowSpec(ctx, spec)
+		require.NoError(t, err)
+		require.NotZero(t, id)
+
+		err = orm.DeleteWorkflowSpec(ctx, spec.WorkflowOwner, spec.WorkflowName)
+		require.NoError(t, err)
+
+		// Verify the record is deleted from the database
+		var dbSpec job.WorkflowSpec
+		err = db.Get(&dbSpec, `SELECT * FROM workflow_specs WHERE id = $1`, id)
+		require.Error(t, err)
+		require.Equal(t, sql.ErrNoRows, err)
+	})
+
+	t.Run("fails if no workflow spec exists", func(t *testing.T) {
+		err := orm.DeleteWorkflowSpec(ctx, "owner-123", "Test Workflow")
+		require.Error(t, err)
+		require.Equal(t, sql.ErrNoRows, err)
+	})
+}
+
+func Test_GetWorkflowSpec(t *testing.T) {
+	db := pgtest.NewSqlxDB(t)
+	ctx := testutils.Context(t)
+	lggr := logger.TestLogger(t)
+	orm := &orm{ds: db, lggr: lggr}
+
+	t.Run("gets a workflow spec", func(t *testing.T) {
+		spec := &job.WorkflowSpec{
+			Workflow:      "test_workflow",
+			Config:        "test_config",
+			WorkflowID:    "cid-123",
+			WorkflowOwner: "owner-123",
+			WorkflowName:  "Test Workflow",
+			Status:        job.WorkflowSpecStatusActive,
+			BinaryURL:     "http://example.com/binary",
+			ConfigURL:     "http://example.com/config",
+			CreatedAt:     time.Now(),
+			SpecType:      job.WASMFile,
+		}
+
+		id, err := orm.UpsertWorkflowSpec(ctx, spec)
+		require.NoError(t, err)
+		require.NotZero(t, id)
+
+		dbSpec, err := orm.GetWorkflowSpec(ctx, spec.WorkflowOwner, spec.WorkflowName)
+		require.NoError(t, err)
+		require.Equal(t, spec.Workflow, dbSpec.Workflow)
+
+		err = orm.DeleteWorkflowSpec(ctx, spec.WorkflowOwner, spec.WorkflowName)
+		require.NoError(t, err)
+	})
+
+	t.Run("fails if no workflow spec exists", func(t *testing.T) {
+		dbSpec, err := orm.GetWorkflowSpec(ctx, "owner-123", "Test Workflow")
+		require.Error(t, err)
+		require.Nil(t, dbSpec)
+	})
+}
diff --git a/core/store/migrate/migrations/0260_add_status_workflow_spec.sql b/core/store/migrate/migrations/0260_add_status_workflow_spec.sql
new file mode 100644
index 00000000000..66c38eef2f7
--- /dev/null
+++ b/core/store/migrate/migrations/0260_add_status_workflow_spec.sql
@@ -0,0 +1,9 @@
+-- +goose Up
+-- Add a `status` column to the `workflow_specs` table.
+ALTER TABLE workflow_specs
+ADD COLUMN status TEXT DEFAULT '' NOT NULL;
+
+-- +goose Down
+-- Remove the `status` column from the `workflow_specs` table.
+ALTER TABLE workflow_specs
+DROP COLUMN status;
\ No newline at end of file

From b5b1e00a8ab2b40eeb8136496819778f19ec0534 Mon Sep 17 00:00:00 2001
From: Jordan Krage <jmank88@gmail.com>
Date: Mon, 25 Nov 2024 07:39:14 -0600
Subject: [PATCH 02/11] core/internal/features/ocr2: fix
 TestIntegration_OCR2_ForwarderFlow race by delaying mining (#15397)

---
 .../internal/features/ocr2/features_ocr2_test.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/internal/features/ocr2/features_ocr2_test.go b/core/internal/features/ocr2/features_ocr2_test.go
index 7e443d59014..c8f49ac9328 100644
--- a/core/internal/features/ocr2/features_ocr2_test.go
+++ b/core/internal/features/ocr2/features_ocr2_test.go
@@ -738,14 +738,6 @@ func TestIntegration_OCR2_ForwarderFlow(t *testing.T) {
 		})
 	}
 
-	tick := time.NewTicker(1 * time.Second)
-	defer tick.Stop()
-	go func() {
-		for range tick.C {
-			b.Commit()
-		}
-	}()
-
 	blockBeforeConfig := initOCR2(t, lggr, b, ocrContract, owner, bootstrapNode, oracles, forwarderContracts, transmitters, func(int64) string {
 		return fmt.Sprintf(`
 type				= "bootstrap"
@@ -759,6 +751,14 @@ chainID 			= 1337
 `, ocrContractAddress)
 	})
 
+	tick := time.NewTicker(1 * time.Second)
+	defer tick.Stop()
+	go func() {
+		for range tick.C {
+			b.Commit()
+		}
+	}()
+
 	var jids []int32
 	var servers, slowServers = make([]*httptest.Server, 4), make([]*httptest.Server, 4)
 	// We expect metadata of:

From 6ea458859f19835d671455c5ce48a5d91cc9d6aa Mon Sep 17 00:00:00 2001
From: Sam <samsondav@protonmail.com>
Date: Mon, 25 Nov 2024 09:20:30 -0500
Subject: [PATCH 03/11] Add two new metrics for monitoring LLO transmitter
 health (also, implement app-scoped prometheus registerer) (#15362)

* Add two new metrics for monitoring LLO transmitter health

(Thread utilization)

* Clean up and organize LLO metrics

* Implement an application registry

* Fix unregister/close order

* Fix changeset
---
 .changeset/kind-parents-jump.md               |  11 ++
 core/cmd/app.go                               |   2 +
 core/cmd/shell.go                             |  13 +-
 core/cmd/shell_local.go                       |   6 +-
 core/internal/cltest/cltest.go                |   2 +
 core/internal/cltest/mocks.go                 |   7 +-
 core/services/chainlink/relayer_factory.go    |   3 +
 core/services/llo/bm/dummy_transmitter.go     |  10 +-
 core/services/llo/data_source.go              |  12 +-
 core/services/llo/mercurytransmitter/queue.go |  11 +-
 .../services/llo/mercurytransmitter/server.go | 164 ++++++++++--------
 .../llo/mercurytransmitter/transmitter.go     |  65 +++++--
 core/services/relay/evm/evm.go                |   7 +-
 13 files changed, 209 insertions(+), 104 deletions(-)
 create mode 100644 .changeset/kind-parents-jump.md

diff --git a/.changeset/kind-parents-jump.md b/.changeset/kind-parents-jump.md
new file mode 100644
index 00000000000..e633f1af1fe
--- /dev/null
+++ b/.changeset/kind-parents-jump.md
@@ -0,0 +1,11 @@
+---
+"chainlink": patch
+---
+
+Add two new metrics for monitoring LLO transmitter health #added
+
+`llo_mercurytransmitter_concurrent_transmit_gauge`
+Gauge that measures the number of transmit threads currently waiting on a remote transmit call. You may wish to alert if this exceeds some number for a given period of time, or if it ever reaches its max.
+
+`llo_mercurytransmitter_concurrent_delete_gauge`
+Gauge that measures the number of delete threads currently waiting on a delete call to the DB. You may wish to alert if this exceeds some number for a given period of time, or if it ever reaches its max.
diff --git a/core/cmd/app.go b/core/cmd/app.go
index 53c96980de4..ad944f0d0a6 100644
--- a/core/cmd/app.go
+++ b/core/cmd/app.go
@@ -10,6 +10,7 @@ import (
 	"slices"
 
 	"github.com/pkg/errors"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/urfave/cli"
 
 	"github.com/smartcontractkit/chainlink/v2/core/build"
@@ -85,6 +86,7 @@ func NewApp(s *Shell) *cli.App {
 		}
 
 		s.Logger = lggr
+		s.Registerer = prometheus.DefaultRegisterer // use the global DefaultRegisterer, should be safe since we only ever run one instance of the app per shell
 		s.CloseLogger = closeFn
 		s.Config = cfg
 
diff --git a/core/cmd/shell.go b/core/cmd/shell.go
index e4f4c5bd6e3..1edd53c1efc 100644
--- a/core/cmd/shell.go
+++ b/core/cmd/shell.go
@@ -25,6 +25,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"github.com/jmoiron/sqlx"
 	"github.com/pkg/errors"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/urfave/cli"
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
@@ -62,7 +63,7 @@ import (
 
 var (
 	initGlobalsOnce sync.Once
-	prometheus      *ginprom.Prometheus
+	ginPrometheus   *ginprom.Prometheus
 	grpcOpts        loop.GRPCOpts
 )
 
@@ -71,7 +72,7 @@ func initGlobals(cfgProm config.Prometheus, cfgTracing config.Tracing, cfgTeleme
 	var err error
 	initGlobalsOnce.Do(func() {
 		err = func() error {
-			prometheus = ginprom.New(ginprom.Namespace("service"), ginprom.Token(cfgProm.AuthToken()))
+			ginPrometheus = ginprom.New(ginprom.Namespace("service"), ginprom.Token(cfgProm.AuthToken()))
 			grpcOpts = loop.NewGRPCOpts(nil) // default prometheus.Registerer
 
 			otel.SetErrorHandler(otel.ErrorHandlerFunc(func(err error) {
@@ -139,6 +140,7 @@ type Shell struct {
 	Renderer
 	Config                         chainlink.GeneralConfig // initialized in Before
 	Logger                         logger.Logger           // initialized in Before
+	Registerer                     prometheus.Registerer   // initialized in Before
 	CloseLogger                    func() error            // called in After
 	AppFactory                     AppFactory
 	KeyStoreAuthenticator          TerminalKeyStoreAuthenticator
@@ -178,14 +180,14 @@ func (s *Shell) configExitErr(validateFn func() error) cli.ExitCoder {
 
 // AppFactory implements the NewApplication method.
 type AppFactory interface {
-	NewApplication(ctx context.Context, cfg chainlink.GeneralConfig, appLggr logger.Logger, db *sqlx.DB, keyStoreAuthenticator TerminalKeyStoreAuthenticator) (chainlink.Application, error)
+	NewApplication(ctx context.Context, cfg chainlink.GeneralConfig, appLggr logger.Logger, appRegisterer prometheus.Registerer, db *sqlx.DB, keyStoreAuthenticator TerminalKeyStoreAuthenticator) (chainlink.Application, error)
 }
 
 // ChainlinkAppFactory is used to create a new Application.
 type ChainlinkAppFactory struct{}
 
 // NewApplication returns a new instance of the node with the given config.
-func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.GeneralConfig, appLggr logger.Logger, db *sqlx.DB, keyStoreAuthenticator TerminalKeyStoreAuthenticator) (app chainlink.Application, err error) {
+func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.GeneralConfig, appLggr logger.Logger, appRegisterer prometheus.Registerer, db *sqlx.DB, keyStoreAuthenticator TerminalKeyStoreAuthenticator) (app chainlink.Application, err error) {
 	err = migrate.SetMigrationENVVars(cfg)
 	if err != nil {
 		return nil, err
@@ -237,6 +239,7 @@ func (n ChainlinkAppFactory) NewApplication(ctx context.Context, cfg chainlink.G
 	// create the relayer-chain interoperators from application configuration
 	relayerFactory := chainlink.RelayerFactory{
 		Logger:                appLggr,
+		Registerer:            appRegisterer,
 		LoopRegistry:          loopRegistry,
 		GRPCOpts:              grpcOpts,
 		MercuryPool:           mercuryPool,
@@ -425,7 +428,7 @@ func (n ChainlinkRunner) Run(ctx context.Context, app chainlink.Application) err
 		return errors.New("You must specify at least one port to listen on")
 	}
 
-	handler, err := web.NewRouter(app, prometheus)
+	handler, err := web.NewRouter(app, ginPrometheus)
 	if err != nil {
 		return errors.Wrap(err, "failed to create web router")
 	}
diff --git a/core/cmd/shell_local.go b/core/cmd/shell_local.go
index 6261d23ef82..bead4ba5afd 100644
--- a/core/cmd/shell_local.go
+++ b/core/cmd/shell_local.go
@@ -382,7 +382,7 @@ func (s *Shell) runNode(c *cli.Context) error {
 	// From now on, DB locks and DB connection will be released on every return.
 	// Keep watching on logger.Fatal* calls and os.Exit(), because defer will not be executed.
 
-	app, err := s.AppFactory.NewApplication(rootCtx, s.Config, s.Logger, ldb.DB(), s.KeyStoreAuthenticator)
+	app, err := s.AppFactory.NewApplication(rootCtx, s.Config, s.Logger, s.Registerer, ldb.DB(), s.KeyStoreAuthenticator)
 	if err != nil {
 		return s.errorOut(errors.Wrap(err, "fatal error instantiating application"))
 	}
@@ -629,7 +629,7 @@ func (s *Shell) RebroadcastTransactions(c *cli.Context) (err error) {
 	}
 	defer lggr.ErrorIfFn(db.Close, "Error closing db")
 
-	app, err := s.AppFactory.NewApplication(ctx, s.Config, lggr, db, s.KeyStoreAuthenticator)
+	app, err := s.AppFactory.NewApplication(ctx, s.Config, lggr, s.Registerer, db, s.KeyStoreAuthenticator)
 	if err != nil {
 		return s.errorOut(errors.Wrap(err, "fatal error instantiating application"))
 	}
@@ -1275,7 +1275,7 @@ func (s *Shell) RemoveBlocks(c *cli.Context) error {
 	// From now on, DB locks and DB connection will be released on every return.
 	// Keep watching on logger.Fatal* calls and os.Exit(), because defer will not be executed.
 
-	app, err := s.AppFactory.NewApplication(ctx, s.Config, s.Logger, ldb.DB(), s.KeyStoreAuthenticator)
+	app, err := s.AppFactory.NewApplication(ctx, s.Config, s.Logger, s.Registerer, ldb.DB(), s.KeyStoreAuthenticator)
 	if err != nil {
 		return s.errorOut(errors.Wrap(err, "fatal error instantiating application"))
 	}
diff --git a/core/internal/cltest/cltest.go b/core/internal/cltest/cltest.go
index 29515df7034..554b11b5aa8 100644
--- a/core/internal/cltest/cltest.go
+++ b/core/internal/cltest/cltest.go
@@ -29,6 +29,7 @@ import (
 	"github.com/jmoiron/sqlx"
 	"github.com/manyminds/api2go/jsonapi"
 	"github.com/onsi/gomega"
+	"github.com/prometheus/client_golang/prometheus"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
@@ -406,6 +407,7 @@ func NewApplicationWithConfig(t testing.TB, cfg chainlink.GeneralConfig, flagsAn
 		Logger:                lggr,
 		LoopRegistry:          loopRegistry,
 		GRPCOpts:              loop.GRPCOpts{},
+		Registerer:            prometheus.NewRegistry(), // Don't use global registry here since otherwise multiple apps can create name conflicts. Could also potentially give a mock registry to test prometheus.
 		MercuryPool:           mercuryPool,
 		CapabilitiesRegistry:  capabilitiesRegistry,
 		HTTPClient:            c,
diff --git a/core/internal/cltest/mocks.go b/core/internal/cltest/mocks.go
index b8bb4657056..17c79f00831 100644
--- a/core/internal/cltest/mocks.go
+++ b/core/internal/cltest/mocks.go
@@ -11,6 +11,7 @@ import (
 	"time"
 
 	"github.com/jmoiron/sqlx"
+	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/txmgr"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
@@ -87,7 +88,7 @@ type InstanceAppFactoryWithKeystoreMock struct {
 }
 
 // NewApplication creates a new application with specified config and calls the authenticate function of the keystore
-func (f InstanceAppFactoryWithKeystoreMock) NewApplication(ctx context.Context, cfg chainlink.GeneralConfig, lggr logger.Logger, db *sqlx.DB, ks cmd.TerminalKeyStoreAuthenticator) (chainlink.Application, error) {
+func (f InstanceAppFactoryWithKeystoreMock) NewApplication(ctx context.Context, cfg chainlink.GeneralConfig, lggr logger.Logger, registerer prometheus.Registerer, db *sqlx.DB, ks cmd.TerminalKeyStoreAuthenticator) (chainlink.Application, error) {
 	keyStore := f.App.GetKeyStore()
 	err := ks.Authenticate(ctx, keyStore, cfg.Password())
 	if err != nil {
@@ -102,7 +103,7 @@ type InstanceAppFactory struct {
 }
 
 // NewApplication creates a new application with specified config
-func (f InstanceAppFactory) NewApplication(context.Context, chainlink.GeneralConfig, logger.Logger, *sqlx.DB, cmd.TerminalKeyStoreAuthenticator) (chainlink.Application, error) {
+func (f InstanceAppFactory) NewApplication(context.Context, chainlink.GeneralConfig, logger.Logger, prometheus.Registerer, *sqlx.DB, cmd.TerminalKeyStoreAuthenticator) (chainlink.Application, error) {
 	return f.App, nil
 }
 
@@ -110,7 +111,7 @@ type seededAppFactory struct {
 	Application chainlink.Application
 }
 
-func (s seededAppFactory) NewApplication(context.Context, chainlink.GeneralConfig, logger.Logger, *sqlx.DB, cmd.TerminalKeyStoreAuthenticator) (chainlink.Application, error) {
+func (s seededAppFactory) NewApplication(context.Context, chainlink.GeneralConfig, logger.Logger, prometheus.Registerer, *sqlx.DB, cmd.TerminalKeyStoreAuthenticator) (chainlink.Application, error) {
 	return noopStopApplication{s.Application}, nil
 }
 
diff --git a/core/services/chainlink/relayer_factory.go b/core/services/chainlink/relayer_factory.go
index cec7e5bb48c..32b64d402b1 100644
--- a/core/services/chainlink/relayer_factory.go
+++ b/core/services/chainlink/relayer_factory.go
@@ -7,6 +7,7 @@ import (
 	"net/http"
 
 	"github.com/pelletier/go-toml/v2"
+	"github.com/prometheus/client_golang/prometheus"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/loop"
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
@@ -37,6 +38,7 @@ type RelayerFactory struct {
 	logger.Logger
 	*plugins.LoopRegistry
 	loop.GRPCOpts
+	Registerer            prometheus.Registerer
 	MercuryPool           wsrpc.Pool
 	CapabilitiesRegistry  coretypes.CapabilitiesRegistry
 	HTTPClient            *http.Client
@@ -81,6 +83,7 @@ func (r *RelayerFactory) NewEVM(ctx context.Context, config EVMFactoryConfig) (m
 
 		relayerOpts := evmrelay.RelayerOpts{
 			DS:                    ccOpts.DS,
+			Registerer:            r.Registerer,
 			CSAETHKeystore:        config.CSAETHKeystore,
 			MercuryPool:           r.MercuryPool,
 			MercuryConfig:         config.MercuryConfig,
diff --git a/core/services/llo/bm/dummy_transmitter.go b/core/services/llo/bm/dummy_transmitter.go
index b7fa2bd9e15..f62635a7953 100644
--- a/core/services/llo/bm/dummy_transmitter.go
+++ b/core/services/llo/bm/dummy_transmitter.go
@@ -23,9 +23,11 @@ import (
 // A dummy transmitter useful for benchmarking and testing
 
 var (
-	transmitSuccessCount = promauto.NewCounter(prometheus.CounterOpts{
-		Name: "llo_transmit_success_count",
-		Help: "Running count of successful transmits",
+	promTransmitSuccessCount = promauto.NewCounter(prometheus.CounterOpts{
+		Namespace: "llo",
+		Subsystem: "dummytransmitter",
+		Name:      "transmit_success_count",
+		Help:      "Running count of successful transmits",
 	})
 )
 
@@ -101,7 +103,7 @@ func (t *transmitter) Transmit(
 			lggr.Debugw(fmt.Sprintf("Failed to decode report with type %s", report.Info.ReportFormat), "err", err)
 		}
 	}
-	transmitSuccessCount.Inc()
+	promTransmitSuccessCount.Inc()
 	lggr.Infow("Transmit (dummy)", "digest", digest, "seqNr", seqNr, "report.Report", report.Report, "report.Info", report.Info, "sigs", sigs)
 	return nil
 }
diff --git a/core/services/llo/data_source.go b/core/services/llo/data_source.go
index 0585dec49dc..481fd0b790a 100644
--- a/core/services/llo/data_source.go
+++ b/core/services/llo/data_source.go
@@ -24,14 +24,18 @@ import (
 
 var (
 	promMissingStreamCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_stream_missing_count",
-		Help: "Number of times we tried to observe a stream, but it was missing",
+		Namespace: "llo",
+		Subsystem: "datasource",
+		Name:      "stream_missing_count",
+		Help:      "Number of times we tried to observe a stream, but it was missing",
 	},
 		[]string{"streamID"},
 	)
 	promObservationErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_stream_observation_error_count",
-		Help: "Number of times we tried to observe a stream, but it failed with an error",
+		Namespace: "llo",
+		Subsystem: "datasource",
+		Name:      "stream_observation_error_count",
+		Help:      "Number of times we tried to observe a stream, but it failed with an error",
 	},
 		[]string{"streamID"},
 	)
diff --git a/core/services/llo/mercurytransmitter/queue.go b/core/services/llo/mercurytransmitter/queue.go
index eae9a0b9d0c..6610010a469 100644
--- a/core/services/llo/mercurytransmitter/queue.go
+++ b/core/services/llo/mercurytransmitter/queue.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strconv"
 	"sync"
 	"time"
 
@@ -22,9 +23,11 @@ type asyncDeleter interface {
 
 var _ services.Service = (*transmitQueue)(nil)
 
-var transmitQueueLoad = promauto.NewGaugeVec(prometheus.GaugeOpts{
-	Name: "llo_transmit_queue_load",
-	Help: "Current count of items in the transmit queue",
+var promTransmitQueueLoad = promauto.NewGaugeVec(prometheus.GaugeOpts{
+	Namespace: "llo",
+	Subsystem: "mercurytransmitter",
+	Name:      "transmit_queue_load",
+	Help:      "Current count of items in the transmit queue",
 },
 	[]string{"donID", "serverURL", "capacity"},
 )
@@ -75,7 +78,7 @@ func NewTransmitQueue(lggr logger.Logger, serverURL string, maxlen int, asyncDel
 		maxlen,
 		false,
 		nil,
-		transmitQueueLoad.WithLabelValues(fmt.Sprintf("%d", asyncDeleter.DonID()), serverURL, fmt.Sprintf("%d", maxlen)),
+		promTransmitQueueLoad.WithLabelValues(strconv.FormatUint(uint64(asyncDeleter.DonID()), 10), serverURL, strconv.FormatInt(int64(maxlen), 10)),
 	}
 }
 
diff --git a/core/services/llo/mercurytransmitter/server.go b/core/services/llo/mercurytransmitter/server.go
index 22472349c25..308ff6a73a4 100644
--- a/core/services/llo/mercurytransmitter/server.go
+++ b/core/services/llo/mercurytransmitter/server.go
@@ -3,7 +3,9 @@ package mercurytransmitter
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"sync"
+	"sync/atomic"
 	"time"
 
 	"github.com/jpillora/backoff"
@@ -28,27 +30,35 @@ import (
 )
 
 var (
-	transmitQueueDeleteErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_mercury_transmit_queue_delete_error_count",
-		Help: "Running count of DB errors when trying to delete an item from the queue DB",
+	promTransmitQueueDeleteErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "llo",
+		Subsystem: "mercurytransmitter",
+		Name:      "transmit_queue_delete_error_count",
+		Help:      "Running count of DB errors when trying to delete an item from the queue DB",
 	},
 		[]string{"donID", "serverURL"},
 	)
-	transmitQueueInsertErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_mercury_transmit_queue_insert_error_count",
-		Help: "Running count of DB errors when trying to insert an item into the queue DB",
+	promTransmitQueueInsertErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "llo",
+		Subsystem: "mercurytransmitter",
+		Name:      "transmit_queue_insert_error_count",
+		Help:      "Running count of DB errors when trying to insert an item into the queue DB",
 	},
 		[]string{"donID", "serverURL"},
 	)
-	transmitQueuePushErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_mercury_transmit_queue_push_error_count",
-		Help: "Running count of DB errors when trying to push an item onto the queue",
+	promTransmitQueuePushErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "llo",
+		Subsystem: "mercurytransmitter",
+		Name:      "transmit_queue_push_error_count",
+		Help:      "Running count of DB errors when trying to push an item onto the queue",
 	},
 		[]string{"donID", "serverURL"},
 	)
-	transmitServerErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_mercury_transmit_server_error_count",
-		Help: "Number of errored transmissions that failed due to an error returned by the mercury server",
+	promTransmitServerErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "llo",
+		Subsystem: "mercurytransmitter",
+		Name:      "transmit_server_error_count",
+		Help:      "Number of errored transmissions that failed due to an error returned by the mercury server",
 	},
 		[]string{"donID", "serverURL", "code"},
 	)
@@ -83,6 +93,9 @@ type server struct {
 	transmitQueueDeleteErrorCount prometheus.Counter
 	transmitQueueInsertErrorCount prometheus.Counter
 	transmitQueuePushErrorCount   prometheus.Counter
+
+	transmitThreadBusyCount atomic.Int32
+	deleteThreadBusyCount   atomic.Int32
 }
 
 type QueueConfig interface {
@@ -100,7 +113,7 @@ func newServer(lggr logger.Logger, verboseLogging bool, cfg QueueConfig, client
 		codecLggr = corelogger.NullLogger
 	}
 
-	return &server{
+	s := &server{
 		logger.Sugared(lggr),
 		verboseLogging,
 		cfg.TransmitTimeout().Duration(),
@@ -111,13 +124,17 @@ func newServer(lggr logger.Logger, verboseLogging bool, cfg QueueConfig, client
 		serverURL,
 		evm.NewReportCodecPremiumLegacy(codecLggr),
 		llo.JSONReportCodec{},
-		transmitSuccessCount.WithLabelValues(donIDStr, serverURL),
-		transmitDuplicateCount.WithLabelValues(donIDStr, serverURL),
-		transmitConnectionErrorCount.WithLabelValues(donIDStr, serverURL),
-		transmitQueueDeleteErrorCount.WithLabelValues(donIDStr, serverURL),
-		transmitQueueInsertErrorCount.WithLabelValues(donIDStr, serverURL),
-		transmitQueuePushErrorCount.WithLabelValues(donIDStr, serverURL),
+		promTransmitSuccessCount.WithLabelValues(donIDStr, serverURL),
+		promTransmitDuplicateCount.WithLabelValues(donIDStr, serverURL),
+		promTransmitConnectionErrorCount.WithLabelValues(donIDStr, serverURL),
+		promTransmitQueueDeleteErrorCount.WithLabelValues(donIDStr, serverURL),
+		promTransmitQueueInsertErrorCount.WithLabelValues(donIDStr, serverURL),
+		promTransmitQueuePushErrorCount.WithLabelValues(donIDStr, serverURL),
+		atomic.Int32{},
+		atomic.Int32{},
 	}
+
+	return s
 }
 
 func (s *server) HealthReport() map[string]error {
@@ -144,6 +161,7 @@ func (s *server) runDeleteQueueLoop(stopCh services.StopChan, wg *sync.WaitGroup
 		select {
 		case hash := <-s.deleteQueue:
 			for {
+				s.deleteThreadBusyCount.Add(1)
 				if err := s.pm.orm.Delete(ctx, [][32]byte{hash}); err != nil {
 					s.lggr.Errorw("Failed to delete transmission record", "err", err, "transmissionHash", hash)
 					s.transmitQueueDeleteErrorCount.Inc()
@@ -152,6 +170,7 @@ func (s *server) runDeleteQueueLoop(stopCh services.StopChan, wg *sync.WaitGroup
 						// Wait a backoff duration before trying to delete again
 						continue
 					case <-stopCh:
+						s.deleteThreadBusyCount.Add(-1)
 						// abort and return immediately on stop even if items remain in queue
 						return
 					}
@@ -160,6 +179,7 @@ func (s *server) runDeleteQueueLoop(stopCh services.StopChan, wg *sync.WaitGroup
 			}
 			// success
 			b.Reset()
+			s.deleteThreadBusyCount.Add(-1)
 		case <-stopCh:
 			// abort and return immediately on stop even if items remain in queue
 			return
@@ -179,61 +199,69 @@ func (s *server) runQueueLoop(stopCh services.StopChan, wg *sync.WaitGroup, donI
 	}
 	ctx, cancel := stopCh.NewCtx()
 	defer cancel()
-	for {
-		t := s.q.BlockingPop()
-		if t == nil {
-			// queue was closed
-			return
-		}
-		req, res, err := func(ctx context.Context) (*pb.TransmitRequest, *pb.TransmitResponse, error) {
-			ctx, cancelFn := context.WithTimeout(ctx, utils.WithJitter(s.transmitTimeout))
-			defer cancelFn()
-			return s.transmit(ctx, t)
-		}(ctx)
-		if ctx.Err() != nil {
-			// only canceled on transmitter close so we can exit
-			return
-		} else if err != nil {
-			s.transmitConnectionErrorCount.Inc()
-			s.lggr.Errorw("Transmit report failed", "err", err, "req.Payload", req.Payload, "req.ReportFormat", req.ReportFormat, "transmission", t)
-			if ok := s.q.Push(t); !ok {
-				s.lggr.Error("Failed to push report to transmit queue; queue is closed")
-				return
+	cont := true
+	for cont {
+		cont = func() bool {
+			t := s.q.BlockingPop()
+			if t == nil {
+				// queue was closed
+				return false
 			}
-			// Wait a backoff duration before pulling the most recent transmission
-			// the heap
-			select {
-			case <-time.After(b.Duration()):
-				continue
-			case <-stopCh:
-				return
+
+			s.transmitThreadBusyCount.Add(1)
+			defer s.transmitThreadBusyCount.Add(-1)
+
+			req, res, err := func(ctx context.Context) (*pb.TransmitRequest, *pb.TransmitResponse, error) {
+				ctx, cancelFn := context.WithTimeout(ctx, utils.WithJitter(s.transmitTimeout))
+				defer cancelFn()
+				return s.transmit(ctx, t)
+			}(ctx)
+			if ctx.Err() != nil {
+				// only canceled on transmitter close so we can exit
+				return false
+			} else if err != nil {
+				s.transmitConnectionErrorCount.Inc()
+				s.lggr.Errorw("Transmit report failed", "err", err, "req.Payload", req.Payload, "req.ReportFormat", req.ReportFormat, "transmission", t)
+				if ok := s.q.Push(t); !ok {
+					s.lggr.Error("Failed to push report to transmit queue; queue is closed")
+					return false
+				}
+				// Wait a backoff duration before pulling the most recent transmission
+				// the heap
+				select {
+				case <-time.After(b.Duration()):
+					return true
+				case <-stopCh:
+					return false
+				}
 			}
-		}
 
-		b.Reset()
-		if res.Error == "" {
-			s.transmitSuccessCount.Inc()
-			s.lggr.Debugw("Transmit report success", "req.ReportFormat", req.ReportFormat, "req.Payload", req.Payload, "transmission", t, "response", res)
-		} else {
-			// We don't need to retry here because the mercury server
-			// has confirmed it received the report. We only need to retry
-			// on networking/unknown errors
-			switch res.Code {
-			case DuplicateReport:
+			b.Reset()
+			if res.Error == "" {
 				s.transmitSuccessCount.Inc()
-				s.transmitDuplicateCount.Inc()
-				s.lggr.Debugw("Transmit report success; duplicate report", "req.ReportFormat", req.ReportFormat, "req.Payload", req.Payload, "transmission", t, "response", res)
-			default:
-				transmitServerErrorCount.WithLabelValues(donIDStr, s.url, fmt.Sprintf("%d", res.Code)).Inc()
-				s.lggr.Errorw("Transmit report failed; mercury server returned error", "req.ReportFormat", req.ReportFormat, "req.Payload", req.Payload, "response", res, "transmission", t, "err", res.Error, "code", res.Code)
+				s.lggr.Debugw("Transmit report success", "req.ReportFormat", req.ReportFormat, "req.Payload", req.Payload, "transmission", t, "response", res)
+			} else {
+				// We don't need to retry here because the mercury server
+				// has confirmed it received the report. We only need to retry
+				// on networking/unknown errors
+				switch res.Code {
+				case DuplicateReport:
+					s.transmitSuccessCount.Inc()
+					s.transmitDuplicateCount.Inc()
+					s.lggr.Debugw("Transmit report success; duplicate report", "req.ReportFormat", req.ReportFormat, "req.Payload", req.Payload, "transmission", t, "response", res)
+				default:
+					promTransmitServerErrorCount.WithLabelValues(donIDStr, s.url, strconv.FormatInt(int64(res.Code), 10)).Inc()
+					s.lggr.Errorw("Transmit report failed; mercury server returned error", "req.ReportFormat", req.ReportFormat, "req.Payload", req.Payload, "response", res, "transmission", t, "err", res.Error, "code", res.Code)
+				}
 			}
-		}
 
-		select {
-		case s.deleteQueue <- t.Hash():
-		default:
-			s.lggr.Criticalw("Delete queue is full", "transmission", t, "transmissionHash", fmt.Sprintf("%x", t.Hash()))
-		}
+			select {
+			case s.deleteQueue <- t.Hash():
+			default:
+				s.lggr.Criticalw("Delete queue is full", "transmission", t, "transmissionHash", fmt.Sprintf("%x", t.Hash()))
+			}
+			return true
+		}()
 	}
 }
 
diff --git a/core/services/llo/mercurytransmitter/transmitter.go b/core/services/llo/mercurytransmitter/transmitter.go
index 024a98174c6..8e60bf938a5 100644
--- a/core/services/llo/mercurytransmitter/transmitter.go
+++ b/core/services/llo/mercurytransmitter/transmitter.go
@@ -33,21 +33,27 @@ const (
 )
 
 var (
-	transmitSuccessCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_mercury_transmit_success_count",
-		Help: "Number of successful transmissions (duplicates are counted as success)",
+	promTransmitSuccessCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "llo",
+		Subsystem: "mercurytransmitter",
+		Name:      "transmit_success_count",
+		Help:      "Number of successful transmissions (duplicates are counted as success)",
 	},
 		[]string{"donID", "serverURL"},
 	)
-	transmitDuplicateCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_mercury_transmit_duplicate_count",
-		Help: "Number of transmissions where the server told us it was a duplicate",
+	promTransmitDuplicateCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "llo",
+		Subsystem: "mercurytransmitter",
+		Name:      "transmit_duplicate_count",
+		Help:      "Number of transmissions where the server told us it was a duplicate",
 	},
 		[]string{"donID", "serverURL"},
 	)
-	transmitConnectionErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
-		Name: "llo_mercury_transmit_connection_error_count",
-		Help: "Number of errored transmissions that failed due to problem with the connection",
+	promTransmitConnectionErrorCount = promauto.NewCounterVec(prometheus.CounterOpts{
+		Namespace: "llo",
+		Subsystem: "mercurytransmitter",
+		Name:      "transmit_connection_error_count",
+		Help:      "Number of errored transmissions that failed due to problem with the connection",
 	},
 		[]string{"donID", "serverURL"},
 	)
@@ -107,8 +113,10 @@ type transmitter struct {
 	verboseLogging bool
 	cfg            Config
 
-	orm     ORM
-	servers map[string]*server
+	orm        ORM
+	servers    map[string]*server
+	registerer prometheus.Registerer
+	collectors []prometheus.Collector
 
 	donID       uint32
 	fromAccount string
@@ -119,6 +127,7 @@ type transmitter struct {
 
 type Opts struct {
 	Lggr           logger.Logger
+	Registerer     prometheus.Registerer
 	VerboseLogging bool
 	Cfg            Config
 	Clients        map[string]wsrpc.Client
@@ -145,6 +154,8 @@ func newTransmitter(opts Opts) *transmitter {
 		opts.Cfg,
 		opts.ORM,
 		servers,
+		opts.Registerer,
+		nil,
 		opts.DonID,
 		fmt.Sprintf("%x", opts.FromAccount),
 		make(services.StopChan),
@@ -183,6 +194,31 @@ func (mt *transmitter) Start(ctx context.Context) (err error) {
 					go s.runDeleteQueueLoop(mt.stopCh, mt.wg)
 					go s.runQueueLoop(mt.stopCh, mt.wg, donIDStr)
 				}
+				mt.collectors = append(mt.collectors, prometheus.NewGaugeFunc(
+					prometheus.GaugeOpts{
+						Namespace:   "llo",
+						Subsystem:   "mercurytransmitter",
+						Name:        "concurrent_transmit_gauge",
+						Help:        "Gauge that measures the number of transmit threads currently waiting on a remote transmit call. You may wish to alert if this exceeds some number for a given period of time, or if it ever reaches its max.",
+						ConstLabels: prometheus.Labels{"donID": donIDStr, "serverURL": s.url, "maxConcurrentTransmits": strconv.FormatInt(int64(nThreads), 10)},
+					}, func() float64 {
+						return float64(s.transmitThreadBusyCount.Load())
+					}))
+				mt.collectors = append(mt.collectors, prometheus.NewGaugeFunc(
+					prometheus.GaugeOpts{
+						Namespace:   "llo",
+						Subsystem:   "mercurytransmitter",
+						Name:        "concurrent_delete_gauge",
+						Help:        "Gauge that measures the number of delete threads currently waiting on a delete call to the DB. You may wish to alert if this exceeds some number for a given period of time, or if it ever reaches its max.",
+						ConstLabels: prometheus.Labels{"donID": donIDStr, "serverURL": s.url, "maxConcurrentDeletes": strconv.FormatInt(int64(nThreads), 10)},
+					}, func() float64 {
+						return float64(s.deleteThreadBusyCount.Load())
+					}))
+				for _, c := range mt.collectors {
+					if err := mt.registerer.Register(c); err != nil {
+						return err
+					}
+				}
 			}
 			if err := (&services.MultiStart{}).Start(ctx, startClosers...); err != nil {
 				return err
@@ -214,7 +250,12 @@ func (mt *transmitter) Close() error {
 			closers = append(closers, s.pm)
 			closers = append(closers, s.c)
 		}
-		return services.CloseAll(closers...)
+		err := services.CloseAll(closers...)
+		// Unregister all the gauge funcs
+		for _, c := range mt.collectors {
+			mt.registerer.Unregister(c)
+		}
+		return err
 	})
 }
 
diff --git a/core/services/relay/evm/evm.go b/core/services/relay/evm/evm.go
index 8008fc4fd9e..0be78caf249 100644
--- a/core/services/relay/evm/evm.go
+++ b/core/services/relay/evm/evm.go
@@ -17,6 +17,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
 	pkgerrors "github.com/pkg/errors"
+	"github.com/prometheus/client_golang/prometheus"
 	"golang.org/x/exp/maps"
 
 	"github.com/smartcontractkit/libocr/gethwrappers2/ocr2aggregator"
@@ -143,6 +144,7 @@ type Relayer struct {
 	ds                   sqlutil.DataSource
 	chain                legacyevm.Chain
 	lggr                 logger.SugaredLogger
+	registerer           prometheus.Registerer
 	ks                   CSAETHKeystore
 	mercuryPool          wsrpc.Pool
 	codec                commontypes.Codec
@@ -169,7 +171,8 @@ type MercuryConfig interface {
 }
 
 type RelayerOpts struct {
-	DS sqlutil.DataSource
+	DS         sqlutil.DataSource
+	Registerer prometheus.Registerer
 	CSAETHKeystore
 	MercuryPool           wsrpc.Pool
 	RetirementReportCache llo.RetirementReportCache
@@ -214,6 +217,7 @@ func NewRelayer(ctx context.Context, lggr logger.Logger, chain legacyevm.Chain,
 		ds:                    opts.DS,
 		chain:                 chain,
 		lggr:                  sugared,
+		registerer:            opts.Registerer,
 		ks:                    opts.CSAETHKeystore,
 		mercuryPool:           opts.MercuryPool,
 		cdcFactory:            cdcFactory,
@@ -563,6 +567,7 @@ func (r *Relayer) NewLLOProvider(ctx context.Context, rargs commontypes.RelayArg
 			VerboseLogging: r.mercuryCfg.VerboseLogging(),
 			MercuryTransmitterOpts: mercurytransmitter.Opts{
 				Lggr:           r.lggr,
+				Registerer:     r.registerer,
 				VerboseLogging: r.mercuryCfg.VerboseLogging(),
 				Cfg:            r.mercuryCfg.Transmitter(),
 				Clients:        clients,

From e094909535f2f954d60f5dc403abc83a2537a035 Mon Sep 17 00:00:00 2001
From: Cedric <cedric.cordenier@smartcontract.com>
Date: Mon, 25 Nov 2024 16:46:44 +0000
Subject: [PATCH 04/11] [chore] Bump common (#15401)

* [chore] Bump common

* Fix missing test
---
 core/capabilities/compute/test/fetch/cmd/main.go      |  7 +------
 core/capabilities/compute/test/simple/cmd/main.go     |  7 +------
 core/scripts/go.mod                                   |  2 +-
 core/scripts/go.sum                                   |  4 ++--
 core/services/job/models_test.go                      |  2 --
 core/services/job/testdata/wasm/test_workflow_spec.go | 10 +---------
 core/services/workflows/test/break/cmd/main.go        |  7 +------
 core/services/workflows/test/wasm/cmd/main.go         |  7 +------
 deployment/go.mod                                     |  2 +-
 deployment/go.sum                                     |  4 ++--
 go.mod                                                |  2 +-
 go.sum                                                |  4 ++--
 integration-tests/go.mod                              |  2 +-
 integration-tests/go.sum                              |  4 ++--
 integration-tests/load/go.mod                         |  2 +-
 integration-tests/load/go.sum                         |  4 ++--
 16 files changed, 20 insertions(+), 50 deletions(-)

diff --git a/core/capabilities/compute/test/fetch/cmd/main.go b/core/capabilities/compute/test/fetch/cmd/main.go
index bc45b426005..44c6fb64601 100644
--- a/core/capabilities/compute/test/fetch/cmd/main.go
+++ b/core/capabilities/compute/test/fetch/cmd/main.go
@@ -12,12 +12,7 @@ import (
 )
 
 func BuildWorkflow(config []byte) *sdk.WorkflowSpecFactory {
-	workflow := sdk.NewWorkflowSpecFactory(
-		sdk.NewWorkflowParams{
-			Name:  "tester",
-			Owner: "ryan",
-		},
-	)
+	workflow := sdk.NewWorkflowSpecFactory()
 
 	triggerCfg := basictrigger.TriggerConfig{Name: "trigger", Number: 100}
 	trigger := triggerCfg.New(workflow)
diff --git a/core/capabilities/compute/test/simple/cmd/main.go b/core/capabilities/compute/test/simple/cmd/main.go
index 4ddacebe30b..92e4e52ef77 100644
--- a/core/capabilities/compute/test/simple/cmd/main.go
+++ b/core/capabilities/compute/test/simple/cmd/main.go
@@ -10,12 +10,7 @@ import (
 )
 
 func BuildWorkflow(config []byte) *sdk.WorkflowSpecFactory {
-	workflow := sdk.NewWorkflowSpecFactory(
-		sdk.NewWorkflowParams{
-			Name:  "tester",
-			Owner: "ryan",
-		},
-	)
+	workflow := sdk.NewWorkflowSpecFactory()
 
 	triggerCfg := basictrigger.TriggerConfig{Name: "trigger", Number: 100}
 	trigger := triggerCfg.New(workflow)
diff --git a/core/scripts/go.mod b/core/scripts/go.mod
index 72c3ad22404..a8b218eef19 100644
--- a/core/scripts/go.mod
+++ b/core/scripts/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/prometheus/client_golang v1.20.5
 	github.com/shopspring/decimal v1.4.0
 	github.com/smartcontractkit/chainlink-automation v0.8.1
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d
 	github.com/smartcontractkit/chainlink/deployment v0.0.0-00010101000000-000000000000
 	github.com/smartcontractkit/chainlink/v2 v2.14.0-mercury-20240807.0.20241106193309-5560cd76211a
 	github.com/smartcontractkit/libocr v0.0.0-20241007185508-adbe57025f12
diff --git a/core/scripts/go.sum b/core/scripts/go.sum
index 3fe7f5bd1c9..8f55042d16a 100644
--- a/core/scripts/go.sum
+++ b/core/scripts/go.sum
@@ -1094,8 +1094,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgB
 github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec h1:5vS1k8Qn09p8SQ3JzvS8iy4Pve7s3aVq+UPIdl74smY=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b h1:mm46AlaafEhvGjJvuAb0VoLLM3NKAVnwKZ+iUCNL/sg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d h1:0tnjo1gpG16PHAouXamgDAAu6e7PWaM0Ppq6dMWnjx0=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f h1:BwrIaQIx5Iy6eT+DfLhFfK2XqjxRm74mVdlX8gbu4dw=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f/go.mod h1:wHtwSR3F1CQSJJZDQKuqaqFYnvkT+kMyget7dl8Clvo=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57 h1:1BMTG66HnCIz+KMBWGvyzELNM6VHGwv2WKFhN7H49Sg=
diff --git a/core/services/job/models_test.go b/core/services/job/models_test.go
index 5ef36ea9f48..df52a5cca0c 100644
--- a/core/services/job/models_test.go
+++ b/core/services/job/models_test.go
@@ -345,8 +345,6 @@ func TestWorkflowSpec_Validate(t *testing.T) {
 
 		err := w.Validate(testutils.Context(t))
 		require.NoError(t, err)
-		assert.Equal(t, "owner", w.WorkflowOwner)
-		assert.Equal(t, "name", w.WorkflowName)
 		require.NotEmpty(t, w.WorkflowID)
 	})
 }
diff --git a/core/services/job/testdata/wasm/test_workflow_spec.go b/core/services/job/testdata/wasm/test_workflow_spec.go
index 40b9c0bbb67..477ba097ca3 100644
--- a/core/services/job/testdata/wasm/test_workflow_spec.go
+++ b/core/services/job/testdata/wasm/test_workflow_spec.go
@@ -3,9 +3,6 @@
 package main
 
 import (
-	"encoding/json"
-	"log"
-
 	"github.com/smartcontractkit/chainlink-common/pkg/workflows/wasm"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/capabilities/cli/cmd/testdata/fixtures/capabilities/basictrigger"
@@ -13,12 +10,7 @@ import (
 )
 
 func BuildWorkflow(config []byte) *sdk.WorkflowSpecFactory {
-	params := sdk.NewWorkflowParams{}
-	if err := json.Unmarshal(config, &params); err != nil {
-		log.Fatal(err)
-	}
-
-	workflow := sdk.NewWorkflowSpecFactory(params)
+	workflow := sdk.NewWorkflowSpecFactory()
 
 	triggerCfg := basictrigger.TriggerConfig{Name: "trigger", Number: 100}
 	_ = triggerCfg.New(workflow)
diff --git a/core/services/workflows/test/break/cmd/main.go b/core/services/workflows/test/break/cmd/main.go
index 498d3b7b906..bf759f516c9 100644
--- a/core/services/workflows/test/break/cmd/main.go
+++ b/core/services/workflows/test/break/cmd/main.go
@@ -10,12 +10,7 @@ import (
 )
 
 func BuildWorkflow(config []byte) *sdk.WorkflowSpecFactory {
-	workflow := sdk.NewWorkflowSpecFactory(
-		sdk.NewWorkflowParams{
-			Name:  "tester",
-			Owner: "ryan",
-		},
-	)
+	workflow := sdk.NewWorkflowSpecFactory()
 
 	triggerCfg := basictrigger.TriggerConfig{Name: "trigger", Number: 100}
 	trigger := triggerCfg.New(workflow)
diff --git a/core/services/workflows/test/wasm/cmd/main.go b/core/services/workflows/test/wasm/cmd/main.go
index e496ab6ffa6..ed077365bcf 100644
--- a/core/services/workflows/test/wasm/cmd/main.go
+++ b/core/services/workflows/test/wasm/cmd/main.go
@@ -10,12 +10,7 @@ import (
 )
 
 func BuildWorkflow(config []byte) *sdk.WorkflowSpecFactory {
-	workflow := sdk.NewWorkflowSpecFactory(
-		sdk.NewWorkflowParams{
-			Name:  "tester",
-			Owner: "ryan",
-		},
-	)
+	workflow := sdk.NewWorkflowSpecFactory()
 
 	triggerCfg := basictrigger.TriggerConfig{Name: "trigger", Number: 100}
 	trigger := triggerCfg.New(workflow)
diff --git a/deployment/go.mod b/deployment/go.mod
index 97a3d0ce6bc..084e3b4f533 100644
--- a/deployment/go.mod
+++ b/deployment/go.mod
@@ -23,7 +23,7 @@ require (
 	github.com/smartcontractkit/ccip-owner-contracts v0.0.0-20240926212305-a6deabdfce86
 	github.com/smartcontractkit/chain-selectors v1.0.31
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d
 	github.com/smartcontractkit/chainlink-protos/job-distributor v0.6.0
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.13
 	github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000
diff --git a/deployment/go.sum b/deployment/go.sum
index 768acb4f3b1..41beed6c8f5 100644
--- a/deployment/go.sum
+++ b/deployment/go.sum
@@ -1384,8 +1384,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgB
 github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec h1:5vS1k8Qn09p8SQ3JzvS8iy4Pve7s3aVq+UPIdl74smY=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b h1:mm46AlaafEhvGjJvuAb0VoLLM3NKAVnwKZ+iUCNL/sg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d h1:0tnjo1gpG16PHAouXamgDAAu6e7PWaM0Ppq6dMWnjx0=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f h1:BwrIaQIx5Iy6eT+DfLhFfK2XqjxRm74mVdlX8gbu4dw=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f/go.mod h1:wHtwSR3F1CQSJJZDQKuqaqFYnvkT+kMyget7dl8Clvo=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57 h1:1BMTG66HnCIz+KMBWGvyzELNM6VHGwv2WKFhN7H49Sg=
diff --git a/go.mod b/go.mod
index bce39c7db24..fc5a63c446f 100644
--- a/go.mod
+++ b/go.mod
@@ -77,7 +77,7 @@ require (
 	github.com/smartcontractkit/chain-selectors v1.0.31
 	github.com/smartcontractkit/chainlink-automation v0.8.1
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d
 	github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f
 	github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57
 	github.com/smartcontractkit/chainlink-feeds v0.1.1
diff --git a/go.sum b/go.sum
index abf64b3e8f1..9565c08cf26 100644
--- a/go.sum
+++ b/go.sum
@@ -1078,8 +1078,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgB
 github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec h1:5vS1k8Qn09p8SQ3JzvS8iy4Pve7s3aVq+UPIdl74smY=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b h1:mm46AlaafEhvGjJvuAb0VoLLM3NKAVnwKZ+iUCNL/sg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d h1:0tnjo1gpG16PHAouXamgDAAu6e7PWaM0Ppq6dMWnjx0=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f h1:BwrIaQIx5Iy6eT+DfLhFfK2XqjxRm74mVdlX8gbu4dw=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f/go.mod h1:wHtwSR3F1CQSJJZDQKuqaqFYnvkT+kMyget7dl8Clvo=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57 h1:1BMTG66HnCIz+KMBWGvyzELNM6VHGwv2WKFhN7H49Sg=
diff --git a/integration-tests/go.mod b/integration-tests/go.mod
index 9b7617b0c39..ee2aca39965 100644
--- a/integration-tests/go.mod
+++ b/integration-tests/go.mod
@@ -38,7 +38,7 @@ require (
 	github.com/smartcontractkit/chain-selectors v1.0.31
 	github.com/smartcontractkit/chainlink-automation v0.8.1
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d
 	github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.2
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.16
 	github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.0
diff --git a/integration-tests/go.sum b/integration-tests/go.sum
index 567e45dc0fd..eab9d9f18b0 100644
--- a/integration-tests/go.sum
+++ b/integration-tests/go.sum
@@ -1405,8 +1405,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgB
 github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec h1:5vS1k8Qn09p8SQ3JzvS8iy4Pve7s3aVq+UPIdl74smY=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b h1:mm46AlaafEhvGjJvuAb0VoLLM3NKAVnwKZ+iUCNL/sg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d h1:0tnjo1gpG16PHAouXamgDAAu6e7PWaM0Ppq6dMWnjx0=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f h1:BwrIaQIx5Iy6eT+DfLhFfK2XqjxRm74mVdlX8gbu4dw=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f/go.mod h1:wHtwSR3F1CQSJJZDQKuqaqFYnvkT+kMyget7dl8Clvo=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57 h1:1BMTG66HnCIz+KMBWGvyzELNM6VHGwv2WKFhN7H49Sg=
diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
index 65514124e5e..2a20af58814 100644
--- a/integration-tests/load/go.mod
+++ b/integration-tests/load/go.mod
@@ -17,7 +17,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/rs/zerolog v1.33.0
 	github.com/slack-go/slack v0.15.0
-	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b
+	github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.50.16
 	github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.9
 	github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.2
diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum
index 7545d3a232d..c4ffe9e0841 100644
--- a/integration-tests/load/go.sum
+++ b/integration-tests/load/go.sum
@@ -1394,8 +1394,8 @@ github.com/smartcontractkit/chainlink-automation v0.8.1 h1:sTc9LKpBvcKPc1JDYAmgB
 github.com/smartcontractkit/chainlink-automation v0.8.1/go.mod h1:Iij36PvWZ6blrdC5A/nrQUBuf3MH3JvsBB9sSyc9W08=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec h1:5vS1k8Qn09p8SQ3JzvS8iy4Pve7s3aVq+UPIdl74smY=
 github.com/smartcontractkit/chainlink-ccip v0.0.0-20241118091009-43c2b4804cec/go.mod h1:4adKaHNaxFsRvV/lYfqtbsWyyvIPUMLR0FdOJN/ljis=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b h1:mm46AlaafEhvGjJvuAb0VoLLM3NKAVnwKZ+iUCNL/sg=
-github.com/smartcontractkit/chainlink-common v0.3.1-0.20241120111740-a6a70ec7692b/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d h1:0tnjo1gpG16PHAouXamgDAAu6e7PWaM0Ppq6dMWnjx0=
+github.com/smartcontractkit/chainlink-common v0.3.1-0.20241125150608-97ceadb2072d/go.mod h1:ny87uTW6hLjCTLiBqBRNFEhETSXhHWevYlPclT5lSco=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f h1:BwrIaQIx5Iy6eT+DfLhFfK2XqjxRm74mVdlX8gbu4dw=
 github.com/smartcontractkit/chainlink-cosmos v0.5.2-0.20241017133723-5277829bd53f/go.mod h1:wHtwSR3F1CQSJJZDQKuqaqFYnvkT+kMyget7dl8Clvo=
 github.com/smartcontractkit/chainlink-data-streams v0.1.1-0.20241114154055-8d29ea018b57 h1:1BMTG66HnCIz+KMBWGvyzELNM6VHGwv2WKFhN7H49Sg=

From f5d228ea0b803cdc07a7351f2eec3cbd46b0bc06 Mon Sep 17 00:00:00 2001
From: Vyzaldy Sanchez <vyzaldysanchez@gmail.com>
Date: Mon, 25 Nov 2024 12:54:47 -0400
Subject: [PATCH 05/11] Allow to hydrate contract from the capability registry
 view (#15309)

* Adds `Hydrate()` functionality to `CapabilityRegistryView`

* Extracts hydration functionality into a `common` package

* Add `UnmarshalJSON` functionality to `CapabilityRegistryView`

* Adds test - WIP

* Completes tests comparing capability registry views

* Refactors to use existing deployment logic

* Gets deployed contract from contract sets

* Uses uint64 type annotation

* Moves implementation to `keystone/test`
---
 deployment/common/view/v1_0/capreg.go         | 123 ++++-
 deployment/common/view/v1_0/capreg_test.go    |   3 +-
 .../keystone/capability_registry_deployer.go  |   1 +
 .../keystone/changeset/deploy_registry.go     |   8 +-
 .../changeset/deploy_registry_test.go         |   1 +
 deployment/keystone/changeset/view_test.go    |   1 +
 deployment/keystone/contract_set.go           |   1 +
 deployment/keystone/state.go                  |   1 +
 .../test/changeset/capability_registry.go     |  87 ++++
 .../changeset/capability_registry_test.go     |  46 ++
 .../testdata/capability_registry_view.json    | 455 ++++++++++++++++++
 11 files changed, 717 insertions(+), 10 deletions(-)
 create mode 100644 deployment/keystone/test/changeset/capability_registry.go
 create mode 100644 deployment/keystone/test/changeset/capability_registry_test.go
 create mode 100644 deployment/keystone/test/changeset/testdata/capability_registry_view.json

diff --git a/deployment/common/view/v1_0/capreg.go b/deployment/common/view/v1_0/capreg.go
index 2ddd5a13463..3274cc4e97f 100644
--- a/deployment/common/view/v1_0/capreg.go
+++ b/deployment/common/view/v1_0/capreg.go
@@ -26,7 +26,7 @@ type CapabilityRegistryView struct {
 
 // MarshalJSON marshals the CapabilityRegistryView to JSON. It includes the Capabilities, Nodes, Nops, and Dons
 // and a denormalized summary of the Dons with their associated Nodes and Capabilities, which is useful for a high-level view
-func (v CapabilityRegistryView) MarshalJSON() ([]byte, error) {
+func (v *CapabilityRegistryView) MarshalJSON() ([]byte, error) {
 	// Alias to avoid recursive calls
 	type Alias struct {
 		types.ContractMetaData
@@ -51,6 +51,36 @@ func (v CapabilityRegistryView) MarshalJSON() ([]byte, error) {
 	return json.MarshalIndent(&a, "", " ")
 }
 
+// UnmarshalJSON unmarshals the CapabilityRegistryView from JSON. Since the CapabilityRegistryView doesn't hold a DonCapabilities field,
+// it is not unmarshaled.
+func (v *CapabilityRegistryView) UnmarshalJSON(data []byte) error {
+	// Alias to avoid recursive calls
+	type Alias struct {
+		types.ContractMetaData
+		Capabilities    []CapabilityView      `json:"capabilities,omitempty"`
+		Nodes           []NodeView            `json:"nodes,omitempty"`
+		Nops            []NopView             `json:"nops,omitempty"`
+		Dons            []DonView             `json:"dons,omitempty"`
+		DonCapabilities []DonDenormalizedView `json:"don_capabilities_summary,omitempty"`
+	}
+	a := Alias{
+		ContractMetaData: v.ContractMetaData,
+		Capabilities:     v.Capabilities,
+		Nodes:            v.Nodes,
+		Nops:             v.Nops,
+		Dons:             v.Dons,
+	}
+	if err := json.Unmarshal(data, &a); err != nil {
+		return err
+	}
+	v.ContractMetaData = a.ContractMetaData
+	v.Capabilities = a.Capabilities
+	v.Nodes = a.Nodes
+	v.Nops = a.Nops
+	v.Dons = a.Dons
+	return nil
+}
+
 // GenerateCapabilityRegistryView generates a CapRegView from a CapabilitiesRegistry contract.
 func GenerateCapabilityRegistryView(capReg *capabilities_registry.CapabilitiesRegistry) (CapabilityRegistryView, error) {
 	tv, err := types.NewContractMetaData(capReg, capReg.Address())
@@ -112,7 +142,7 @@ type DonDenormalizedView struct {
 // Nodes and Capabilities. This is a useful form of the CapabilityRegistryView, but it is not definitive.
 // The full CapRegView should be used for the most accurate information as it can contain
 // Capabilities and Nodes the are not associated with any Don.
-func (v CapabilityRegistryView) DonDenormalizedView() ([]DonDenormalizedView, error) {
+func (v *CapabilityRegistryView) DonDenormalizedView() ([]DonDenormalizedView, error) {
 	var out []DonDenormalizedView
 	for _, don := range v.Dons {
 		var nodes []NodeDenormalizedView
@@ -140,6 +170,91 @@ func (v CapabilityRegistryView) DonDenormalizedView() ([]DonDenormalizedView, er
 	return out, nil
 }
 
+func (v *CapabilityRegistryView) NodesToNodesParams() ([]capabilities_registry.CapabilitiesRegistryNodeParams, error) {
+	var nodesParams []capabilities_registry.CapabilitiesRegistryNodeParams
+	for _, node := range v.Nodes {
+		signer, err := hexTo32Bytes(node.Signer)
+		if err != nil {
+			return nil, err
+		}
+		encryptionPubKey, err := hexTo32Bytes(node.EncryptionPublicKey)
+		if err != nil {
+			return nil, err
+		}
+		capIDs := make([][32]byte, len(node.CapabilityIDs))
+		for i, id := range node.CapabilityIDs {
+			cid, err := hexTo32Bytes(id)
+			if err != nil {
+				return nil, err
+			}
+			capIDs[i] = cid
+		}
+		nodesParams = append(nodesParams, capabilities_registry.CapabilitiesRegistryNodeParams{
+			Signer:              signer,
+			P2pId:               node.P2pId,
+			EncryptionPublicKey: encryptionPubKey,
+			NodeOperatorId:      node.NodeOperatorID,
+			HashedCapabilityIds: capIDs,
+		})
+	}
+
+	return nodesParams, nil
+}
+
+func (v *CapabilityRegistryView) CapabilitiesToCapabilitiesParams() []capabilities_registry.CapabilitiesRegistryCapability {
+	var capabilitiesParams []capabilities_registry.CapabilitiesRegistryCapability
+	for _, capability := range v.Capabilities {
+		capabilitiesParams = append(capabilitiesParams, capabilities_registry.CapabilitiesRegistryCapability{
+			LabelledName:          capability.LabelledName,
+			Version:               capability.Version,
+			CapabilityType:        capability.CapabilityType,
+			ResponseType:          capability.ResponseType,
+			ConfigurationContract: capability.ConfigurationContract,
+		})
+	}
+	return capabilitiesParams
+}
+
+func (v *CapabilityRegistryView) NopsToNopsParams() []capabilities_registry.CapabilitiesRegistryNodeOperator {
+	var nopsParams []capabilities_registry.CapabilitiesRegistryNodeOperator
+	for _, nop := range v.Nops {
+		nopsParams = append(nopsParams, capabilities_registry.CapabilitiesRegistryNodeOperator{
+			Admin: nop.Admin,
+			Name:  nop.Name,
+		})
+	}
+	return nopsParams
+}
+
+func (v *CapabilityRegistryView) CapabilityConfigToCapabilityConfigParams(don DonView) ([]capabilities_registry.CapabilitiesRegistryCapabilityConfiguration, error) {
+	var cfgs []capabilities_registry.CapabilitiesRegistryCapabilityConfiguration
+	for _, cfg := range don.CapabilityConfigurations {
+		cid, err := hexTo32Bytes(cfg.ID)
+		if err != nil {
+			return nil, err
+		}
+		config, err := hex.DecodeString(cfg.Config)
+		if err != nil {
+			return nil, err
+		}
+		cfgs = append(cfgs, capabilities_registry.CapabilitiesRegistryCapabilityConfiguration{
+			CapabilityId: cid,
+			Config:       config,
+		})
+	}
+	return cfgs, nil
+}
+
+func hexTo32Bytes(val string) ([32]byte, error) {
+	var out [32]byte
+	b, err := hex.DecodeString(val)
+	if err != nil {
+		return out, err
+	}
+	copy(out[:], b)
+	return out, nil
+}
+
 // CapabilityView is a serialization-friendly view of a capability in the capabilities registry.
 type CapabilityView struct {
 	ID                    string         `json:"id"` // hex 32 bytes
@@ -272,7 +387,7 @@ func NewNodeView(n capabilities_registry.INodeInfoProviderNodeInfo) NodeView {
 			ConfigCount:         n.ConfigCount,
 			WorkflowDONID:       n.WorkflowDONId,
 			Signer:              hex.EncodeToString(n.Signer[:]),
-			P2pId:               p2pkey.PeerID(n.P2pId),
+			P2pId:               n.P2pId,
 			EncryptionPublicKey: hex.EncodeToString(n.EncryptionPublicKey[:]),
 		},
 		NodeOperatorID:   n.NodeOperatorId,
@@ -328,7 +443,7 @@ func NewNopView(nop capabilities_registry.CapabilitiesRegistryNodeOperator) NopV
 	}
 }
 
-func (v CapabilityRegistryView) nodeDenormalizedView(n NodeView) (NodeDenormalizedView, error) {
+func (v *CapabilityRegistryView) nodeDenormalizedView(n NodeView) (NodeDenormalizedView, error) {
 	nop, err := nodeNop(n, v.Nops)
 	if err != nil {
 		return NodeDenormalizedView{}, err
diff --git a/deployment/common/view/v1_0/capreg_test.go b/deployment/common/view/v1_0/capreg_test.go
index 8ba7b880364..2f58034a619 100644
--- a/deployment/common/view/v1_0/capreg_test.go
+++ b/deployment/common/view/v1_0/capreg_test.go
@@ -4,9 +4,10 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/stretchr/testify/assert"
+
 	"github.com/smartcontractkit/chainlink/deployment/common/view/types"
 	cr "github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
-	"github.com/stretchr/testify/assert"
 )
 
 func TestCapRegView_Denormalize(t *testing.T) {
diff --git a/deployment/keystone/capability_registry_deployer.go b/deployment/keystone/capability_registry_deployer.go
index efe1d23f11f..a4648c27905 100644
--- a/deployment/keystone/capability_registry_deployer.go
+++ b/deployment/keystone/capability_registry_deployer.go
@@ -9,6 +9,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
 )
diff --git a/deployment/keystone/changeset/deploy_registry.go b/deployment/keystone/changeset/deploy_registry.go
index 2c08e5ca8b7..e9b142812d7 100644
--- a/deployment/keystone/changeset/deploy_registry.go
+++ b/deployment/keystone/changeset/deploy_registry.go
@@ -7,11 +7,9 @@ import (
 	kslib "github.com/smartcontractkit/chainlink/deployment/keystone"
 )
 
-func DeployCapabilityRegistry(env deployment.Environment, config interface{}) (deployment.ChangesetOutput, error) {
-	registrySelector, ok := config.(uint64)
-	if !ok {
-		return deployment.ChangesetOutput{}, deployment.ErrInvalidConfig
-	}
+var _ deployment.ChangeSet[uint64] = DeployCapabilityRegistry
+
+func DeployCapabilityRegistry(env deployment.Environment, registrySelector uint64) (deployment.ChangesetOutput, error) {
 	chain, ok := env.Chains[registrySelector]
 	if !ok {
 		return deployment.ChangesetOutput{}, fmt.Errorf("chain not found in environment")
diff --git a/deployment/keystone/changeset/deploy_registry_test.go b/deployment/keystone/changeset/deploy_registry_test.go
index 6aa383ef68c..9abf357f2a8 100644
--- a/deployment/keystone/changeset/deploy_registry_test.go
+++ b/deployment/keystone/changeset/deploy_registry_test.go
@@ -8,6 +8,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/smartcontractkit/chainlink/deployment/environment/memory"
 	"github.com/smartcontractkit/chainlink/deployment/keystone/changeset"
 )
diff --git a/deployment/keystone/changeset/view_test.go b/deployment/keystone/changeset/view_test.go
index 2d4569dfbec..023b4462549 100644
--- a/deployment/keystone/changeset/view_test.go
+++ b/deployment/keystone/changeset/view_test.go
@@ -7,6 +7,7 @@ import (
 	"go.uber.org/zap/zapcore"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/smartcontractkit/chainlink/deployment/environment/memory"
 )
 
diff --git a/deployment/keystone/contract_set.go b/deployment/keystone/contract_set.go
index a0446dcfce0..ccd89f6905f 100644
--- a/deployment/keystone/contract_set.go
+++ b/deployment/keystone/contract_set.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/smartcontractkit/chainlink/deployment"
 )
 
diff --git a/deployment/keystone/state.go b/deployment/keystone/state.go
index 33200a40e02..68f2ab97a5d 100644
--- a/deployment/keystone/state.go
+++ b/deployment/keystone/state.go
@@ -6,6 +6,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
+
 	"github.com/smartcontractkit/chainlink/deployment"
 	common_v1_0 "github.com/smartcontractkit/chainlink/deployment/common/view/v1_0"
 	"github.com/smartcontractkit/chainlink/deployment/keystone/view"
diff --git a/deployment/keystone/test/changeset/capability_registry.go b/deployment/keystone/test/changeset/capability_registry.go
new file mode 100644
index 00000000000..28ee711dc75
--- /dev/null
+++ b/deployment/keystone/test/changeset/capability_registry.go
@@ -0,0 +1,87 @@
+package changeset
+
+import (
+	"fmt"
+	"testing"
+
+	chainsel "github.com/smartcontractkit/chain-selectors"
+
+	"github.com/smartcontractkit/chainlink/deployment"
+	"github.com/smartcontractkit/chainlink/deployment/common/view/v1_0"
+	"github.com/smartcontractkit/chainlink/deployment/keystone"
+	"github.com/smartcontractkit/chainlink/deployment/keystone/changeset"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/keystone/generated/capabilities_registry"
+)
+
+type HydrateConfig struct {
+	ChainID uint64
+}
+
+// HydrateCapabilityRegistry deploys a new capabilities registry contract and hydrates it with the provided data.
+func HydrateCapabilityRegistry(t *testing.T, v v1_0.CapabilityRegistryView, env deployment.Environment, cfg HydrateConfig) (*capabilities_registry.CapabilitiesRegistry, error) {
+	t.Helper()
+	chainSelector, err := chainsel.SelectorFromChainId(cfg.ChainID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get chain selector from chain id: %w", err)
+	}
+	chain, ok := env.Chains[chainSelector]
+	if !ok {
+		return nil, fmt.Errorf("chain with id %d not found", cfg.ChainID)
+	}
+	changesetOutput, err := changeset.DeployCapabilityRegistry(env, chainSelector)
+	if err != nil {
+		return nil, fmt.Errorf("failed to deploy contract: %w", err)
+	}
+
+	resp, err := keystone.GetContractSets(env.Logger, &keystone.GetContractSetsRequest{
+		Chains:      env.Chains,
+		AddressBook: changesetOutput.AddressBook,
+	})
+	if err != nil {
+		return nil, fmt.Errorf("failed to get contract sets: %w", err)
+	}
+	cs, ok := resp.ContractSets[chainSelector]
+	if !ok {
+		return nil, fmt.Errorf("failed to get contract set for chain selector: %d, chain ID: %d", chainSelector, cfg.ChainID)
+	}
+
+	deployedContract := cs.CapabilitiesRegistry
+
+	nopsParams := v.NopsToNopsParams()
+	tx, err := deployedContract.AddNodeOperators(chain.DeployerKey, nopsParams)
+	if _, err = deployment.ConfirmIfNoError(chain, tx, keystone.DecodeErr(capabilities_registry.CapabilitiesRegistryABI, err)); err != nil {
+		return nil, fmt.Errorf("failed to add node operators: %w", err)
+	}
+
+	capabilitiesParams := v.CapabilitiesToCapabilitiesParams()
+	tx, err = deployedContract.AddCapabilities(chain.DeployerKey, capabilitiesParams)
+	if _, err = deployment.ConfirmIfNoError(chain, tx, keystone.DecodeErr(capabilities_registry.CapabilitiesRegistryABI, err)); err != nil {
+		return nil, fmt.Errorf("failed to add capabilities: %w", err)
+	}
+
+	nodesParams, err := v.NodesToNodesParams()
+	if err != nil {
+		return nil, fmt.Errorf("failed to convert nodes to nodes params: %w", err)
+	}
+	tx, err = deployedContract.AddNodes(chain.DeployerKey, nodesParams)
+	if _, err = deployment.ConfirmIfNoError(chain, tx, keystone.DecodeErr(capabilities_registry.CapabilitiesRegistryABI, err)); err != nil {
+		return nil, fmt.Errorf("failed to add nodes: %w", err)
+	}
+
+	for _, don := range v.Dons {
+		cfgs, err := v.CapabilityConfigToCapabilityConfigParams(don)
+		if err != nil {
+			return nil, fmt.Errorf("failed to convert capability configurations to capability configuration params: %w", err)
+		}
+		var peerIds [][32]byte
+		for _, id := range don.NodeP2PIds {
+			peerIds = append(peerIds, id)
+		}
+		tx, err = deployedContract.AddDON(chain.DeployerKey, peerIds, cfgs, don.IsPublic, don.AcceptsWorkflows, don.F)
+		if _, err = deployment.ConfirmIfNoError(chain, tx, keystone.DecodeErr(capabilities_registry.CapabilitiesRegistryABI, err)); err != nil {
+			return nil, fmt.Errorf("failed to add don: %w", err)
+		}
+	}
+
+	return deployedContract, nil
+}
diff --git a/deployment/keystone/test/changeset/capability_registry_test.go b/deployment/keystone/test/changeset/capability_registry_test.go
new file mode 100644
index 00000000000..765c95ff294
--- /dev/null
+++ b/deployment/keystone/test/changeset/capability_registry_test.go
@@ -0,0 +1,46 @@
+package changeset
+
+import (
+	"encoding/json"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+	"go.uber.org/zap/zapcore"
+
+	chainsel "github.com/smartcontractkit/chain-selectors"
+
+	"github.com/smartcontractkit/chainlink/deployment/common/view/v1_0"
+	"github.com/smartcontractkit/chainlink/deployment/environment/memory"
+	"github.com/smartcontractkit/chainlink/v2/core/logger"
+)
+
+func TestHydrateCapabilityRegistry(t *testing.T) {
+	b, err := os.ReadFile("testdata/capability_registry_view.json")
+	require.NoError(t, err)
+	require.NotEmpty(t, b)
+	var capabilityRegistryView v1_0.CapabilityRegistryView
+	require.NoError(t, json.Unmarshal(b, &capabilityRegistryView))
+
+	chainID := chainsel.TEST_90000001.EvmChainID
+	cfg := HydrateConfig{ChainID: chainID}
+	env := memory.NewMemoryEnvironment(t, logger.TestLogger(t), zapcore.InfoLevel, memory.MemoryEnvironmentConfig{
+		Bootstraps: 1,
+		Chains:     1,
+		Nodes:      4,
+	})
+	hydrated, err := HydrateCapabilityRegistry(t, capabilityRegistryView, env, cfg)
+	require.NoError(t, err)
+	require.NotNil(t, hydrated)
+	hydratedCapView, err := v1_0.GenerateCapabilityRegistryView(hydrated)
+	require.NoError(t, err)
+
+	// Setting address/owner values to be the same in order to compare the views
+	hydratedCapView.Address = capabilityRegistryView.Address
+	hydratedCapView.Owner = capabilityRegistryView.Owner
+	b1, err := capabilityRegistryView.MarshalJSON()
+	require.NoError(t, err)
+	b2, err := hydratedCapView.MarshalJSON()
+	require.NoError(t, err)
+	require.Equal(t, string(b1), string(b2))
+}
diff --git a/deployment/keystone/test/changeset/testdata/capability_registry_view.json b/deployment/keystone/test/changeset/testdata/capability_registry_view.json
new file mode 100644
index 00000000000..fef22a7b4dc
--- /dev/null
+++ b/deployment/keystone/test/changeset/testdata/capability_registry_view.json
@@ -0,0 +1,455 @@
+{
+ "typeAndVersion": "CapabilitiesRegistry 1.1.0",
+ "address": "0x65a097a74769fe1c415993f45d9b56ffffb65807",
+ "owner": "0x61050aeba13a5f7ba0b06cac4e1aee625fe4a640",
+ "capabilities": [
+  {
+   "id": "9f0f33d3737af0a2acae89e7f8c4638aeb886a67c1d84e13aee8532c70aa9483",
+   "labelled_name": "write_ethereum-testnet-sepolia",
+   "version": "1.0.0",
+   "capability_type": 3,
+   "response_type": 0,
+   "configuration_contract": "0x0000000000000000000000000000000000000000"
+  },
+  {
+   "id": "1ea6e85dfb8ebb08b7cd82b42ab4655429a8ae116d513be0d68a7d7661667a8a",
+   "labelled_name": "streams-trigger",
+   "version": "1.0.0",
+   "capability_type": 0,
+   "response_type": 0,
+   "configuration_contract": "0x0000000000000000000000000000000000000000"
+  },
+  {
+   "id": "578ebf7413c15e36dfd792396c5a4d75c43f0ee7bbabdb703f7c5acd0bb65a1b",
+   "labelled_name": "offchain_reporting",
+   "version": "1.0.0",
+   "capability_type": 2,
+   "response_type": 0,
+   "configuration_contract": "0x0000000000000000000000000000000000000000"
+  }
+ ],
+ "nodes": [
+  {
+   "config_count": 1,
+   "workflow_don_id": 1,
+   "signer": "f36818345fb18549bd24305c79f2f28d80d25710000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWGVWpMrCZDotqSYWj8xqb1i5kNecpoarczpQoSAHdqwj8",
+   "encryption_public_key": "986707930499b85ab01705aa8d5cd99dca40926db3fa1728e6b58d25fddfe46b",
+   "node_operator_id": 1,
+   "capability_ids": [
+    "578ebf7413c15e36dfd792396c5a4d75c43f0ee7bbabdb703f7c5acd0bb65a1b"
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 0,
+   "signer": "a0e11229b4b5d40d299f7f4b3348a1b16f5f3dd3000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWPsGKEe34m9X8qiWVpa6VEcjdvhbygJRLKXdVEr3r96PH",
+   "encryption_public_key": "10c77049880fe0924f463763789985a0f76e09f82fc6f39943684b2dd05b98bf",
+   "node_operator_id": 2,
+   "capability_ids": [
+    "9f0f33d3737af0a2acae89e7f8c4638aeb886a67c1d84e13aee8532c70aa9483"
+   ],
+   "capability_don_ids": [
+    2
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 0,
+   "signer": "3f871cd7c34e50320934b6ba9b90b249363fd378000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWLjKKWLhYkr68PH9FaZZR93WbJuohWWcTfA9JeY1UPoJa",
+   "encryption_public_key": "5cf5abd0349b27cde43ad1a55aa3b02a5518aa6eed365bd65ca5e0e2cbfdaa5a",
+   "node_operator_id": 3,
+   "capability_ids": [
+    "1ea6e85dfb8ebb08b7cd82b42ab4655429a8ae116d513be0d68a7d7661667a8a"
+   ],
+   "capability_don_ids": [
+    3
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 0,
+   "signer": "d7a432ce8f23c410302e7577de9973ccbca29576000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWRG3rsPdQyWCPsQukUF5JqFLdPqVVXvEfG2PAPBbqdRXp",
+   "encryption_public_key": "c10cead34374ba20704a05ca0369018b41778a0297adb85554cdd6e5955bf4b6",
+   "node_operator_id": 3,
+   "capability_ids": [
+    "1ea6e85dfb8ebb08b7cd82b42ab4655429a8ae116d513be0d68a7d7661667a8a"
+   ],
+   "capability_don_ids": [
+    3
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 0,
+   "signer": "f1d2b3d13c46b0c1ded96534aabd6bae61934e3f000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWD1uj8Y9Phdr1yScfbBy1Q9ebedMVBjMUBLW4m4XnEzGF",
+   "encryption_public_key": "5fc3dae131da5b0ac5474ad029e3a6c547e17249a6266427d5eea1f529b6488b",
+   "node_operator_id": 3,
+   "capability_ids": [
+    "1ea6e85dfb8ebb08b7cd82b42ab4655429a8ae116d513be0d68a7d7661667a8a"
+   ],
+   "capability_don_ids": [
+    3
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 1,
+   "signer": "afabd7685010d619ee6614e732b15e898c293426000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWE8ymezL2wxXcZdhznnBkVNcBRbtxVfNx1vppu7Z7zfnd",
+   "encryption_public_key": "8a2aef988ccc85d985d12270c5263032b9a7c71a86430e7b3c30a2f493462aee",
+   "node_operator_id": 1,
+   "capability_ids": [
+    "578ebf7413c15e36dfd792396c5a4d75c43f0ee7bbabdb703f7c5acd0bb65a1b"
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 1,
+   "signer": "4bad6c33b85ba3bbbada74c93a7a719962456af8000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWSEF7cqkbMrS6uCo6xzCsfcPgquN652mZijmay8e3pn5R",
+   "encryption_public_key": "cf8e0e8c830f733dd5992076d0adaeb34c97410dd5d8d04afccad88070b07f20",
+   "node_operator_id": 1,
+   "capability_ids": [
+    "578ebf7413c15e36dfd792396c5a4d75c43f0ee7bbabdb703f7c5acd0bb65a1b"
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 1,
+   "signer": "078cb3bca763a11a0c79df636b018311d9e36954000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWAumheDZJdc3in1qiYGAQESTUm1nAWGA59eQPb3wuFHJa",
+   "encryption_public_key": "c8f45b74982037dd52eeb3df5295c7769757c72cde9a930fc82cb72caf0085ad",
+   "node_operator_id": 1,
+   "capability_ids": [
+    "578ebf7413c15e36dfd792396c5a4d75c43f0ee7bbabdb703f7c5acd0bb65a1b"
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 0,
+   "signer": "7621630d4f33e02f659445974060df375c126e82000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWF1XmgvoLx45H3iGc9jD4mK7X1mctYmhZCqw5h1S1sXtA",
+   "encryption_public_key": "f8d7485910b56c9521dea1beb3d50151917bae18e131ad311ef90300318b8110",
+   "node_operator_id": 2,
+   "capability_ids": [
+    "9f0f33d3737af0a2acae89e7f8c4638aeb886a67c1d84e13aee8532c70aa9483"
+   ],
+   "capability_don_ids": [
+    2
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 0,
+   "signer": "b5599a0a8aa99860997e42d650c3dc1ac767a4b1000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWFBsQE8gCZndyefzCZG6KHyjoeii7o7ff171tQHsGYq1p",
+   "encryption_public_key": "4081aacba87f07ea54c32517a9b661963a5fed5fbfd2042ff0823293d8fbd523",
+   "node_operator_id": 2,
+   "capability_ids": [
+    "9f0f33d3737af0a2acae89e7f8c4638aeb886a67c1d84e13aee8532c70aa9483"
+   ],
+   "capability_don_ids": [
+    2
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 0,
+   "signer": "2067cc4ec71978974265e578eb9b5c62cccc0d33000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWKYQ51iqiS99MWfE8gwy7P1sN8oL4WboWLPxHRo8duc28",
+   "encryption_public_key": "533bfbd913615823cbb93251f27f3cbdd035a732c0a68ad49081b37a702fe4a1",
+   "node_operator_id": 2,
+   "capability_ids": [
+    "9f0f33d3737af0a2acae89e7f8c4638aeb886a67c1d84e13aee8532c70aa9483"
+   ],
+   "capability_don_ids": [
+    2
+   ]
+  },
+  {
+   "config_count": 1,
+   "workflow_don_id": 0,
+   "signer": "cd08a4d5934c41a389c2bd7b6fadfb1dace5f110000000000000000000000000",
+   "p2p_id": "p2p_12D3KooWMQjP7pp8ecxMSMd3Y3NocDsHt7g64bd7iGJhCr35gkby",
+   "encryption_public_key": "9ee181448ef55e381217ec959375fb302eba62e61006e4c9467832836cc8640e",
+   "node_operator_id": 3,
+   "capability_ids": [
+    "1ea6e85dfb8ebb08b7cd82b42ab4655429a8ae116d513be0d68a7d7661667a8a"
+   ],
+   "capability_don_ids": [
+    3
+   ]
+  }
+ ],
+ "nops": [
+  {
+   "admin": "0x528fdfde37119b52010a4920b09ef828249a3434",
+   "name": "nop 1"
+  },
+  {
+   "admin": "0xe0967f1d0f36df4c53a34e491465c9d3f0095eb9",
+   "name": "nop 2"
+  },
+  {
+   "admin": "0xe676a607b6f5c0b6d4c21aa616d727d5b0a47f35",
+   "name": "nop 3"
+  }
+ ],
+ "dons": [
+  {
+   "id": 1,
+   "config_count": 1,
+   "f": 1,
+   "is_public": true,
+   "accepts_workflows": true,
+   "node_p2p_ids": [
+    "p2p_12D3KooWAumheDZJdc3in1qiYGAQESTUm1nAWGA59eQPb3wuFHJa",
+    "p2p_12D3KooWE8ymezL2wxXcZdhznnBkVNcBRbtxVfNx1vppu7Z7zfnd",
+    "p2p_12D3KooWGVWpMrCZDotqSYWj8xqb1i5kNecpoarczpQoSAHdqwj8",
+    "p2p_12D3KooWSEF7cqkbMrS6uCo6xzCsfcPgquN652mZijmay8e3pn5R"
+   ],
+   "capability_configurations": [
+    {
+     "id": "578ebf7413c15e36dfd792396c5a4d75c43f0ee7bbabdb703f7c5acd0bb65a1b",
+     "config": "0a00"
+    }
+   ]
+  },
+  {
+   "id": 2,
+   "config_count": 1,
+   "f": 1,
+   "is_public": true,
+   "node_p2p_ids": [
+    "p2p_12D3KooWF1XmgvoLx45H3iGc9jD4mK7X1mctYmhZCqw5h1S1sXtA",
+    "p2p_12D3KooWFBsQE8gCZndyefzCZG6KHyjoeii7o7ff171tQHsGYq1p",
+    "p2p_12D3KooWKYQ51iqiS99MWfE8gwy7P1sN8oL4WboWLPxHRo8duc28",
+    "p2p_12D3KooWPsGKEe34m9X8qiWVpa6VEcjdvhbygJRLKXdVEr3r96PH"
+   ],
+   "capability_configurations": [
+    {
+     "id": "9f0f33d3737af0a2acae89e7f8c4638aeb886a67c1d84e13aee8532c70aa9483",
+     "config": "0a001a1a0a187369676e65645f7265706f72742e5369676e617475726573"
+    }
+   ]
+  },
+  {
+   "id": 3,
+   "config_count": 1,
+   "f": 1,
+   "is_public": true,
+   "node_p2p_ids": [
+    "p2p_12D3KooWD1uj8Y9Phdr1yScfbBy1Q9ebedMVBjMUBLW4m4XnEzGF",
+    "p2p_12D3KooWLjKKWLhYkr68PH9FaZZR93WbJuohWWcTfA9JeY1UPoJa",
+    "p2p_12D3KooWMQjP7pp8ecxMSMd3Y3NocDsHt7g64bd7iGJhCr35gkby",
+    "p2p_12D3KooWRG3rsPdQyWCPsQukUF5JqFLdPqVVXvEfG2PAPBbqdRXp"
+   ],
+   "capability_configurations": [
+    {
+     "id": "1ea6e85dfb8ebb08b7cd82b42ab4655429a8ae116d513be0d68a7d7661667a8a",
+     "config": "0a00120a0a0208141202083c1802"
+    }
+   ]
+  }
+ ],
+ "don_capabilities_summary": [
+  {
+   "don": {
+    "id": 1,
+    "config_count": 1,
+    "f": 1,
+    "is_public": true,
+    "accepts_workflows": true
+   },
+   "nodes": [
+    {
+     "config_count": 1,
+     "workflow_don_id": 1,
+     "signer": "f36818345fb18549bd24305c79f2f28d80d25710000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWGVWpMrCZDotqSYWj8xqb1i5kNecpoarczpQoSAHdqwj8",
+     "encryption_public_key": "986707930499b85ab01705aa8d5cd99dca40926db3fa1728e6b58d25fddfe46b",
+     "nop": {
+      "admin": "0x528fdfde37119b52010a4920b09ef828249a3434",
+      "name": "nop 1"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 1,
+     "signer": "afabd7685010d619ee6614e732b15e898c293426000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWE8ymezL2wxXcZdhznnBkVNcBRbtxVfNx1vppu7Z7zfnd",
+     "encryption_public_key": "8a2aef988ccc85d985d12270c5263032b9a7c71a86430e7b3c30a2f493462aee",
+     "nop": {
+      "admin": "0x528fdfde37119b52010a4920b09ef828249a3434",
+      "name": "nop 1"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 1,
+     "signer": "4bad6c33b85ba3bbbada74c93a7a719962456af8000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWSEF7cqkbMrS6uCo6xzCsfcPgquN652mZijmay8e3pn5R",
+     "encryption_public_key": "cf8e0e8c830f733dd5992076d0adaeb34c97410dd5d8d04afccad88070b07f20",
+     "nop": {
+      "admin": "0x528fdfde37119b52010a4920b09ef828249a3434",
+      "name": "nop 1"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 1,
+     "signer": "078cb3bca763a11a0c79df636b018311d9e36954000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWAumheDZJdc3in1qiYGAQESTUm1nAWGA59eQPb3wuFHJa",
+     "encryption_public_key": "c8f45b74982037dd52eeb3df5295c7769757c72cde9a930fc82cb72caf0085ad",
+     "nop": {
+      "admin": "0x528fdfde37119b52010a4920b09ef828249a3434",
+      "name": "nop 1"
+     }
+    }
+   ],
+   "capabilities": [
+    {
+     "id": "578ebf7413c15e36dfd792396c5a4d75c43f0ee7bbabdb703f7c5acd0bb65a1b",
+     "labelled_name": "offchain_reporting",
+     "version": "1.0.0",
+     "capability_type": 2,
+     "response_type": 0,
+     "configuration_contract": "0x0000000000000000000000000000000000000000"
+    }
+   ]
+  },
+  {
+   "don": {
+    "id": 2,
+    "config_count": 1,
+    "f": 1,
+    "is_public": true
+   },
+   "nodes": [
+    {
+     "config_count": 1,
+     "workflow_don_id": 0,
+     "signer": "a0e11229b4b5d40d299f7f4b3348a1b16f5f3dd3000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWPsGKEe34m9X8qiWVpa6VEcjdvhbygJRLKXdVEr3r96PH",
+     "encryption_public_key": "10c77049880fe0924f463763789985a0f76e09f82fc6f39943684b2dd05b98bf",
+     "nop": {
+      "admin": "0xe0967f1d0f36df4c53a34e491465c9d3f0095eb9",
+      "name": "nop 2"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 0,
+     "signer": "7621630d4f33e02f659445974060df375c126e82000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWF1XmgvoLx45H3iGc9jD4mK7X1mctYmhZCqw5h1S1sXtA",
+     "encryption_public_key": "f8d7485910b56c9521dea1beb3d50151917bae18e131ad311ef90300318b8110",
+     "nop": {
+      "admin": "0xe0967f1d0f36df4c53a34e491465c9d3f0095eb9",
+      "name": "nop 2"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 0,
+     "signer": "b5599a0a8aa99860997e42d650c3dc1ac767a4b1000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWFBsQE8gCZndyefzCZG6KHyjoeii7o7ff171tQHsGYq1p",
+     "encryption_public_key": "4081aacba87f07ea54c32517a9b661963a5fed5fbfd2042ff0823293d8fbd523",
+     "nop": {
+      "admin": "0xe0967f1d0f36df4c53a34e491465c9d3f0095eb9",
+      "name": "nop 2"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 0,
+     "signer": "2067cc4ec71978974265e578eb9b5c62cccc0d33000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWKYQ51iqiS99MWfE8gwy7P1sN8oL4WboWLPxHRo8duc28",
+     "encryption_public_key": "533bfbd913615823cbb93251f27f3cbdd035a732c0a68ad49081b37a702fe4a1",
+     "nop": {
+      "admin": "0xe0967f1d0f36df4c53a34e491465c9d3f0095eb9",
+      "name": "nop 2"
+     }
+    }
+   ],
+   "capabilities": [
+    {
+     "id": "9f0f33d3737af0a2acae89e7f8c4638aeb886a67c1d84e13aee8532c70aa9483",
+     "labelled_name": "write_ethereum-testnet-sepolia",
+     "version": "1.0.0",
+     "capability_type": 3,
+     "response_type": 0,
+     "configuration_contract": "0x0000000000000000000000000000000000000000"
+    }
+   ]
+  },
+  {
+   "don": {
+    "id": 3,
+    "config_count": 1,
+    "f": 1,
+    "is_public": true
+   },
+   "nodes": [
+    {
+     "config_count": 1,
+     "workflow_don_id": 0,
+     "signer": "3f871cd7c34e50320934b6ba9b90b249363fd378000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWLjKKWLhYkr68PH9FaZZR93WbJuohWWcTfA9JeY1UPoJa",
+     "encryption_public_key": "5cf5abd0349b27cde43ad1a55aa3b02a5518aa6eed365bd65ca5e0e2cbfdaa5a",
+     "nop": {
+      "admin": "0xe676a607b6f5c0b6d4c21aa616d727d5b0a47f35",
+      "name": "nop 3"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 0,
+     "signer": "d7a432ce8f23c410302e7577de9973ccbca29576000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWRG3rsPdQyWCPsQukUF5JqFLdPqVVXvEfG2PAPBbqdRXp",
+     "encryption_public_key": "c10cead34374ba20704a05ca0369018b41778a0297adb85554cdd6e5955bf4b6",
+     "nop": {
+      "admin": "0xe676a607b6f5c0b6d4c21aa616d727d5b0a47f35",
+      "name": "nop 3"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 0,
+     "signer": "f1d2b3d13c46b0c1ded96534aabd6bae61934e3f000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWD1uj8Y9Phdr1yScfbBy1Q9ebedMVBjMUBLW4m4XnEzGF",
+     "encryption_public_key": "5fc3dae131da5b0ac5474ad029e3a6c547e17249a6266427d5eea1f529b6488b",
+     "nop": {
+      "admin": "0xe676a607b6f5c0b6d4c21aa616d727d5b0a47f35",
+      "name": "nop 3"
+     }
+    },
+    {
+     "config_count": 1,
+     "workflow_don_id": 0,
+     "signer": "cd08a4d5934c41a389c2bd7b6fadfb1dace5f110000000000000000000000000",
+     "p2p_id": "p2p_12D3KooWMQjP7pp8ecxMSMd3Y3NocDsHt7g64bd7iGJhCr35gkby",
+     "encryption_public_key": "9ee181448ef55e381217ec959375fb302eba62e61006e4c9467832836cc8640e",
+     "nop": {
+      "admin": "0xe676a607b6f5c0b6d4c21aa616d727d5b0a47f35",
+      "name": "nop 3"
+     }
+    }
+   ],
+   "capabilities": [
+    {
+     "id": "1ea6e85dfb8ebb08b7cd82b42ab4655429a8ae116d513be0d68a7d7661667a8a",
+     "labelled_name": "streams-trigger",
+     "version": "1.0.0",
+     "capability_type": 0,
+     "response_type": 0,
+     "configuration_contract": "0x0000000000000000000000000000000000000000"
+    }
+   ]
+  }
+ ]
+}
\ No newline at end of file

From fa78941204ec98615435b9bfeae61160ecd29d92 Mon Sep 17 00:00:00 2001
From: Street <5597260+MStreet3@users.noreply.github.com>
Date: Mon, 25 Nov 2024 18:58:40 +0200
Subject: [PATCH 06/11] feat(handler): implements handle workflow registered
 event (#15383)

* feat(workflows): adds orm methods for managing specs

* feat(handler): implements handle workflow registered event

* chore(syncer): lint changes

* refactor(workflows/handler): check event type higher up

* refactor(workflows/handler): force update secrets with beholder

* refactor(workflows/handler): use custom error function

* fix(workflows): wires up emitter
---
 .../workflows/syncer/workflow_syncer_test.go  |   3 +
 core/services/workflows/syncer/handler.go     | 192 ++++++++++++++++--
 .../services/workflows/syncer/handler_test.go | 166 ++++++++++++++-
 core/services/workflows/syncer/mocks/orm.go   |  60 ++++++
 core/services/workflows/syncer/orm.go         |  80 ++++++++
 .../workflows/syncer/workflow_registry.go     |   6 +-
 .../syncer/workflow_registry_test.go          |   4 +-
 7 files changed, 486 insertions(+), 25 deletions(-)

diff --git a/core/services/relay/evm/capabilities/workflows/syncer/workflow_syncer_test.go b/core/services/relay/evm/capabilities/workflows/syncer/workflow_syncer_test.go
index d6f507eac20..ba29e98526e 100644
--- a/core/services/relay/evm/capabilities/workflows/syncer/workflow_syncer_test.go
+++ b/core/services/relay/evm/capabilities/workflows/syncer/workflow_syncer_test.go
@@ -11,6 +11,7 @@ import (
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/custmsg"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	"github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/workflow/generated/workflow_registry_wrapper"
@@ -29,6 +30,7 @@ func Test_SecretsWorker(t *testing.T) {
 	var (
 		ctx       = coretestutils.Context(t)
 		lggr      = logger.TestLogger(t)
+		emitter   = custmsg.NewLabeler()
 		backendTH = testutils.NewEVMBackendTH(t)
 		db        = pgtest.NewSqlxDB(t)
 		orm       = syncer.NewWorkflowRegistryDS(db, lggr)
@@ -119,6 +121,7 @@ func Test_SecretsWorker(t *testing.T) {
 		wfRegistryAddr.Hex(),
 		nil,
 		nil,
+		emitter,
 		syncer.WithTicker(giveTicker.C),
 	)
 
diff --git a/core/services/workflows/syncer/handler.go b/core/services/workflows/syncer/handler.go
index 01e13d106f9..5ccb3f5e180 100644
--- a/core/services/workflows/syncer/handler.go
+++ b/core/services/workflows/syncer/handler.go
@@ -2,12 +2,18 @@ package syncer
 
 import (
 	"context"
+	"crypto/sha256"
 	"encoding/hex"
 	"errors"
 	"fmt"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/custmsg"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/core"
+	"github.com/smartcontractkit/chainlink-common/pkg/workflows/wasm/host"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/platform"
+	"github.com/smartcontractkit/chainlink/v2/core/services/job"
+	"github.com/smartcontractkit/chainlink/v2/core/services/workflows"
 	"github.com/smartcontractkit/chainlink/v2/core/services/workflows/store"
 )
 
@@ -87,15 +93,28 @@ type WorkflowRegistryWorkflowDeletedV1 struct {
 	WorkflowName  string
 }
 
+type secretsFetcher interface {
+	SecretsFor(ctx context.Context, workflowOwner, workflowName string) (map[string]string, error)
+}
+
+// secretsFetcherFunc implements the secretsFetcher interface for a function.
+type secretsFetcherFunc func(ctx context.Context, workflowOwner, workflowName string) (map[string]string, error)
+
+func (f secretsFetcherFunc) SecretsFor(ctx context.Context, workflowOwner, workflowName string) (map[string]string, error) {
+	return f(ctx, workflowOwner, workflowName)
+}
+
 // eventHandler is a handler for WorkflowRegistryEvent events.  Each event type has a corresponding
 // method that handles the event.
 type eventHandler struct {
 	lggr           logger.Logger
-	orm            WorkflowSecretsDS
+	orm            WorkflowRegistryDS
 	fetcher        FetcherFunc
 	workflowStore  store.Store
 	capRegistry    core.CapabilitiesRegistry
 	engineRegistry *engineRegistry
+	emitter        custmsg.MessageEmitter
+	secretsFetcher secretsFetcher
 }
 
 // newEventHandler returns a new eventHandler instance.
@@ -106,6 +125,8 @@ func newEventHandler(
 	workflowStore store.Store,
 	capRegistry core.CapabilitiesRegistry,
 	engineRegistry *engineRegistry,
+	emitter custmsg.MessageEmitter,
+	secretsFetcher secretsFetcher,
 ) *eventHandler {
 	return &eventHandler{
 		lggr:           lggr,
@@ -114,15 +135,50 @@ func newEventHandler(
 		workflowStore:  workflowStore,
 		capRegistry:    capRegistry,
 		engineRegistry: engineRegistry,
+		emitter:        emitter,
+		secretsFetcher: secretsFetcher,
 	}
 }
 
 func (h *eventHandler) Handle(ctx context.Context, event WorkflowRegistryEvent) error {
 	switch event.EventType {
 	case ForceUpdateSecretsEvent:
-		return h.forceUpdateSecretsEvent(ctx, event)
+		payload, ok := event.Data.(WorkflowRegistryForceUpdateSecretsRequestedV1)
+		if !ok {
+			return newHandlerTypeError(event.Data)
+		}
+
+		cma := h.emitter.With(
+			platform.KeyWorkflowName, payload.WorkflowName,
+			platform.KeyWorkflowOwner, hex.EncodeToString(payload.Owner),
+		)
+
+		if err := h.forceUpdateSecretsEvent(ctx, payload); err != nil {
+			logCustMsg(ctx, cma, fmt.Sprintf("failed to handle force update secrets event: %v", err), h.lggr)
+			return err
+		}
+
+		return nil
 	case WorkflowRegisteredEvent:
-		return h.workflowRegisteredEvent(ctx, event)
+		payload, ok := event.Data.(WorkflowRegistryWorkflowRegisteredV1)
+		if !ok {
+			return newHandlerTypeError(event.Data)
+		}
+		wfID := hex.EncodeToString(payload.WorkflowID[:])
+
+		cma := h.emitter.With(
+			platform.KeyWorkflowID, wfID,
+			platform.KeyWorkflowName, payload.WorkflowName,
+			platform.KeyWorkflowOwner, hex.EncodeToString(payload.WorkflowOwner),
+		)
+
+		if err := h.workflowRegisteredEvent(ctx, payload); err != nil {
+			logCustMsg(ctx, cma, fmt.Sprintf("failed to handle workflow registered event: %v", err), h.lggr)
+			return err
+		}
+
+		h.lggr.Debugf("workflow 0x%x registered and started", wfID)
+		return nil
 	case WorkflowUpdatedEvent:
 		return h.workflowUpdatedEvent(ctx, event)
 	case WorkflowPausedEvent:
@@ -135,12 +191,97 @@ func (h *eventHandler) Handle(ctx context.Context, event WorkflowRegistryEvent)
 }
 
 // workflowRegisteredEvent handles the WorkflowRegisteredEvent event type.
-// TODO: Implement this method
 func (h *eventHandler) workflowRegisteredEvent(
-	_ context.Context,
-	_ WorkflowRegistryEvent,
+	ctx context.Context,
+	payload WorkflowRegistryWorkflowRegisteredV1,
 ) error {
-	return ErrNotImplemented
+	wfID := hex.EncodeToString(payload.WorkflowID[:])
+
+	// Download the contents of binaryURL, configURL and secretsURL and cache them locally.
+	binary, err := h.fetcher(ctx, payload.BinaryURL)
+	if err != nil {
+		return fmt.Errorf("failed to fetch binary from %s : %w", payload.BinaryURL, err)
+	}
+
+	config, err := h.fetcher(ctx, payload.ConfigURL)
+	if err != nil {
+		return fmt.Errorf("failed to fetch config from %s : %w", payload.ConfigURL, err)
+	}
+
+	secrets, err := h.fetcher(ctx, payload.SecretsURL)
+	if err != nil {
+		return fmt.Errorf("failed to fetch secrets from %s : %w", payload.SecretsURL, err)
+	}
+
+	// Calculate the hash of the binary and config files
+	hash := workflowID(binary, config, []byte(payload.SecretsURL))
+
+	// Pre-check: verify that the workflowID matches; if it doesn’t abort and log an error via Beholder.
+	if hash != wfID {
+		return fmt.Errorf("workflowID mismatch: %s != %s", hash, wfID)
+	}
+
+	// Save the workflow secrets
+	urlHash, err := h.orm.GetSecretsURLHash(payload.WorkflowOwner, []byte(payload.SecretsURL))
+	if err != nil {
+		return fmt.Errorf("failed to get secrets URL hash: %w", err)
+	}
+
+	// Create a new entry in the workflow_spec table corresponding for the new workflow, with the contents of the binaryURL + configURL in the table
+	status := job.WorkflowSpecStatusActive
+	if payload.Status == 1 {
+		status = job.WorkflowSpecStatusPaused
+	}
+
+	entry := &job.WorkflowSpec{
+		Workflow:      hex.EncodeToString(binary),
+		Config:        string(config),
+		WorkflowID:    wfID,
+		Status:        status,
+		WorkflowOwner: hex.EncodeToString(payload.WorkflowOwner),
+		WorkflowName:  payload.WorkflowName,
+		SpecType:      job.WASMFile,
+		BinaryURL:     payload.BinaryURL,
+		ConfigURL:     payload.ConfigURL,
+	}
+	if _, err = h.orm.UpsertWorkflowSpecWithSecrets(ctx, entry, payload.SecretsURL, hex.EncodeToString(urlHash), string(secrets)); err != nil {
+		return fmt.Errorf("failed to upsert workflow spec with secrets: %w", err)
+	}
+
+	if status != job.WorkflowSpecStatusActive {
+		return nil
+	}
+
+	// If status == active, start a new WorkflowEngine instance, and add it to local engine registry
+	moduleConfig := &host.ModuleConfig{Logger: h.lggr, Labeler: h.emitter}
+	sdkSpec, err := host.GetWorkflowSpec(ctx, moduleConfig, binary, config)
+	if err != nil {
+		return fmt.Errorf("failed to get workflow sdk spec: %w", err)
+	}
+
+	cfg := workflows.Config{
+		Lggr:           h.lggr,
+		Workflow:       *sdkSpec,
+		WorkflowID:     wfID,
+		WorkflowOwner:  hex.EncodeToString(payload.WorkflowOwner),
+		WorkflowName:   payload.WorkflowName,
+		Registry:       h.capRegistry,
+		Store:          h.workflowStore,
+		Config:         config,
+		Binary:         binary,
+		SecretsFetcher: h.secretsFetcher,
+	}
+	e, err := workflows.NewEngine(ctx, cfg)
+	if err != nil {
+		return fmt.Errorf("failed to create workflow engine: %w", err)
+	}
+
+	if err := e.Start(ctx); err != nil {
+		return fmt.Errorf("failed to start workflow engine: %w", err)
+	}
+
+	h.engineRegistry.Add(wfID, e)
+	return nil
 }
 
 // workflowUpdatedEvent handles the WorkflowUpdatedEvent event type.
@@ -170,32 +311,47 @@ func (h *eventHandler) workflowActivatedEvent(
 // forceUpdateSecretsEvent handles the ForceUpdateSecretsEvent event type.
 func (h *eventHandler) forceUpdateSecretsEvent(
 	ctx context.Context,
-	event WorkflowRegistryEvent,
+	payload WorkflowRegistryForceUpdateSecretsRequestedV1,
 ) error {
 	// Get the URL of the secrets file from the event data
-	data, ok := event.Data.(WorkflowRegistryForceUpdateSecretsRequestedV1)
-	if !ok {
-		return fmt.Errorf("invalid data type %T for event", event.Data)
-	}
-
-	hash := hex.EncodeToString(data.SecretsURLHash)
+	hash := hex.EncodeToString(payload.SecretsURLHash)
 
 	url, err := h.orm.GetSecretsURLByHash(ctx, hash)
 	if err != nil {
-		h.lggr.Errorf("failed to get URL by hash %s : %s", hash, err)
-		return err
+		return fmt.Errorf("failed to get URL by hash %s : %w", hash, err)
 	}
 
 	// Fetch the contents of the secrets file from the url via the fetcher
 	secrets, err := h.fetcher(ctx, url)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to fetch secrets from url %s : %w", url, err)
 	}
 
 	// Update the secrets in the ORM
 	if _, err := h.orm.Update(ctx, hash, string(secrets)); err != nil {
-		return err
+		return fmt.Errorf("failed to update secrets: %w", err)
 	}
 
 	return nil
 }
+
+// workflowID returns a hex encoded sha256 hash of the wasm, config and secretsURL.
+func workflowID(wasm, config, secretsURL []byte) string {
+	sum := sha256.New()
+	sum.Write(wasm)
+	sum.Write(config)
+	sum.Write(secretsURL)
+	return hex.EncodeToString(sum.Sum(nil))
+}
+
+// logCustMsg emits a custom message to the external sink and logs an error if that fails.
+func logCustMsg(ctx context.Context, cma custmsg.MessageEmitter, msg string, log logger.Logger) {
+	err := cma.Emit(ctx, msg)
+	if err != nil {
+		log.Helper(1).Errorf("failed to send custom message with msg: %s, err: %v", msg, err)
+	}
+}
+
+func newHandlerTypeError(data any) error {
+	return fmt.Errorf("invalid data type %T for event", data)
+}
diff --git a/core/services/workflows/syncer/handler_test.go b/core/services/workflows/syncer/handler_test.go
index 17c980e4f56..42da3e8de9d 100644
--- a/core/services/workflows/syncer/handler_test.go
+++ b/core/services/workflows/syncer/handler_test.go
@@ -5,18 +5,43 @@ import (
 	"encoding/hex"
 	"testing"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/custmsg"
+	"github.com/smartcontractkit/chainlink/v2/core/capabilities"
 	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/pgtest"
+	"github.com/smartcontractkit/chainlink/v2/core/internal/testutils/wasmtest"
 	"github.com/smartcontractkit/chainlink/v2/core/logger"
+	"github.com/smartcontractkit/chainlink/v2/core/services/job"
+	wfstore "github.com/smartcontractkit/chainlink/v2/core/services/workflows/store"
 	"github.com/smartcontractkit/chainlink/v2/core/services/workflows/syncer/mocks"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/crypto"
 	"github.com/smartcontractkit/chainlink/v2/core/utils/matches"
 
+	"github.com/jonboulle/clockwork"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
+type mockFetchResp struct {
+	Body []byte
+	Err  error
+}
+
+type mockFetcher struct {
+	responseMap map[string]mockFetchResp
+}
+
+func (m *mockFetcher) Fetch(_ context.Context, url string) ([]byte, error) {
+	return m.responseMap[url].Body, m.responseMap[url].Err
+}
+
+func newMockFetcher(m map[string]mockFetchResp) FetcherFunc {
+	return (&mockFetcher{responseMap: m}).Fetch
+}
+
 func Test_Handler(t *testing.T) {
 	lggr := logger.TestLogger(t)
+	emitter := custmsg.NewLabeler()
 	t.Run("success", func(t *testing.T) {
 		mockORM := mocks.NewORM(t)
 		ctx := testutils.Context(t)
@@ -38,7 +63,7 @@ func Test_Handler(t *testing.T) {
 		}
 		mockORM.EXPECT().GetSecretsURLByHash(matches.AnyContext, giveHash).Return(giveURL, nil)
 		mockORM.EXPECT().Update(matches.AnyContext, giveHash, "contents").Return(int64(1), nil)
-		h := newEventHandler(lggr, mockORM, fetcher, nil, nil, nil)
+		h := newEventHandler(lggr, mockORM, fetcher, nil, nil, nil, emitter, nil)
 		err = h.Handle(ctx, giveEvent)
 		require.NoError(t, err)
 	})
@@ -52,7 +77,7 @@ func Test_Handler(t *testing.T) {
 			return []byte("contents"), nil
 		}
 
-		h := newEventHandler(lggr, mockORM, fetcher, nil, nil, nil)
+		h := newEventHandler(lggr, mockORM, fetcher, nil, nil, nil, emitter, nil)
 		err := h.Handle(ctx, giveEvent)
 		require.Error(t, err)
 		require.Contains(t, err.Error(), "event type unsupported")
@@ -61,7 +86,7 @@ func Test_Handler(t *testing.T) {
 	t.Run("fails to get secrets url", func(t *testing.T) {
 		mockORM := mocks.NewORM(t)
 		ctx := testutils.Context(t)
-		h := newEventHandler(lggr, mockORM, nil, nil, nil, nil)
+		h := newEventHandler(lggr, mockORM, nil, nil, nil, nil, emitter, nil)
 		giveURL := "https://original-url.com"
 		giveBytes, err := crypto.Keccak256([]byte(giveURL))
 		require.NoError(t, err)
@@ -101,7 +126,7 @@ func Test_Handler(t *testing.T) {
 			return nil, assert.AnError
 		}
 		mockORM.EXPECT().GetSecretsURLByHash(matches.AnyContext, giveHash).Return(giveURL, nil)
-		h := newEventHandler(lggr, mockORM, fetcher, nil, nil, nil)
+		h := newEventHandler(lggr, mockORM, fetcher, nil, nil, nil, emitter, nil)
 		err = h.Handle(ctx, giveEvent)
 		require.Error(t, err)
 		require.ErrorIs(t, err, assert.AnError)
@@ -128,9 +153,140 @@ func Test_Handler(t *testing.T) {
 		}
 		mockORM.EXPECT().GetSecretsURLByHash(matches.AnyContext, giveHash).Return(giveURL, nil)
 		mockORM.EXPECT().Update(matches.AnyContext, giveHash, "contents").Return(0, assert.AnError)
-		h := newEventHandler(lggr, mockORM, fetcher, nil, nil, nil)
+		h := newEventHandler(lggr, mockORM, fetcher, nil, nil, nil, emitter, nil)
 		err = h.Handle(ctx, giveEvent)
 		require.Error(t, err)
 		require.ErrorIs(t, err, assert.AnError)
 	})
 }
+
+const (
+	binaryLocation = "test/simple/cmd/testmodule.wasm"
+	binaryCmd      = "core/capabilities/compute/test/simple/cmd"
+)
+
+func Test_workflowRegisteredHandler(t *testing.T) {
+	t.Run("success with paused workflow registered", func(t *testing.T) {
+		var (
+			ctx     = testutils.Context(t)
+			lggr    = logger.TestLogger(t)
+			db      = pgtest.NewSqlxDB(t)
+			orm     = NewWorkflowRegistryDS(db, lggr)
+			emitter = custmsg.NewLabeler()
+
+			binary     = wasmtest.CreateTestBinary(binaryCmd, binaryLocation, true, t)
+			config     = []byte("")
+			secretsURL = "http://example.com"
+			binaryURL  = "http://example.com/binary"
+			configURL  = "http://example.com/config"
+			wfOwner    = []byte("0xOwner")
+
+			fetcher = newMockFetcher(map[string]mockFetchResp{
+				binaryURL:  {Body: binary, Err: nil},
+				configURL:  {Body: config, Err: nil},
+				secretsURL: {Body: []byte("secrets"), Err: nil},
+			})
+		)
+
+		giveWFID := workflowID(binary, config, []byte(secretsURL))
+
+		b, err := hex.DecodeString(giveWFID)
+		require.NoError(t, err)
+		wfID := make([]byte, 32)
+		copy(wfID, b)
+
+		paused := WorkflowRegistryWorkflowRegisteredV1{
+			Status:        uint8(1),
+			WorkflowID:    [32]byte(wfID),
+			WorkflowOwner: wfOwner,
+			WorkflowName:  "workflow-name",
+			BinaryURL:     binaryURL,
+			ConfigURL:     configURL,
+			SecretsURL:    secretsURL,
+		}
+
+		h := &eventHandler{
+			lggr:    lggr,
+			orm:     orm,
+			fetcher: fetcher,
+			emitter: emitter,
+		}
+		err = h.workflowRegisteredEvent(ctx, paused)
+		require.NoError(t, err)
+
+		// Verify the record is updated in the database
+		dbSpec, err := orm.GetWorkflowSpec(ctx, hex.EncodeToString(wfOwner), "workflow-name")
+		require.NoError(t, err)
+		require.Equal(t, hex.EncodeToString(wfOwner), dbSpec.WorkflowOwner)
+		require.Equal(t, "workflow-name", dbSpec.WorkflowName)
+		require.Equal(t, job.WorkflowSpecStatusPaused, dbSpec.Status)
+	})
+
+	t.Run("success with active workflow registered", func(t *testing.T) {
+		var (
+			ctx     = testutils.Context(t)
+			lggr    = logger.TestLogger(t)
+			db      = pgtest.NewSqlxDB(t)
+			orm     = NewWorkflowRegistryDS(db, lggr)
+			emitter = custmsg.NewLabeler()
+
+			binary     = wasmtest.CreateTestBinary(binaryCmd, binaryLocation, true, t)
+			config     = []byte("")
+			secretsURL = "http://example.com"
+			binaryURL  = "http://example.com/binary"
+			configURL  = "http://example.com/config"
+			wfOwner    = []byte("0xOwner")
+
+			fetcher = newMockFetcher(map[string]mockFetchResp{
+				binaryURL:  {Body: binary, Err: nil},
+				configURL:  {Body: config, Err: nil},
+				secretsURL: {Body: []byte("secrets"), Err: nil},
+			})
+		)
+
+		giveWFID := workflowID(binary, config, []byte(secretsURL))
+
+		b, err := hex.DecodeString(giveWFID)
+		require.NoError(t, err)
+		wfID := make([]byte, 32)
+		copy(wfID, b)
+
+		active := WorkflowRegistryWorkflowRegisteredV1{
+			Status:        uint8(0),
+			WorkflowID:    [32]byte(wfID),
+			WorkflowOwner: wfOwner,
+			WorkflowName:  "workflow-name",
+			BinaryURL:     binaryURL,
+			ConfigURL:     configURL,
+			SecretsURL:    secretsURL,
+		}
+
+		er := newEngineRegistry()
+		store := wfstore.NewDBStore(db, lggr, clockwork.NewFakeClock())
+		registry := capabilities.NewRegistry(lggr)
+		h := &eventHandler{
+			lggr:           lggr,
+			orm:            orm,
+			fetcher:        fetcher,
+			emitter:        emitter,
+			engineRegistry: er,
+			capRegistry:    registry,
+			workflowStore:  store,
+		}
+		err = h.workflowRegisteredEvent(ctx, active)
+		require.NoError(t, err)
+
+		// Verify the record is updated in the database
+		dbSpec, err := orm.GetWorkflowSpec(ctx, hex.EncodeToString(wfOwner), "workflow-name")
+		require.NoError(t, err)
+		require.Equal(t, hex.EncodeToString(wfOwner), dbSpec.WorkflowOwner)
+		require.Equal(t, "workflow-name", dbSpec.WorkflowName)
+		require.Equal(t, job.WorkflowSpecStatusActive, dbSpec.Status)
+
+		// Verify the engine is started
+		engine, err := h.engineRegistry.Get(giveWFID)
+		require.NoError(t, err)
+		err = engine.Ready()
+		require.NoError(t, err)
+	})
+}
diff --git a/core/services/workflows/syncer/mocks/orm.go b/core/services/workflows/syncer/mocks/orm.go
index 2bb116cba4f..128100ea907 100644
--- a/core/services/workflows/syncer/mocks/orm.go
+++ b/core/services/workflows/syncer/mocks/orm.go
@@ -591,6 +591,66 @@ func (_c *ORM_UpsertWorkflowSpec_Call) RunAndReturn(run func(context.Context, *j
 	return _c
 }
 
+// UpsertWorkflowSpecWithSecrets provides a mock function with given fields: ctx, spec, url, hash, contents
+func (_m *ORM) UpsertWorkflowSpecWithSecrets(ctx context.Context, spec *job.WorkflowSpec, url string, hash string, contents string) (int64, error) {
+	ret := _m.Called(ctx, spec, url, hash, contents)
+
+	if len(ret) == 0 {
+		panic("no return value specified for UpsertWorkflowSpecWithSecrets")
+	}
+
+	var r0 int64
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *job.WorkflowSpec, string, string, string) (int64, error)); ok {
+		return rf(ctx, spec, url, hash, contents)
+	}
+	if rf, ok := ret.Get(0).(func(context.Context, *job.WorkflowSpec, string, string, string) int64); ok {
+		r0 = rf(ctx, spec, url, hash, contents)
+	} else {
+		r0 = ret.Get(0).(int64)
+	}
+
+	if rf, ok := ret.Get(1).(func(context.Context, *job.WorkflowSpec, string, string, string) error); ok {
+		r1 = rf(ctx, spec, url, hash, contents)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
+// ORM_UpsertWorkflowSpecWithSecrets_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'UpsertWorkflowSpecWithSecrets'
+type ORM_UpsertWorkflowSpecWithSecrets_Call struct {
+	*mock.Call
+}
+
+// UpsertWorkflowSpecWithSecrets is a helper method to define mock.On call
+//   - ctx context.Context
+//   - spec *job.WorkflowSpec
+//   - url string
+//   - hash string
+//   - contents string
+func (_e *ORM_Expecter) UpsertWorkflowSpecWithSecrets(ctx interface{}, spec interface{}, url interface{}, hash interface{}, contents interface{}) *ORM_UpsertWorkflowSpecWithSecrets_Call {
+	return &ORM_UpsertWorkflowSpecWithSecrets_Call{Call: _e.mock.On("UpsertWorkflowSpecWithSecrets", ctx, spec, url, hash, contents)}
+}
+
+func (_c *ORM_UpsertWorkflowSpecWithSecrets_Call) Run(run func(ctx context.Context, spec *job.WorkflowSpec, url string, hash string, contents string)) *ORM_UpsertWorkflowSpecWithSecrets_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*job.WorkflowSpec), args[2].(string), args[3].(string), args[4].(string))
+	})
+	return _c
+}
+
+func (_c *ORM_UpsertWorkflowSpecWithSecrets_Call) Return(_a0 int64, _a1 error) *ORM_UpsertWorkflowSpecWithSecrets_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *ORM_UpsertWorkflowSpecWithSecrets_Call) RunAndReturn(run func(context.Context, *job.WorkflowSpec, string, string, string) (int64, error)) *ORM_UpsertWorkflowSpecWithSecrets_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
 // NewORM creates a new instance of ORM. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
 // The first argument is typically a *testing.T value.
 func NewORM(t interface {
diff --git a/core/services/workflows/syncer/orm.go b/core/services/workflows/syncer/orm.go
index 4a5be9d1a58..16612b9a9c6 100644
--- a/core/services/workflows/syncer/orm.go
+++ b/core/services/workflows/syncer/orm.go
@@ -3,6 +3,7 @@ package syncer
 import (
 	"context"
 	"database/sql"
+	"fmt"
 	"time"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/sqlutil"
@@ -38,6 +39,10 @@ type WorkflowSpecsDS interface {
 	// and owner
 	UpsertWorkflowSpec(ctx context.Context, spec *job.WorkflowSpec) (int64, error)
 
+	// UpsertWorkflowSpecWithSecrets inserts or updates a workflow spec with secrets in a transaction.
+	// Updates on conflict of workflow name and owner.
+	UpsertWorkflowSpecWithSecrets(ctx context.Context, spec *job.WorkflowSpec, url, hash, contents string) (int64, error)
+
 	// GetWorkflowSpec returns the workflow spec for the given owner and name.
 	GetWorkflowSpec(ctx context.Context, owner, name string) (*job.WorkflowSpec, error)
 
@@ -221,6 +226,81 @@ func (orm *orm) UpsertWorkflowSpec(ctx context.Context, spec *job.WorkflowSpec)
 	return id, nil
 }
 
+func (orm *orm) UpsertWorkflowSpecWithSecrets(
+	ctx context.Context,
+	spec *job.WorkflowSpec, url, hash, contents string) (int64, error) {
+	var id int64
+	err := sqlutil.TransactDataSource(ctx, orm.ds, nil, func(tx sqlutil.DataSource) error {
+		var sid int64
+		txErr := tx.QueryRowxContext(ctx,
+			`INSERT INTO workflow_secrets (secrets_url, secrets_url_hash, contents)
+			 VALUES ($1, $2, $3)
+			 RETURNING id`,
+			url, hash, contents,
+		).Scan(&sid)
+
+		if txErr != nil {
+			return fmt.Errorf("failed to create workflow secrets: %w", txErr)
+		}
+
+		spec.SecretsID = sql.NullInt64{Int64: sid, Valid: true}
+
+		query := `
+			INSERT INTO workflow_specs (
+				workflow,
+				config,
+				workflow_id,
+				workflow_owner,
+				workflow_name,
+				status,
+				binary_url,
+				config_url,
+				secrets_id,
+				created_at,
+				updated_at,
+				spec_type
+			) VALUES (
+				:workflow,
+				:config,
+				:workflow_id,
+				:workflow_owner,
+				:workflow_name,
+				:status,
+				:binary_url,
+				:config_url,
+				:secrets_id,
+				:created_at,
+				:updated_at,
+				:spec_type
+			) ON CONFLICT (workflow_owner, workflow_name) DO UPDATE
+			SET
+				workflow = EXCLUDED.workflow,
+				config = EXCLUDED.config,
+				workflow_id = EXCLUDED.workflow_id,
+				workflow_owner = EXCLUDED.workflow_owner,
+				workflow_name = EXCLUDED.workflow_name,
+				status = EXCLUDED.status,
+				binary_url = EXCLUDED.binary_url,
+				config_url = EXCLUDED.config_url,
+				secrets_id = EXCLUDED.secrets_id,
+				created_at = EXCLUDED.created_at,
+				updated_at = EXCLUDED.updated_at,
+				spec_type = EXCLUDED.spec_type
+			RETURNING id
+		`
+
+		stmt, txErr := tx.PrepareNamedContext(ctx, query)
+		if txErr != nil {
+			return txErr
+		}
+		defer stmt.Close()
+
+		spec.UpdatedAt = time.Now()
+		return stmt.QueryRowxContext(ctx, spec).Scan(&id)
+	})
+	return id, err
+}
+
 func (orm *orm) GetWorkflowSpec(ctx context.Context, owner, name string) (*job.WorkflowSpec, error) {
 	query := `
 		SELECT *
diff --git a/core/services/workflows/syncer/workflow_registry.go b/core/services/workflows/syncer/workflow_registry.go
index d8ad37646d6..cdd0c71acc0 100644
--- a/core/services/workflows/syncer/workflow_registry.go
+++ b/core/services/workflows/syncer/workflow_registry.go
@@ -10,6 +10,7 @@ import (
 	"sync"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/custmsg"
 	"github.com/smartcontractkit/chainlink-common/pkg/services"
 	types "github.com/smartcontractkit/chainlink-common/pkg/types"
 	"github.com/smartcontractkit/chainlink-common/pkg/types/core"
@@ -95,6 +96,7 @@ type workflowRegistry struct {
 	ticker <-chan time.Time
 
 	lggr    logger.Logger
+	emitter custmsg.Labeler
 	orm     WorkflowRegistryDS
 	reader  ContractReader
 	gateway FetcherFunc
@@ -147,11 +149,13 @@ func NewWorkflowRegistry[T ContractReader](
 	addr string,
 	workflowStore store.Store,
 	capRegistry core.CapabilitiesRegistry,
+	emitter custmsg.Labeler,
 	opts ...func(*workflowRegistry),
 ) *workflowRegistry {
 	ets := []WorkflowRegistryEventType{ForceUpdateSecretsEvent}
 	wr := &workflowRegistry{
 		lggr:           lggr.Named(name),
+		emitter:        emitter,
 		orm:            orm,
 		reader:         reader,
 		gateway:        gateway,
@@ -172,7 +176,7 @@ func NewWorkflowRegistry[T ContractReader](
 		batchCh:    make(chan []WorkflowRegistryEventResponse, len(ets)),
 	}
 	wr.handler = newEventHandler(wr.lggr, wr.orm, wr.gateway, wr.workflowStore, wr.capRegistry,
-		wr.engineRegistry,
+		wr.engineRegistry, wr.emitter, secretsFetcherFunc(wr.SecretsFor),
 	)
 	for _, opt := range opts {
 		opt(wr)
diff --git a/core/services/workflows/syncer/workflow_registry_test.go b/core/services/workflows/syncer/workflow_registry_test.go
index 652b20deea1..58dcbed1022 100644
--- a/core/services/workflows/syncer/workflow_registry_test.go
+++ b/core/services/workflows/syncer/workflow_registry_test.go
@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/smartcontractkit/chainlink-common/pkg/custmsg"
 	"github.com/smartcontractkit/chainlink-common/pkg/services/servicetest"
 	types "github.com/smartcontractkit/chainlink-common/pkg/types"
 	query "github.com/smartcontractkit/chainlink-common/pkg/types/query"
@@ -51,11 +52,12 @@ func Test_Workflow_Registry_Syncer(t *testing.T) {
 		orm         = &orm{ds: db, lggr: lggr}
 		ctx, cancel = context.WithCancel(testutils.Context(t))
 		reader      = NewMockContractReader(t)
+		emitter     = custmsg.NewLabeler()
 		gateway     = func(_ context.Context, _ string) ([]byte, error) {
 			return []byte(wantContents), nil
 		}
 		ticker = make(chan time.Time)
-		worker = NewWorkflowRegistry(lggr, orm, reader, gateway, giveCfg.ContractAddress, nil, nil, WithTicker(ticker))
+		worker = NewWorkflowRegistry(lggr, orm, reader, gateway, giveCfg.ContractAddress, nil, nil, emitter, WithTicker(ticker))
 	)
 
 	// Cleanup the worker

From dc56179c63bbb9a9bba52398d4e0f3db81fbb7bc Mon Sep 17 00:00:00 2001
From: Austin <107539019+0xAustinWang@users.noreply.github.com>
Date: Tue, 26 Nov 2024 02:32:22 +0900
Subject: [PATCH 07/11] upgrade keys to support new rmn version (#15402)

* upgrade keys to support new rmn version

* update commit hash that we pull
---
 .github/e2e-tests.yml                        | 24 ++++++++++----------
 deployment/environment/devenv/rmn_config.go  |  2 +-
 integration-tests/testsetups/test_helpers.go |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.github/e2e-tests.yml b/.github/e2e-tests.yml
index f91166ebacb..ba08c4029e7 100644
--- a/.github/e2e-tests.yml
+++ b/.github/e2e-tests.yml
@@ -1012,8 +1012,8 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_MultipleMessagesOnOneLaneNoWaitForExec$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1027,8 +1027,8 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
 # Enable after flaking issue is resolved
 #  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughObservers$
@@ -1043,8 +1043,8 @@ runner-test-matrix:
 #    test_env_vars:
 #      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
 #      E2E_JD_VERSION: 0.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-#      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentSigners$
     path: integration-tests/smoke/ccip/ccip_rmn_test.go
@@ -1058,8 +1058,8 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
 # Enable after flaking issue is resolved
 #  - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_NotEnoughSigners$
@@ -1074,8 +1074,8 @@ runner-test-matrix:
 #    test_env_vars:
 #      E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
 #      E2E_JD_VERSION: 0.6.0
-#      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-#      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+#      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+#      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
 
   - id: smoke/ccip/ccip_rmn_test.go:^TestRMN_DifferentRmnNodesForDifferentChains$
@@ -1090,8 +1090,8 @@ runner-test-matrix:
     test_env_vars:
       E2E_TEST_SELECTED_NETWORK: SIMULATED_1,SIMULATED_2
       E2E_JD_VERSION: 0.6.0
-      E2E_RMN_RAGEPROXY_VERSION: master-5208d09
-      E2E_RMN_AFN2PROXY_VERSION: master-5208d09
+      E2E_RMN_RAGEPROXY_VERSION: master-f461a9e
+      E2E_RMN_AFN2PROXY_VERSION: master-f461a9e
 
 
   # END: CCIPv1.6 tests
diff --git a/deployment/environment/devenv/rmn_config.go b/deployment/environment/devenv/rmn_config.go
index 59d5e5d1cdb..623499a6fe8 100644
--- a/deployment/environment/devenv/rmn_config.go
+++ b/deployment/environment/devenv/rmn_config.go
@@ -33,7 +33,7 @@ type SharedConfigNetworking struct {
 type HomeChain struct {
 	Name                 string `toml:"name"`
 	CapabilitiesRegistry string `toml:"capabilities_registry"`
-	CCIPConfig           string `toml:"ccip_config"`
+	CCIPHome             string `toml:"ccip_home"`
 	RMNHome              string `toml:"rmn_home"`
 }
 
diff --git a/integration-tests/testsetups/test_helpers.go b/integration-tests/testsetups/test_helpers.go
index f33dacb3851..57c25e58a46 100644
--- a/integration-tests/testsetups/test_helpers.go
+++ b/integration-tests/testsetups/test_helpers.go
@@ -351,7 +351,7 @@ func GenerateTestRMNConfig(t *testing.T, nRMNNodes int, tenv changeset.DeployedE
 		HomeChain: devenv.HomeChain{
 			Name:                 MustCCIPNameToRMNName(hc.Name),
 			CapabilitiesRegistry: state.Chains[tenv.HomeChainSel].CapabilityRegistry.Address().String(),
-			CCIPConfig:           state.Chains[tenv.HomeChainSel].CCIPHome.Address().String(),
+			CCIPHome:             state.Chains[tenv.HomeChainSel].CCIPHome.Address().String(),
 			RMNHome:              state.Chains[tenv.HomeChainSel].RMNHome.Address().String(),
 		},
 		RemoteChains: remoteChains,

From 73788c636ce516ac9759d7b5c656cecd66388b10 Mon Sep 17 00:00:00 2001
From: Patrick <patrick.huie@smartcontract.com>
Date: Mon, 25 Nov 2024 12:39:28 -0500
Subject: [PATCH 08/11] fixing bug in labeler (#15406)

---
 core/services/workflows/engine.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/services/workflows/engine.go b/core/services/workflows/engine.go
index e264ee138a1..69655b5b39c 100644
--- a/core/services/workflows/engine.go
+++ b/core/services/workflows/engine.go
@@ -1263,7 +1263,7 @@ func NewEngine(ctx context.Context, cfg Config) (engine *Engine, err error) {
 	engine = &Engine{
 		cma:            cma,
 		logger:         cfg.Lggr.Named("WorkflowEngine").With("workflowID", cfg.WorkflowID),
-		metrics:        workflowsMetricLabeler{metrics.NewLabeler().With(platform.KeyWorkflowID, cfg.WorkflowID, platform.KeyWorkflowOwner, cfg.WorkflowOwner, platform.KeyWorkflowName, workflow.name)},
+		metrics:        workflowsMetricLabeler{metrics.NewLabeler().With(platform.KeyWorkflowID, cfg.WorkflowID, platform.KeyWorkflowOwner, cfg.WorkflowOwner, platform.KeyWorkflowName, cfg.WorkflowName)},
 		registry:       cfg.Registry,
 		workflow:       workflow,
 		secretsFetcher: cfg.SecretsFetcher,

From 90eb9ae718a7ea6e07bfde0746f2d2480a77e40b Mon Sep 17 00:00:00 2001
From: Margaret Ma <eutopia@gmail.com>
Date: Mon, 25 Nov 2024 15:08:14 -0500
Subject: [PATCH 09/11] Workflow Registry: Add remaining tests for workflow
 registry manager (#15359)

* add remaining tests for workflow registry manager

* update geth wrappers

* address comments
---
 .github/workflows/solidity-foundry.yml        |   2 +-
 contracts/gas-snapshots/workflow.gas-snapshot | 103 ++++++++++--------
 .../v0.8/workflow/dev/WorkflowRegistry.sol    |  47 ++++----
 .../workflow/dev/WorkflowRegistryManager.sol  |  30 +++--
 .../src/v0.8/workflow/mocks/MockContract.sol  |   4 +
 .../mocks/MockWorkflowRegistryContract.sol    |   8 ++
 .../WorkflowRegistry.activateWorkflow.t.sol   |   6 +
 .../WorkflowRegistry.activateWorkflow.tree    |   6 +-
 .../WorkflowRegistry.deleteWorkflow.t.sol     |   8 ++
 .../WorkflowRegistry.deleteWorkflow.tree      |   4 +-
 .../WorkflowRegistry.getAllAllowedDONs.t.sol  |  12 ++
 .../WorkflowRegistry.getAllAllowedDONs.tree   |   6 +-
 ...owRegistry.getAllAuthorizedAddresses.t.sol |  14 ++-
 ...lowRegistry.getAllAuthorizedAddresses.tree |   6 +-
 ...WorkflowRegistry.getWorkflowMetadata.t.sol |  20 ++++
 .../WorkflowRegistry.getWorkflowMetadata.tree |   6 +-
 ...egistry.getWorkflowMetadataListByDON.t.sol |  33 +++++-
 ...Registry.getWorkflowMetadataListByDON.tree |   6 +-
 ...istry.getWorkflowMetadataListByOwner.t.sol |  81 +++++++++++++-
 ...gistry.getWorkflowMetadataListByOwner.tree |   8 +-
 .../WorkflowRegistry.lockRegistry.t.sol       |  23 ++++
 .../WorkflowRegistry.lockRegistry.tree        |   6 +
 .../WorkflowRegistry.pauseWorkflow.t.sol      |  16 +++
 .../WorkflowRegistry.pauseWorkflow.tree       |   8 +-
 .../WorkflowRegistry.registerWorkflow.t.sol   |   2 +-
 .../WorkflowRegistry.unlockRegistry.t.sol     |  30 +++++
 .../WorkflowRegistry.unlockRegistry.tree      |   6 +
 .../WorkflowRegistry.updateAllowedDONs.t.sol  |   6 +-
 ...owRegistry.updateAuthorizedAddresses.t.sol |   6 +-
 .../WorkflowRegistry.updateWorkflow.t.sol     |  14 ++-
 .../WorkflowRegistrySetup.t.sol               |   4 +-
 ...kflowRegistryManager.activateVersion.t.sol |  81 ++++++++++++--
 ...rkflowRegistryManager.activateVersion.tree |   4 +-
 .../WorkflowRegistryManager.addVersion.t.sol  | 103 +++++++++++++++---
 .../WorkflowRegistryManager.addVersion.tree   |  19 ++--
 ...flowRegistryManager.getActiveVersion.t.sol |  14 ++-
 ...gistryManager.getActiveVersionNumber.t.sol |  18 +++
 ...egistryManager.getActiveVersionNumber.tree |   5 +
 ...rkflowRegistryManager.getAllVersions.t.sol |  46 +++++++-
 ...flowRegistryManager.getLatestVersion.t.sol |  14 ++-
 ...kflowRegistryManager.getLatestVersion.tree |   2 +-
 ...gistryManager.getLatestVersionNumber.t.sol |  18 +++
 ...egistryManager.getLatestVersionNumber.tree |   5 +
 .../WorkflowRegistryManager.getVersion.t.sol  |  13 ++-
 ...flowRegistryManager.getVersionNumber.t.sol |  26 -----
 ...ionNumberByContractAddressAndChainID.t.sol |  31 ++++++
 ...ionNumberByContractAddressAndChainID.tree} |   2 +-
 .../WorkflowRegistryManagerSetup.t.sol        |  24 +++-
 .../workflow_registry_wrapper.go              |  48 +++-----
 ...rapper-dependency-versions-do-not-edit.txt |   2 +-
 50 files changed, 765 insertions(+), 241 deletions(-)
 create mode 100644 contracts/src/v0.8/workflow/mocks/MockContract.sol
 create mode 100644 contracts/src/v0.8/workflow/mocks/MockWorkflowRegistryContract.sol
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.lockRegistry.t.sol
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.lockRegistry.tree
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.unlockRegistry.t.sol
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.unlockRegistry.tree
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersionNumber.t.sol
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersionNumber.tree
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersionNumber.t.sol
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersionNumber.tree
 delete mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumber.t.sol
 create mode 100644 contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID.t.sol
 rename contracts/src/v0.8/workflow/test/WorkflowRegistryManager/{WorkflowRegistryManager.getVersionNumber.tree => WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID.tree} (87%)

diff --git a/.github/workflows/solidity-foundry.yml b/.github/workflows/solidity-foundry.yml
index 77c5b4836d6..b94c0236155 100644
--- a/.github/workflows/solidity-foundry.yml
+++ b/.github/workflows/solidity-foundry.yml
@@ -40,7 +40,7 @@ jobs:
             { "name": "shared", "setup": { "run-coverage": true, "extra-coverage-params": "--no-match-path='*CallWithExactGas*' --ir-minimum", "min-coverage": 32.6, "run-gas-snapshot": true, "run-forge-fmt": false }},
             { "name": "transmission", "setup": { "run-coverage": true, "min-coverage": 61.5, "run-gas-snapshot": true, "run-forge-fmt": false }},
             { "name": "vrf", "setup": { "run-coverage": false, "min-coverage": 98.5, "run-gas-snapshot": false, "run-forge-fmt": false }},
-            { "name": "workflow", "setup": { "run-coverage": true, "extra-coverage-params": "--ir-minimum", "min-coverage": 65.0, "run-gas-snapshot": false, "run-forge-fmt": true }}
+            { "name": "workflow", "setup": { "run-coverage": true, "extra-coverage-params": "--ir-minimum", "min-coverage": 96.0, "run-gas-snapshot": true, "run-forge-fmt": true }}
           ]
           EOF
 
diff --git a/contracts/gas-snapshots/workflow.gas-snapshot b/contracts/gas-snapshots/workflow.gas-snapshot
index 0a29158c2ac..73fdfbf7187 100644
--- a/contracts/gas-snapshots/workflow.gas-snapshot
+++ b/contracts/gas-snapshots/workflow.gas-snapshot
@@ -1,53 +1,64 @@
-WorkflowRegistryManager_activateVersion:test_WhenTheVersionNumberIsNotActive() (gas: 419)
-WorkflowRegistryManageraddVersion:test_WhenAutoActivateIsFalse() (gas: 164)
-WorkflowRegistryManageraddVersion:test_WhenAutoActivateIsTrue() (gas: 120)
-WorkflowRegistryManagergetActiveVersion:test_WhenAnActiveVersionExists() (gas: 120)
-WorkflowRegistryManagergetActiveVersion:test_WhenNoActiveVersionIsAvailable() (gas: 139)
-WorkflowRegistryManagergetAllVersions:test_WhenLimitExceedsMaximumPaginationLimit() (gas: 161)
-WorkflowRegistryManagergetAllVersions:test_WhenRequestingWithInvalidStartIndex() (gas: 142)
-WorkflowRegistryManagergetAllVersions:test_WhenRequestingWithValidStartIndexAndLimitWithinBounds() (gas: 120)
-WorkflowRegistryManagergetLatestVersion:test_WhenNoVersionsHaveBeenRegistered() (gas: 120)
-WorkflowRegistryManagergetLatestVersion:test_WhenVersionsHaveBeenRegistered() (gas: 139)
-WorkflowRegistryManagergetVersion:test_WhenVersionNumberIsNotRegistered() (gas: 120)
-WorkflowRegistryManagergetVersion:test_WhenVersionNumberIsRegistered() (gas: 139)
-WorkflowRegistryManagergetVersionNumber:test_WhenAVersionIsRegisteredForTheContractAddressAndChainIDCombination() (gas: 161)
-WorkflowRegistryManagergetVersionNumber:test_WhenNoVersionIsRegisteredForTheContractAddressAndChainIDCombination() (gas: 120)
-WorkflowRegistryManagergetVersionNumber:test_WhenTheContractAddressIsInvalid() (gas: 142)
-WorkflowRegistry_activateWorkflow:test_WhenTheCallerIsAnAuthorizedAddress() (gas: 491327)
-WorkflowRegistry_deleteWorkflow:test_WhenTheCallerIsAnAuthorizedAddress_AndTheDonIDIsAllowed() (gas: 400597)
-WorkflowRegistry_deleteWorkflow:test_WhenTheCallerIsAnAuthorizedAddress_AndTheDonIDIsNotAllowed() (gas: 418579)
+WorkflowRegistryManager_activateVersion:test_WhenTheVersionNumberIsNotActive_AndWhenThereAreNoActiveVersions() (gas: 528769)
+WorkflowRegistryManager_addVersion:test_WhenAutoActivateIsFalse() (gas: 265551)
+WorkflowRegistryManager_addVersion:test_WhenAutoActivateIsTrue() (gas: 270596)
+WorkflowRegistryManager_getActiveVersion:test_WhenAnActiveVersionExists() (gas: 287760)
+WorkflowRegistryManager_getActiveVersion:test_WhenNoActiveVersionIsAvailable() (gas: 13258)
+WorkflowRegistryManager_getActiveVersionNumber:test_WhenAnActiveVersionExists() (gas: 283885)
+WorkflowRegistryManager_getActiveVersionNumber:test_WhenNoActiveVersionIsAvailable() (gas: 10698)
+WorkflowRegistryManager_getAllVersions:test_WhenLimitExceedsMaximumPaginationLimit() (gas: 54503)
+WorkflowRegistryManager_getAllVersions:test_WhenRequestingWithInvalidStartIndex() (gas: 11338)
+WorkflowRegistryManager_getAllVersions:test_WhenRequestingWithValidStartIndexAndLimitWithinBounds() (gas: 40398)
+WorkflowRegistryManager_getLatestVersion:test_WhenNoVersionsHaveBeenRegistered() (gas: 12984)
+WorkflowRegistryManager_getLatestVersion:test_WhenVersionsHaveBeenRegistered() (gas: 287791)
+WorkflowRegistryManager_getLatestVersionNumber:test_WhenNoVersionsHaveBeenRegistered() (gas: 10637)
+WorkflowRegistryManager_getLatestVersionNumber:test_WhenVersionsHaveBeenRegistered() (gas: 284134)
+WorkflowRegistryManager_getVersion:test_WhenVersionNumberIsNotRegistered() (gas: 13785)
+WorkflowRegistryManager_getVersion:test_WhenVersionNumberIsRegistered() (gas: 288169)
+WorkflowRegistryManager_getVersionNumberByContractAddressAndChainID:test_WhenAVersionIsRegisteredForTheContractAddressAndChainIDCombination() (gas: 285022)
+WorkflowRegistryManager_getVersionNumberByContractAddressAndChainID:test_WhenNoVersionIsRegisteredForTheContractAddressAndChainIDCombination() (gas: 286634)
+WorkflowRegistryManager_getVersionNumberByContractAddressAndChainID:test_WhenTheContractAddressIsInvalid() (gas: 284604)
+WorkflowRegistry_activateWorkflow:test_WhenTheCallerIsAnAuthorizedAddress() (gas: 495029)
+WorkflowRegistry_deleteWorkflow:test_WhenTheCallerIsAnAuthorizedAddress_AndTheDonIDIsAllowed() (gas: 403945)
+WorkflowRegistry_deleteWorkflow:test_WhenTheCallerIsAnAuthorizedAddress_AndTheDonIDIsNotAllowed() (gas: 421748)
+WorkflowRegistry_getAllAllowedDONs:test_WhenTheRegistryIsLocked() (gas: 47473)
 WorkflowRegistry_getAllAllowedDONs:test_WhenTheSetOfAllowedDONsIsEmpty() (gas: 25780)
 WorkflowRegistry_getAllAllowedDONs:test_WhenThereAreMultipleAllowedDONs() (gas: 75437)
-WorkflowRegistry_getAllAllowedDONs:test_WhenThereIsASingleAllowedDON() (gas: 16566)
-WorkflowRegistry_getWorkflowMetadata:test_WhenTheWorkflowDoesNotExist() (gas: 17521)
-WorkflowRegistry_getWorkflowMetadata:test_WhenTheWorkflowExistsWithTheOwnerAndName() (gas: 490176)
-WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenLimitExceedsTotalWorkflows() (gas: 127660)
-WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenLimitIsEqualToTotalWorkflows() (gas: 128013)
-WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenLimitIsLessThanTotalWorkflows() (gas: 90119)
-WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenStartIs0() (gas: 127572)
-WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenStartIsGreaterThan0() (gas: 90076)
-WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenStartIsGreaterThanOrEqualToTotalWorkflows() (gas: 13454)
+WorkflowRegistry_getAllAllowedDONs:test_WhenThereIsASingleAllowedDON() (gas: 16590)
+WorkflowRegistry_getAllAuthorizedAddresses:test_WhenTheRegistryIsLocked() (gas: 47740)
+WorkflowRegistry_getAllAuthorizedAddresses:test_WhenTheSetOfAuthorizedAddressesIsEmpty() (gas: 26152)
+WorkflowRegistry_getAllAuthorizedAddresses:test_WhenThereAreMultipleAuthorizedAddresses() (gas: 78270)
+WorkflowRegistry_getAllAuthorizedAddresses:test_WhenThereIsASingleAuthorizedAddress() (gas: 16832)
+WorkflowRegistry_getWorkflowMetadata:test_WhenTheRegistryIsLocked() (gas: 519145)
+WorkflowRegistry_getWorkflowMetadata:test_WhenTheWorkflowDoesNotExist() (gas: 17543)
+WorkflowRegistry_getWorkflowMetadata:test_WhenTheWorkflowExistsWithTheOwnerAndName() (gas: 490001)
+WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenLimitExceedsTotalWorkflows() (gas: 128146)
+WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenLimitIsEqualToTotalWorkflows() (gas: 128035)
+WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenLimitIsLessThanTotalWorkflows() (gas: 90141)
+WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenStartIs0() (gas: 128075)
+WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenStartIsGreaterThan0() (gas: 90098)
+WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenStartIsGreaterThanOrEqualToTotalWorkflows() (gas: 13476)
 WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenTheDONHasNoWorkflows() (gas: 13410)
-WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenLimitExceedsTotalWorkflows() (gas: 128221)
-WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenLimitIsEqualToTotalWorkflows() (gas: 128320)
-WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenLimitIsLessThanTotalWorkflows() (gas: 90404)
-WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenStartIs0_AndLimitIs0() (gas: 128118)
-WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenStartIsGreaterThan0() (gas: 90361)
+WorkflowRegistry_getWorkflowMetadataListByDON:test_WhenTheRegistryIsLocked() (gas: 158899)
+WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenLimitExceedsTotalWorkflows() (gas: 135174)
+WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenLimitIsEqualToTotalWorkflows() (gas: 135073)
+WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenLimitIsLessThanTotalWorkflows() (gas: 95635)
+WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenStartIs0() (gas: 135113)
+WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenStartIsGreaterThan0() (gas: 95592)
 WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenStartIsGreaterThanOrEqualToTotalWorkflows() (gas: 13764)
-WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenTheOwnerHasNoWorkflows() (gas: 13984)
-WorkflowRegistry_pauseWorkflow:test_WhenTheDonIDIsAllowed_AndTheCallerIsAnAuthorizedAddress() (gas: 491299)
-WorkflowRegistry_pauseWorkflow:test_WhenTheDonIDIsAllowed_AndTheCallerIsAnUnauthorizedAddress() (gas: 499097)
-WorkflowRegistry_pauseWorkflow:test_WhenTheDonIDIsNotAllowed_AndTheCallerIsAnAuthorizedAddress() (gas: 498850)
-WorkflowRegistry_pauseWorkflow:test_WhenTheDonIDIsNotAllowed_AndTheCallerIsAnUnauthorizedAddress() (gas: 503264)
-WorkflowRegistry_registerWorkflow:test_WhenTheWorkflowInputsAreAllValid() (gas: 549829)
+WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenTheOwnerHasNoWorkflows() (gas: 14006)
+WorkflowRegistry_getWorkflowMetadataListByOwner:test_WhenTheRegistryIsLocked() (gas: 165968)
+WorkflowRegistry_lockRegistry:test_WhenTheCallerIsTheContractOwner() (gas: 38758)
+WorkflowRegistry_pauseWorkflow:test_WhenTheDonIDIsAllowed_AndTheCallerIsAnAuthorizedAddress() (gas: 494993)
+WorkflowRegistry_pauseWorkflow:test_WhenTheDonIDIsAllowed_AndTheCallerIsAnUnauthorizedAddress() (gas: 502796)
+WorkflowRegistry_pauseWorkflow:test_WhenTheDonIDIsNotAllowed_AndTheCallerIsAnAuthorizedAddress() (gas: 502555)
+WorkflowRegistry_pauseWorkflow:test_WhenTheDonIDIsNotAllowed_AndTheCallerIsAnUnauthorizedAddress() (gas: 506966)
+WorkflowRegistry_registerWorkflow:test_WhenTheWorkflowInputsAreAllValid() (gas: 549769)
 WorkflowRegistry_requestForceUpdateSecrets:test_WhenTheCallerIsAnAuthorizedAddress_AndTheWorkflowIsInAnAllowedDON() (gas: 891242)
 WorkflowRegistry_requestForceUpdateSecrets:test_WhenTheCallerIsAnAuthorizedAddress_AndTheWorkflowIsNotInAnAllowedDON() (gas: 488397)
 WorkflowRegistry_requestForceUpdateSecrets:test_WhenTheCallerIsNotAnAuthorizedAddress() (gas: 486751)
-WorkflowRegistry_updateAllowedDONs:test_WhenTheBoolInputIsFalse() (gas: 29811)
-WorkflowRegistry_updateAllowedDONs:test_WhenTheBoolInputIsTrue() (gas: 170386)
-WorkflowRegistry_updateAuthorizedAddresses:test_WhenTheBoolInputIsFalse() (gas: 30350)
-WorkflowRegistry_updateAuthorizedAddresses:test_WhenTheBoolInputIsTrue() (gas: 175605)
-WorkflowRegistry_updateWorkflow:test_WhenTheWorkflowInputsAreAllValid() (gas: 501589)
-WorkflowRegistrygetAllAuthorizedAddresses:test_WhenTheSetOfAuthorizedAddressesIsEmpty() (gas: 26152)
-WorkflowRegistrygetAllAuthorizedAddresses:test_WhenThereAreMultipleAuthorizedAddresses() (gas: 78270)
-WorkflowRegistrygetAllAuthorizedAddresses:test_WhenThereIsASingleAuthorizedAddress() (gas: 16814)
\ No newline at end of file
+WorkflowRegistry_unlockRegistry:test_WhenTheCallerIsTheContractOwner() (gas: 30325)
+WorkflowRegistry_updateAllowedDONs:test_WhenTheBoolInputIsFalse() (gas: 29739)
+WorkflowRegistry_updateAllowedDONs:test_WhenTheBoolInputIsTrue() (gas: 170296)
+WorkflowRegistry_updateAuthorizedAddresses:test_WhenTheBoolInputIsFalse() (gas: 30278)
+WorkflowRegistry_updateAuthorizedAddresses:test_WhenTheBoolInputIsTrue() (gas: 175515)
+WorkflowRegistry_updateWorkflow:test_WhenTheWorkflowInputsAreAllValid() (gas: 479601)
diff --git a/contracts/src/v0.8/workflow/dev/WorkflowRegistry.sol b/contracts/src/v0.8/workflow/dev/WorkflowRegistry.sol
index b0b6a120f86..0e6ae3450ac 100644
--- a/contracts/src/v0.8/workflow/dev/WorkflowRegistry.sol
+++ b/contracts/src/v0.8/workflow/dev/WorkflowRegistry.sol
@@ -83,8 +83,8 @@ contract WorkflowRegistry is Ownable2StepMsgSender, ITypeAndVersion {
     bytes32 indexed workflowID, address indexed workflowOwner, uint32 indexed donID, string workflowName
   );
   event WorkflowForceUpdateSecretsRequestedV1(address indexed owner, bytes32 secretsURLHash, string workflowName);
-  event RegistryLockedV1(address indexed lockedBy);
-  event RegistryUnlockedV1(address indexed unlockedBy);
+  event RegistryLockedV1(address lockedBy);
+  event RegistryUnlockedV1(address unlockedBy);
 
   error AddressNotAuthorized(address caller);
   error CallerIsNotWorkflowOwner(address caller);
@@ -306,7 +306,7 @@ contract WorkflowRegistry is Ownable2StepMsgSender, ITypeAndVersion {
     if (!sameSecretsURL) {
       // Remove the old secrets hash if secretsURL is not empty
       if (bytes(workflow.secretsURL).length > 0) {
-        // Using keccak256 instead of _computeOwnerAndStringFieldHashKey as currentSecretsURL is memory
+        // Using keccak256 instead of computeHashKey as currentSecretsURL is memory
         bytes32 oldSecretsHash = keccak256(abi.encodePacked(msg.sender, workflow.secretsURL));
         s_secretsHashToWorkflows[oldSecretsHash].remove(workflowKey);
       }
@@ -378,34 +378,31 @@ contract WorkflowRegistry is Ownable2StepMsgSender, ITypeAndVersion {
   function deleteWorkflow(
     bytes32 workflowKey
   ) external registryNotLocked {
-    address sender = msg.sender;
-
     // Retrieve workflow metadata from storage
-    WorkflowMetadata storage workflow = _getWorkflowFromStorage(sender, workflowKey);
-    uint32 donID = workflow.donID;
+    WorkflowMetadata storage workflow = _getWorkflowFromStorage(msg.sender, workflowKey);
 
     // Only checking access for the caller instead of using _validatePermissions so that even if the DON was removed from the
     // allowed list, the workflow can still be deleted.
-    if (!s_authorizedAddresses.contains(sender)) {
-      revert AddressNotAuthorized(sender);
+    if (!s_authorizedAddresses.contains(msg.sender)) {
+      revert AddressNotAuthorized(msg.sender);
     }
 
     // Remove the workflow from the owner and DON mappings
-    s_ownerWorkflowKeys[sender].remove(workflowKey);
-    s_donWorkflowKeys[donID].remove(workflowKey);
+    s_ownerWorkflowKeys[msg.sender].remove(workflowKey);
+    s_donWorkflowKeys[workflow.donID].remove(workflowKey);
 
     // Remove the workflow from the secrets hash set if secretsURL is not empty
     if (bytes(workflow.secretsURL).length > 0) {
-      // Using keccak256 instead of _computeOwnerAndStringFieldHashKey as secretsURL is storage ref
-      bytes32 secretsHash = keccak256(abi.encodePacked(sender, workflow.secretsURL));
+      // Using keccak256 instead of computeHashKey as secretsURL is storage ref
+      bytes32 secretsHash = keccak256(abi.encodePacked(msg.sender, workflow.secretsURL));
       s_secretsHashToWorkflows[secretsHash].remove(workflowKey);
     }
 
+    // Emit an event indicating the workflow has been deleted. We need to do this before deleting the workflow from storage.
+    emit WorkflowDeletedV1(workflow.workflowID, msg.sender, workflow.donID, workflow.workflowName);
+
     // Delete the workflow metadata from storage
     delete s_workflows[workflowKey];
-
-    // Emit an event indicating the workflow has been deleted
-    emit WorkflowDeletedV1(workflow.workflowID, sender, donID, workflow.workflowName);
   }
 
   /// @notice Requests a force update for workflows that share the same secrets URL.
@@ -430,10 +427,8 @@ contract WorkflowRegistry is Ownable2StepMsgSender, ITypeAndVersion {
   function requestForceUpdateSecrets(
     string calldata secretsURL
   ) external registryNotLocked {
-    address sender = msg.sender;
-
     // Use secretsURL and sender hash key to get the mapping key
-    bytes32 secretsHash = computeHashKey(sender, secretsURL);
+    bytes32 secretsHash = computeHashKey(msg.sender, secretsURL);
 
     // Retrieve all workflow keys associated with the given secrets hash
     EnumerableSet.Bytes32Set storage workflowKeys = s_secretsHashToWorkflows[secretsHash];
@@ -449,8 +444,8 @@ contract WorkflowRegistry is Ownable2StepMsgSender, ITypeAndVersion {
       bytes32 workflowKey = workflowKeys.at(i);
       WorkflowMetadata storage workflow = s_workflows[workflowKey];
 
-      if (s_allowedDONs.contains(workflow.donID) && s_authorizedAddresses.contains(sender)) {
-        emit WorkflowForceUpdateSecretsRequestedV1(sender, secretsHash, workflow.workflowName);
+      if (s_allowedDONs.contains(workflow.donID) && s_authorizedAddresses.contains(msg.sender)) {
+        emit WorkflowForceUpdateSecretsRequestedV1(msg.sender, secretsHash, workflow.workflowName);
       }
     }
   }
@@ -472,10 +467,8 @@ contract WorkflowRegistry is Ownable2StepMsgSender, ITypeAndVersion {
   /// @param workflowKey The unique identifier for the workflow.
   /// @param newStatus The new status to set for the workflow (either `Paused` or `Active`).
   function _updateWorkflowStatus(bytes32 workflowKey, WorkflowStatus newStatus) internal {
-    address sender = msg.sender;
-
     // Retrieve workflow metadata once
-    WorkflowMetadata storage workflow = _getWorkflowFromStorage(sender, workflowKey);
+    WorkflowMetadata storage workflow = _getWorkflowFromStorage(msg.sender, workflowKey);
     uint32 donID = workflow.donID;
 
     // Avoid unnecessary storage writes if already in the desired status
@@ -485,7 +478,7 @@ contract WorkflowRegistry is Ownable2StepMsgSender, ITypeAndVersion {
 
     // Check if the DON ID is allowed when activating a workflow
     if (newStatus == WorkflowStatus.ACTIVE) {
-      _validatePermissions(donID, sender);
+      _validatePermissions(donID, msg.sender);
     }
 
     // Update the workflow status
@@ -493,9 +486,9 @@ contract WorkflowRegistry is Ownable2StepMsgSender, ITypeAndVersion {
 
     // Emit the appropriate event based on newStatus
     if (newStatus == WorkflowStatus.PAUSED) {
-      emit WorkflowPausedV1(workflow.workflowID, sender, donID, workflow.workflowName);
+      emit WorkflowPausedV1(workflow.workflowID, msg.sender, donID, workflow.workflowName);
     } else if (newStatus == WorkflowStatus.ACTIVE) {
-      emit WorkflowActivatedV1(workflow.workflowID, sender, donID, workflow.workflowName);
+      emit WorkflowActivatedV1(workflow.workflowID, msg.sender, donID, workflow.workflowName);
     }
   }
 
diff --git a/contracts/src/v0.8/workflow/dev/WorkflowRegistryManager.sol b/contracts/src/v0.8/workflow/dev/WorkflowRegistryManager.sol
index 8c760707ee2..818d4a1a8ae 100644
--- a/contracts/src/v0.8/workflow/dev/WorkflowRegistryManager.sol
+++ b/contracts/src/v0.8/workflow/dev/WorkflowRegistryManager.sol
@@ -26,6 +26,10 @@ contract WorkflowRegistryManager is Ownable2StepMsgSender, ITypeAndVersion {
   /// indexing strategy to avoid off-by-one errors.
   mapping(uint32 versionNumber => Version versionInfo) private s_versions;
 
+  /// @notice Maps a combination of address and chain ID to the version number.
+  /// @dev This mapping allows for lookup of the version number for a given address and chain ID.
+  mapping(bytes32 => uint32) private s_versionNumberByAddressAndChainID;
+
   /// @notice The version number of the currently active WorkflowRegistry.
   /// @dev Initialized to 0 to indicate no active version. Updated when a version is activated.
   uint32 private s_activeVersionNumber = 0;
@@ -34,21 +38,18 @@ contract WorkflowRegistryManager is Ownable2StepMsgSender, ITypeAndVersion {
   /// @dev Incremented each time a new version is added. Useful for iterating over all registered versions.
   uint32 private s_latestVersionNumber = 0;
 
-  /// @notice Maps a combination of address and chain ID to the version number.
-  /// @dev This mapping allows for lookup of the version number for a given address and chain ID.
-  mapping(bytes32 => uint32) private s_versionNumberByAddressAndChainID;
-
   // Errors
   error InvalidContractAddress(address invalidAddress);
   error InvalidContractType(address invalidAddress);
   error NoActiveVersionAvailable();
   error NoVersionsRegistered();
   error VersionNotRegistered(uint32 versionNumber);
+  error VersionAlreadyActive(uint32 versionNumber);
   // Events
 
   event VersionAdded(address indexed contractAddress, uint64 chainID, uint32 deployedAt, uint32 version);
-  event VersionActivated(address indexed contractAddress, uint64 chainID, uint32 indexed version);
-  event VersionDeactivated(address indexed contractAddress, uint64 chainID, uint32 indexed version);
+  event VersionActivated(address indexed contractAddress, uint64 chainID, uint32 version);
+  event VersionDeactivated(address indexed contractAddress, uint64 chainID, uint32 version);
 
   // ================================================================
   // |                      Manage Versions                         |
@@ -110,6 +111,11 @@ contract WorkflowRegistryManager is Ownable2StepMsgSender, ITypeAndVersion {
     // Cache the current active version number to reduce storage reads
     uint32 currentActiveVersionNumber = s_activeVersionNumber;
 
+    // Check that the version number is not the same as the current active version number
+    if (currentActiveVersionNumber == versionNumber) {
+      revert VersionAlreadyActive(versionNumber);
+    }
+
     // Emit deactivation event if there is an active version
     if (currentActiveVersionNumber != 0) {
       Version memory currentActive = s_versions[currentActiveVersionNumber];
@@ -178,7 +184,10 @@ contract WorkflowRegistryManager is Ownable2StepMsgSender, ITypeAndVersion {
   /// @param contractAddress The address of the WorkflowRegistry contract.
   /// @param chainID The chain ID of the network where the WorkflowRegistry is deployed.
   /// @return versionNumber The version number associated with the given contract address and chain ID.
-  function getVersionNumber(address contractAddress, uint64 chainID) external view returns (uint32 versionNumber) {
+  function getVersionNumberByContractAddressAndChainID(
+    address contractAddress,
+    uint64 chainID
+  ) external view returns (uint32 versionNumber) {
     _validateContractAddress(contractAddress);
 
     bytes32 key = keccak256(abi.encodePacked(contractAddress, chainID));
@@ -201,10 +210,10 @@ contract WorkflowRegistryManager is Ownable2StepMsgSender, ITypeAndVersion {
 
   /// @notice Retrieves the details of the latest registered WorkflowRegistry version.
   /// @return A `Version` struct containing the details of the latest version.
-  /// @custom:throws NoActiveVersionAvailable if no versions have been registered.
+  /// @custom:throws NoVersionsRegistered if no versions have been registered.
   function getLatestVersion() external view returns (Version memory) {
     uint32 latestVersionNumber = s_latestVersionNumber;
-    if (latestVersionNumber == 0) revert NoActiveVersionAvailable();
+    if (latestVersionNumber == 0) revert NoVersionsRegistered();
     return s_versions[latestVersionNumber];
   }
 
@@ -246,6 +255,9 @@ contract WorkflowRegistryManager is Ownable2StepMsgSender, ITypeAndVersion {
     }
   }
 
+  /// @dev Validates that a given contract address is non-zero and contains code.
+  /// @param _addr The address of the contract to validate.
+  /// @custom:throws InvalidContractAddress if the address is zero or contains no code.
   function _validateContractAddress(
     address _addr
   ) internal view {
diff --git a/contracts/src/v0.8/workflow/mocks/MockContract.sol b/contracts/src/v0.8/workflow/mocks/MockContract.sol
new file mode 100644
index 00000000000..667e05daeae
--- /dev/null
+++ b/contracts/src/v0.8/workflow/mocks/MockContract.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.24;
+
+contract MockContract {}
diff --git a/contracts/src/v0.8/workflow/mocks/MockWorkflowRegistryContract.sol b/contracts/src/v0.8/workflow/mocks/MockWorkflowRegistryContract.sol
new file mode 100644
index 00000000000..8a8c9c7de08
--- /dev/null
+++ b/contracts/src/v0.8/workflow/mocks/MockWorkflowRegistryContract.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.24;
+
+import {ITypeAndVersion} from "../../shared/interfaces/ITypeAndVersion.sol";
+
+contract MockWorkflowRegistryContract is ITypeAndVersion {
+  string public constant override typeAndVersion = "MockWorkflowRegistryContract 1.0.0";
+}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.t.sol
index 47858774e0d..3b2bc854325 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.t.sol
@@ -104,6 +104,12 @@ contract WorkflowRegistry_activateWorkflow is WorkflowRegistrySetup {
       s_validSecretsURL
     );
 
+    // It should emit {WorkflowActivatedV1} when the workflow is activated.
+    vm.expectEmit();
+    emit WorkflowRegistry.WorkflowActivatedV1(
+      s_validWorkflowID, s_authorizedAddress, s_allowedDonID, s_validWorkflowName
+    );
+
     // Activate the workflow.
     vm.prank(s_authorizedAddress);
     s_registry.activateWorkflow(s_validWorkflowKey);
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.tree
index 3d71d5844db..4765b5abbe5 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.activateWorkflow.tree
@@ -5,13 +5,13 @@ WorkflowRegistry.activateWorkflow
     ├── when the caller is not the workflow owner
     │   └── it should revert
     └── when the caller is the workflow owner
-        ├── when the workflow is already paused
+        ├── when the workflow is already active
         │   └── it should revert
         └── when the workflow is paused
             ├── when the donID is not allowed
             │   └── it should revert
             └── when the donID is allowed
-                └── when the caller is not an authorized address
+                ├── when the caller is not an authorized address
                 │   └── it should revert
                 └── when the caller is an authorized address
-                    └── it should activate the workflow
+                    └── it should activate the workflow and emit {WorkflowActivatedV1}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.deleteWorkflow.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.deleteWorkflow.t.sol
index bbc4c7bb33a..974a3590f03 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.deleteWorkflow.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.deleteWorkflow.t.sol
@@ -57,6 +57,10 @@ contract WorkflowRegistry_deleteWorkflow is WorkflowRegistrySetup {
       s_registry.getWorkflowMetadata(s_authorizedAddress, s_validWorkflowName);
     assertEq(workflow.workflowName, s_validWorkflowName);
 
+    // It should emit {WorkflowDeletedV1} when the workflow is deleted.
+    vm.expectEmit();
+    emit WorkflowRegistry.WorkflowDeletedV1(s_validWorkflowID, s_authorizedAddress, s_allowedDonID, s_validWorkflowName);
+
     // Delete the workflow.
     vm.prank(s_authorizedAddress);
     s_registry.deleteWorkflow(s_validWorkflowKey);
@@ -79,6 +83,10 @@ contract WorkflowRegistry_deleteWorkflow is WorkflowRegistrySetup {
     // Remove the DON from the allowed DONs list.
     _removeDONFromAllowedDONs(s_allowedDonID);
 
+    // It should emit {WorkflowDeletedV1} when the workflow is deleted.
+    vm.expectEmit();
+    emit WorkflowRegistry.WorkflowDeletedV1(s_validWorkflowID, s_authorizedAddress, s_allowedDonID, s_validWorkflowName);
+
     // Delete the workflow.
     vm.prank(s_authorizedAddress);
     s_registry.deleteWorkflow(s_validWorkflowKey);
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.deleteWorkflow.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.deleteWorkflow.tree
index 510906137b9..4f6fd289b18 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.deleteWorkflow.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.deleteWorkflow.tree
@@ -8,5 +8,5 @@ WorkflowRegistry.deleteWorkflow
         ├── when the caller is not an authorized address
         │   └── it should revert
         └── when the caller is an authorized address
-            ├── it should delete the workflow if the donID is not allowed
-            └── it should delete the workflow if the donID is allowed
+            ├── it should delete the workflow if the donID is not allowed and emit {WorkflowDeletedV1}
+            └── it should delete the workflow if the donID is allowed and emit {WorkflowDeletedV1}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAllowedDONs.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAllowedDONs.t.sol
index d6c76d369c0..7fdb2462f39 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAllowedDONs.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAllowedDONs.t.sol
@@ -31,4 +31,16 @@ contract WorkflowRegistry_getAllAllowedDONs is WorkflowRegistrySetup {
     assertEq(allowedDONs[0], s_allowedDonID);
     assertEq(allowedDONs[1], allowedDonID2);
   }
+
+  function test_WhenTheRegistryIsLocked() external {
+    // Lock the registry
+    vm.prank(s_owner);
+    s_registry.lockRegistry();
+
+    // It should behave the same as when the registry is not locked
+    vm.prank(s_stranger);
+    uint32[] memory allowedDONs = s_registry.getAllAllowedDONs();
+    assertEq(allowedDONs.length, 1);
+    assertEq(allowedDONs[0], s_allowedDonID);
+  }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAllowedDONs.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAllowedDONs.tree
index 5e0d4e8d550..a6b649a8c98 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAllowedDONs.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAllowedDONs.tree
@@ -3,5 +3,7 @@ WorkflowRegistry.getAllAllowedDONs
 │   └── it should return an empty array
 ├── when there is a single allowed DON
 │   └── it should return an array with one element
-└── when there are multiple allowed DONs
-    └── it should return an array with all the allowed DONs
+├── when there are multiple allowed DONs
+│   └── it should return an array with all the allowed DONs
+└── when the registry is locked
+    └── it should behave the same as when the registry is not locked
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAuthorizedAddresses.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAuthorizedAddresses.t.sol
index 0b47da3938c..edaef531f77 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAuthorizedAddresses.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAuthorizedAddresses.t.sol
@@ -3,7 +3,7 @@ pragma solidity 0.8.24;
 
 import {WorkflowRegistrySetup} from "./WorkflowRegistrySetup.t.sol";
 
-contract WorkflowRegistrygetAllAuthorizedAddresses is WorkflowRegistrySetup {
+contract WorkflowRegistry_getAllAuthorizedAddresses is WorkflowRegistrySetup {
   function test_WhenTheSetOfAuthorizedAddressesIsEmpty() external {
     // Remove the authorized address added in the setup
     _removeAddressFromAuthorizedAddresses(s_authorizedAddress);
@@ -28,4 +28,16 @@ contract WorkflowRegistrygetAllAuthorizedAddresses is WorkflowRegistrySetup {
     assertEq(authorizedAddresses[0], s_authorizedAddress);
     assertEq(authorizedAddresses[1], s_unauthorizedAddress);
   }
+
+  function test_WhenTheRegistryIsLocked() external {
+    // Lock the registry
+    vm.prank(s_owner);
+    s_registry.lockRegistry();
+
+    // It should behave the same as when the registry is not locked
+    vm.prank(s_stranger);
+    address[] memory authorizedAddresses = s_registry.getAllAuthorizedAddresses();
+    assertEq(authorizedAddresses.length, 1);
+    assertEq(authorizedAddresses[0], s_authorizedAddress);
+  }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAuthorizedAddresses.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAuthorizedAddresses.tree
index 86821d2f83e..d4908dbd7ec 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAuthorizedAddresses.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getAllAuthorizedAddresses.tree
@@ -3,5 +3,7 @@ WorkflowRegistry.getAllAuthorizedAddresses
 │   └── it should return an empty array
 ├── when there is a single authorized address
 │   └── it should return an array with one element
-└── when there are multiple authorized addresses
-    └── it should return an array with all the authorized addresses
+├── when there are multiple authorized addresses
+│   └── it should return an array with all the authorized addresses
+└── when the registry is locked
+    └── it should behave the same as when the registry is not locked
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadata.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadata.t.sol
index 3cd092676be..5bc78feb0f2 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadata.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadata.t.sol
@@ -22,4 +22,24 @@ contract WorkflowRegistry_getWorkflowMetadata is WorkflowRegistrySetup {
     vm.expectRevert(WorkflowRegistry.WorkflowDoesNotExist.selector);
     s_registry.getWorkflowMetadata(s_authorizedAddress, "RandomWorkflowName");
   }
+
+  function test_WhenTheRegistryIsLocked() external {
+    // Register a workflow
+    _registerValidWorkflow();
+
+    // Lock the registry
+    vm.prank(s_owner);
+    s_registry.lockRegistry();
+
+    // It should behave the same as when the registry is not locked
+    vm.prank(s_stranger);
+    WorkflowRegistry.WorkflowMetadata memory metadata =
+      s_registry.getWorkflowMetadata(s_authorizedAddress, s_validWorkflowName);
+
+    assertEq(metadata.workflowName, s_validWorkflowName);
+    assertEq(metadata.workflowID, s_validWorkflowID);
+    assertEq(metadata.binaryURL, s_validBinaryURL);
+    assertEq(metadata.configURL, s_validConfigURL);
+    assertEq(metadata.secretsURL, s_validSecretsURL);
+  }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadata.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadata.tree
index f723f720528..215a2a4329f 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadata.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadata.tree
@@ -1,5 +1,7 @@
 WorkflowRegistry.getWorkflowMetadata
 ├── when the workflow exists with the owner and name
 │   └── it returns the correct metadata
-└── when the workflow does not exist
-    └── it reverts with WorkflowDoesNotExist
+├── when the workflow does not exist
+│   └── it reverts with WorkflowDoesNotExist
+└── when the registry is locked
+    └── it should behave the same as when the registry is not locked
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByDON.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByDON.t.sol
index 14b3c96a07d..dbe0b23e5f0 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByDON.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByDON.t.sol
@@ -6,8 +6,7 @@ import {WorkflowRegistryWithFixture} from "./WorkflowRegistryWithFixture.t.sol";
 
 contract WorkflowRegistry_getWorkflowMetadataListByDON is WorkflowRegistryWithFixture {
   function test_WhenStartIs0() external view {
-    WorkflowRegistry.WorkflowMetadata[] memory workflows =
-      s_registry.getWorkflowMetadataListByDON(s_allowedDonID, 0, 10);
+    WorkflowRegistry.WorkflowMetadata[] memory workflows = s_registry.getWorkflowMetadataListByDON(s_allowedDonID, 0, 0);
 
     assertEq(workflows.length, 3);
     assertEq(workflows[0].workflowName, s_workflowName1);
@@ -123,4 +122,34 @@ contract WorkflowRegistry_getWorkflowMetadataListByDON is WorkflowRegistryWithFi
 
     assertEq(workflows.length, 0);
   }
+
+  function test_WhenTheRegistryIsLocked() external {
+    // Lock the registry
+    vm.prank(s_owner);
+    s_registry.lockRegistry();
+
+    // It should behave the same as when the registry is not locked
+    vm.prank(s_stranger);
+    WorkflowRegistry.WorkflowMetadata[] memory workflows =
+      s_registry.getWorkflowMetadataListByDON(s_allowedDonID, 0, 10);
+
+    assertEq(workflows.length, 3);
+    assertEq(workflows[0].workflowName, s_workflowName1);
+    assertEq(workflows[0].workflowID, s_workflowID1);
+    assertEq(workflows[0].binaryURL, s_binaryURL1);
+    assertEq(workflows[0].configURL, s_configURL1);
+    assertEq(workflows[0].secretsURL, s_secretsURL1);
+
+    assertEq(workflows[1].workflowName, s_workflowName2);
+    assertEq(workflows[1].workflowID, s_workflowID2);
+    assertEq(workflows[1].binaryURL, s_binaryURL2);
+    assertEq(workflows[1].configURL, s_configURL2);
+    assertEq(workflows[1].secretsURL, s_secretsURL2);
+
+    assertEq(workflows[2].workflowName, s_workflowName3);
+    assertEq(workflows[2].workflowID, s_workflowID3);
+    assertEq(workflows[2].binaryURL, s_binaryURL3);
+    assertEq(workflows[2].configURL, s_configURL3);
+    assertEq(workflows[2].secretsURL, s_secretsURL3);
+  }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByDON.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByDON.tree
index 1fd6b160b51..0fe6fab8b81 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByDON.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByDON.tree
@@ -12,5 +12,7 @@ WorkflowRegistry.getWorkflowMetadataListByDON
 │       └── it returns the correct metadata list
 ├── when the DON has no workflows
 │   └── it returns an empty list
-└── when start is greater than or equal to total workflows
-    └── it returns an empty list
+├── when start is greater than or equal to total workflows
+│   └── it returns an empty list
+└── when the registry is locked
+    └── it should behave the same as when the registry is not locked
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByOwner.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByOwner.t.sol
index 7eea75d0a02..ceeddca969b 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByOwner.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByOwner.t.sol
@@ -5,24 +5,33 @@ import {WorkflowRegistry} from "../../dev/WorkflowRegistry.sol";
 import {WorkflowRegistryWithFixture} from "./WorkflowRegistryWithFixture.t.sol";
 
 contract WorkflowRegistry_getWorkflowMetadataListByOwner is WorkflowRegistryWithFixture {
-  function test_WhenStartIs0_AndLimitIs0() external view {
+  function test_WhenStartIs0() external view {
     WorkflowRegistry.WorkflowMetadata[] memory workflows =
       s_registry.getWorkflowMetadataListByOwner(s_authorizedAddress, 0, 0);
 
     assertEq(workflows.length, 3);
     assertEq(workflows[0].workflowName, s_workflowName1);
+    assertEq(workflows[0].owner, s_authorizedAddress);
+    assertEq(workflows[0].donID, s_allowedDonID);
+    assertTrue(workflows[0].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[0].workflowID, s_workflowID1);
     assertEq(workflows[0].binaryURL, s_binaryURL1);
     assertEq(workflows[0].configURL, s_configURL1);
     assertEq(workflows[0].secretsURL, s_secretsURL1);
 
     assertEq(workflows[1].workflowName, s_workflowName2);
+    assertEq(workflows[1].owner, s_authorizedAddress);
+    assertEq(workflows[1].donID, s_allowedDonID);
+    assertTrue(workflows[1].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[1].workflowID, s_workflowID2);
     assertEq(workflows[1].binaryURL, s_binaryURL2);
     assertEq(workflows[1].configURL, s_configURL2);
     assertEq(workflows[1].secretsURL, s_secretsURL2);
 
     assertEq(workflows[2].workflowName, s_workflowName3);
+    assertEq(workflows[2].owner, s_authorizedAddress);
+    assertEq(workflows[2].donID, s_allowedDonID);
+    assertTrue(workflows[2].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[2].workflowID, s_workflowID3);
     assertEq(workflows[2].binaryURL, s_binaryURL3);
     assertEq(workflows[2].configURL, s_configURL3);
@@ -35,12 +44,18 @@ contract WorkflowRegistry_getWorkflowMetadataListByOwner is WorkflowRegistryWith
 
     assertEq(workflows.length, 2);
     assertEq(workflows[0].workflowName, s_workflowName2);
+    assertEq(workflows[0].owner, s_authorizedAddress);
+    assertEq(workflows[0].donID, s_allowedDonID);
+    assertTrue(workflows[0].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[0].workflowID, s_workflowID2);
     assertEq(workflows[0].binaryURL, s_binaryURL2);
     assertEq(workflows[0].configURL, s_configURL2);
     assertEq(workflows[0].secretsURL, s_secretsURL2);
 
     assertEq(workflows[1].workflowName, s_workflowName3);
+    assertEq(workflows[1].owner, s_authorizedAddress);
+    assertEq(workflows[1].donID, s_allowedDonID);
+    assertTrue(workflows[1].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[1].workflowID, s_workflowID3);
     assertEq(workflows[1].binaryURL, s_binaryURL3);
     assertEq(workflows[1].configURL, s_configURL3);
@@ -54,12 +69,18 @@ contract WorkflowRegistry_getWorkflowMetadataListByOwner is WorkflowRegistryWith
     assertEq(workflows.length, 2);
     assertEq(workflows[0].workflowName, s_workflowName1);
     assertEq(workflows[0].workflowID, s_workflowID1);
+    assertEq(workflows[0].owner, s_authorizedAddress);
+    assertEq(workflows[0].donID, s_allowedDonID);
+    assertTrue(workflows[0].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[0].binaryURL, s_binaryURL1);
     assertEq(workflows[0].configURL, s_configURL1);
     assertEq(workflows[0].secretsURL, s_secretsURL1);
 
     assertEq(workflows[1].workflowName, s_workflowName2);
     assertEq(workflows[1].workflowID, s_workflowID2);
+    assertEq(workflows[1].owner, s_authorizedAddress);
+    assertEq(workflows[1].donID, s_allowedDonID);
+    assertTrue(workflows[1].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[1].binaryURL, s_binaryURL2);
     assertEq(workflows[1].configURL, s_configURL2);
     assertEq(workflows[1].secretsURL, s_secretsURL2);
@@ -71,18 +92,27 @@ contract WorkflowRegistry_getWorkflowMetadataListByOwner is WorkflowRegistryWith
 
     assertEq(workflows.length, 3);
     assertEq(workflows[0].workflowName, s_workflowName1);
+    assertEq(workflows[0].owner, s_authorizedAddress);
+    assertEq(workflows[0].donID, s_allowedDonID);
+    assertTrue(workflows[0].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[0].workflowID, s_workflowID1);
     assertEq(workflows[0].binaryURL, s_binaryURL1);
     assertEq(workflows[0].configURL, s_configURL1);
     assertEq(workflows[0].secretsURL, s_secretsURL1);
 
     assertEq(workflows[1].workflowName, s_workflowName2);
+    assertEq(workflows[1].owner, s_authorizedAddress);
+    assertEq(workflows[1].donID, s_allowedDonID);
+    assertTrue(workflows[1].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[1].workflowID, s_workflowID2);
     assertEq(workflows[1].binaryURL, s_binaryURL2);
     assertEq(workflows[1].configURL, s_configURL2);
     assertEq(workflows[1].secretsURL, s_secretsURL2);
 
     assertEq(workflows[2].workflowName, s_workflowName3);
+    assertEq(workflows[2].owner, s_authorizedAddress);
+    assertEq(workflows[2].donID, s_allowedDonID);
+    assertTrue(workflows[2].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[2].workflowID, s_workflowID3);
     assertEq(workflows[2].binaryURL, s_binaryURL3);
     assertEq(workflows[2].configURL, s_configURL3);
@@ -95,18 +125,27 @@ contract WorkflowRegistry_getWorkflowMetadataListByOwner is WorkflowRegistryWith
 
     assertEq(workflows.length, 3);
     assertEq(workflows[0].workflowName, s_workflowName1);
+    assertEq(workflows[0].owner, s_authorizedAddress);
+    assertEq(workflows[0].donID, s_allowedDonID);
+    assertTrue(workflows[0].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[0].workflowID, s_workflowID1);
     assertEq(workflows[0].binaryURL, s_binaryURL1);
     assertEq(workflows[0].configURL, s_configURL1);
     assertEq(workflows[0].secretsURL, s_secretsURL1);
 
     assertEq(workflows[1].workflowName, s_workflowName2);
+    assertEq(workflows[1].owner, s_authorizedAddress);
+    assertEq(workflows[1].donID, s_allowedDonID);
+    assertTrue(workflows[1].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[1].workflowID, s_workflowID2);
     assertEq(workflows[1].binaryURL, s_binaryURL2);
     assertEq(workflows[1].configURL, s_configURL2);
     assertEq(workflows[1].secretsURL, s_secretsURL2);
 
     assertEq(workflows[2].workflowName, s_workflowName3);
+    assertEq(workflows[2].owner, s_authorizedAddress);
+    assertEq(workflows[2].donID, s_allowedDonID);
+    assertTrue(workflows[2].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
     assertEq(workflows[2].workflowID, s_workflowID3);
     assertEq(workflows[2].binaryURL, s_binaryURL3);
     assertEq(workflows[2].configURL, s_configURL3);
@@ -116,7 +155,6 @@ contract WorkflowRegistry_getWorkflowMetadataListByOwner is WorkflowRegistryWith
   function test_WhenTheOwnerHasNoWorkflows() external view {
     WorkflowRegistry.WorkflowMetadata[] memory workflows =
       s_registry.getWorkflowMetadataListByOwner(s_unauthorizedAddress, 0, 10);
-
     assertEq(workflows.length, 0);
   }
 
@@ -126,4 +164,43 @@ contract WorkflowRegistry_getWorkflowMetadataListByOwner is WorkflowRegistryWith
 
     assertEq(workflows.length, 0);
   }
+
+  function test_WhenTheRegistryIsLocked() external {
+    // Lock the registry
+    vm.prank(s_owner);
+    s_registry.lockRegistry();
+
+    // It should behave the same as when the registry is not locked
+    vm.prank(s_stranger);
+    WorkflowRegistry.WorkflowMetadata[] memory workflows =
+      s_registry.getWorkflowMetadataListByOwner(s_authorizedAddress, 0, 0);
+
+    assertEq(workflows.length, 3);
+    assertEq(workflows[0].workflowName, s_workflowName1);
+    assertEq(workflows[0].owner, s_authorizedAddress);
+    assertEq(workflows[0].donID, s_allowedDonID);
+    assertTrue(workflows[0].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
+    assertEq(workflows[0].workflowID, s_workflowID1);
+    assertEq(workflows[0].binaryURL, s_binaryURL1);
+    assertEq(workflows[0].configURL, s_configURL1);
+    assertEq(workflows[0].secretsURL, s_secretsURL1);
+
+    assertEq(workflows[1].workflowName, s_workflowName2);
+    assertEq(workflows[1].owner, s_authorizedAddress);
+    assertEq(workflows[1].donID, s_allowedDonID);
+    assertTrue(workflows[1].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
+    assertEq(workflows[1].workflowID, s_workflowID2);
+    assertEq(workflows[1].binaryURL, s_binaryURL2);
+    assertEq(workflows[1].configURL, s_configURL2);
+    assertEq(workflows[1].secretsURL, s_secretsURL2);
+
+    assertEq(workflows[2].workflowName, s_workflowName3);
+    assertEq(workflows[2].owner, s_authorizedAddress);
+    assertEq(workflows[2].donID, s_allowedDonID);
+    assertTrue(workflows[2].status == WorkflowRegistry.WorkflowStatus.ACTIVE);
+    assertEq(workflows[2].workflowID, s_workflowID3);
+    assertEq(workflows[2].binaryURL, s_binaryURL3);
+    assertEq(workflows[2].configURL, s_configURL3);
+    assertEq(workflows[2].secretsURL, s_secretsURL3);
+  }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByOwner.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByOwner.tree
index c2333473f39..ab076425542 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByOwner.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.getWorkflowMetadataListByOwner.tree
@@ -2,7 +2,7 @@ WorkflowRegistry.getWorkflowMetadataListByOwner
 ├── when the owner has workflows
 │   ├── when start is 0
 │   │   └── it returns the correct metadata list
-│   ├── when start is greater than 0 and limit exceeds total
+│   ├── when start is greater than 0
 │   │   └── it returns the correct metadata list
 │   ├── when limit is less than total workflows
 │   │   └── it returns the correct metadata list
@@ -12,5 +12,7 @@ WorkflowRegistry.getWorkflowMetadataListByOwner
 │       └── it returns the correct metadata list
 ├── when the owner has no workflows
 │   └── it returns an empty list
-└── when start is greater than or equal to total workflows
-    └── it returns an empty list
+├── when start is greater than or equal to total workflows
+│   └── it returns an empty list
+└── when the registry is locked
+    └── it should behave the same as when the registry is not locked
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.lockRegistry.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.lockRegistry.t.sol
new file mode 100644
index 00000000000..5c93c56acee
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.lockRegistry.t.sol
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.24;
+
+import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol";
+import {WorkflowRegistry} from "../../dev/WorkflowRegistry.sol";
+import {WorkflowRegistrySetup} from "./WorkflowRegistrySetup.t.sol";
+
+contract WorkflowRegistry_lockRegistry is WorkflowRegistrySetup {
+  function test_RevertWhen_TheCallerIsNotTheContractOwner() external {
+    vm.expectRevert(Ownable2Step.OnlyCallableByOwner.selector);
+    s_registry.lockRegistry();
+  }
+
+  function test_WhenTheCallerIsTheContractOwner() external {
+    vm.expectEmit(true, true, false, false);
+    emit WorkflowRegistry.RegistryLockedV1(s_owner);
+
+    vm.prank(s_owner);
+    s_registry.lockRegistry();
+
+    assertTrue(s_registry.isRegistryLocked());
+  }
+}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.lockRegistry.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.lockRegistry.tree
new file mode 100644
index 00000000000..8079c114e50
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.lockRegistry.tree
@@ -0,0 +1,6 @@
+WorkflowRegistry.lockRegistry
+├── when the caller is not the contract owner
+│   └── it should revert
+└── when the caller is the contract owner
+    ├── it should lock the registry
+    └── it should emit {RegistryLockedV1}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.pauseWorkflow.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.pauseWorkflow.t.sol
index a6ef679998a..1271808e85f 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.pauseWorkflow.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.pauseWorkflow.t.sol
@@ -57,6 +57,10 @@ contract WorkflowRegistry_pauseWorkflow is WorkflowRegistrySetup {
 
     _removeDONFromAllowedDONs(s_allowedDonID);
 
+    // It should emit {WorkflowPausedV1} when the workflow is paused.
+    vm.expectEmit();
+    emit WorkflowRegistry.WorkflowPausedV1(s_validWorkflowID, s_authorizedAddress, s_allowedDonID, s_validWorkflowName);
+
     // Pause the workflow.
     vm.prank(s_authorizedAddress);
     s_registry.pauseWorkflow(s_validWorkflowKey);
@@ -76,6 +80,10 @@ contract WorkflowRegistry_pauseWorkflow is WorkflowRegistrySetup {
     _removeAddressFromAuthorizedAddresses(s_authorizedAddress);
     _removeDONFromAllowedDONs(s_allowedDonID);
 
+    // It should emit {WorkflowPausedV1} when the workflow is paused.
+    vm.expectEmit();
+    emit WorkflowRegistry.WorkflowPausedV1(s_validWorkflowID, s_authorizedAddress, s_allowedDonID, s_validWorkflowName);
+
     // Pause the workflow.
     vm.prank(s_authorizedAddress);
     s_registry.pauseWorkflow(s_validWorkflowKey);
@@ -93,6 +101,10 @@ contract WorkflowRegistry_pauseWorkflow is WorkflowRegistrySetup {
 
     _removeAddressFromAuthorizedAddresses(s_authorizedAddress);
 
+    // It should emit {WorkflowPausedV1} when the workflow is paused.
+    vm.expectEmit();
+    emit WorkflowRegistry.WorkflowPausedV1(s_validWorkflowID, s_authorizedAddress, s_allowedDonID, s_validWorkflowName);
+
     // Pause the workflow.
     vm.prank(s_authorizedAddress);
     s_registry.pauseWorkflow(s_validWorkflowKey);
@@ -108,6 +120,10 @@ contract WorkflowRegistry_pauseWorkflow is WorkflowRegistrySetup {
     // Register a workflow first.
     _registerValidWorkflow();
 
+    // It should emit {WorkflowPausedV1} when the workflow is paused.
+    vm.expectEmit();
+    emit WorkflowRegistry.WorkflowPausedV1(s_validWorkflowID, s_authorizedAddress, s_allowedDonID, s_validWorkflowName);
+
     // Pause the workflow.
     vm.prank(s_authorizedAddress);
     s_registry.pauseWorkflow(s_validWorkflowKey);
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.pauseWorkflow.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.pauseWorkflow.tree
index 2cd2361b702..cbb75d0295c 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.pauseWorkflow.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.pauseWorkflow.tree
@@ -9,8 +9,8 @@ WorkflowRegistry.pauseWorkflow
         │   └── it should revert
         └── when the workflow is active
             ├── when the donID is not allowed
-            │   ├── it should pause the workflow for an authorized address 
-            │   └── it should pause the workflow for an unauthorized address
+            │   ├── it should pause the workflow for an authorized address and emit {WorkflowPausedV1}
+            │   └── it should pause the workflow for an unauthorized address and emit {WorkflowPausedV1}
             └── when the donID is allowed
-                ├── it should pause the workflow for an authorized address 
-                └── it should pause the workflow for an unauthorized address
+                ├── it should pause the workflow for an authorized address and emit {WorkflowPausedV1}
+                └── it should pause the workflow for an unauthorized address and emit {WorkflowPausedV1}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.registerWorkflow.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.registerWorkflow.t.sol
index a6852b868dc..426fbfcc502 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.registerWorkflow.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.registerWorkflow.t.sol
@@ -173,7 +173,7 @@ contract WorkflowRegistry_registerWorkflow is WorkflowRegistrySetup {
     vm.startPrank(s_authorizedAddress);
 
     // it should emit {WorkflowRegisteredV1}
-    vm.expectEmit(true, true, true, true);
+    vm.expectEmit();
     emit WorkflowRegistry.WorkflowRegisteredV1(
       s_validWorkflowID,
       s_authorizedAddress,
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.unlockRegistry.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.unlockRegistry.t.sol
new file mode 100644
index 00000000000..1cb2eb6429d
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.unlockRegistry.t.sol
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity 0.8.24;
+
+import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol";
+import {WorkflowRegistry} from "../../dev/WorkflowRegistry.sol";
+import {WorkflowRegistrySetup} from "./WorkflowRegistrySetup.t.sol";
+
+contract WorkflowRegistry_unlockRegistry is WorkflowRegistrySetup {
+  function test_RevertWhen_TheCallerIsNotTheContractOwner() external {
+    vm.expectRevert(Ownable2Step.OnlyCallableByOwner.selector);
+    s_registry.unlockRegistry();
+  }
+
+  function test_WhenTheCallerIsTheContractOwner() external {
+    // Lock the registry first
+    vm.startPrank(s_owner);
+    s_registry.lockRegistry();
+
+    assertTrue(s_registry.isRegistryLocked());
+
+    // Unlock the registry
+    vm.expectEmit(true, true, false, false);
+    emit WorkflowRegistry.RegistryUnlockedV1(s_owner);
+
+    s_registry.unlockRegistry();
+
+    assertFalse(s_registry.isRegistryLocked());
+    vm.stopPrank();
+  }
+}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.unlockRegistry.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.unlockRegistry.tree
new file mode 100644
index 00000000000..c280b441a57
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.unlockRegistry.tree
@@ -0,0 +1,6 @@
+WorkflowRegistry.unlockRegistry
+├── when the caller is not the contract owner
+│   └── it should revert
+└── when the caller is the contract owner
+    ├── it should unlock the registry
+    └── it should emit {RegistryUnlockedV1}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateAllowedDONs.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateAllowedDONs.t.sol
index 63204fb8f96..bbf048909b5 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateAllowedDONs.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateAllowedDONs.t.sol
@@ -7,7 +7,7 @@ import {WorkflowRegistrySetup} from "./WorkflowRegistrySetup.t.sol";
 
 contract WorkflowRegistry_updateAllowedDONs is WorkflowRegistrySetup {
   function test_RevertWhen_TheCallerIsNotTheOwner() external {
-    vm.prank(s_nonOwner);
+    vm.prank(s_stranger);
 
     vm.expectRevert(Ownable2Step.OnlyCallableByOwner.selector);
     s_registry.updateAllowedDONs(new uint32[](0), true);
@@ -36,7 +36,7 @@ contract WorkflowRegistry_updateAllowedDONs is WorkflowRegistrySetup {
     assertEq(allowedDONs.length, 1);
 
     // Expect the event to be emitted
-    vm.expectEmit(true, true, true, true);
+    vm.expectEmit();
     emit WorkflowRegistry.AllowedDONsUpdatedV1(donIDsToAdd, true);
 
     // Call the function as the owner
@@ -58,7 +58,7 @@ contract WorkflowRegistry_updateAllowedDONs is WorkflowRegistrySetup {
     assertEq(allowedDONs.length, 1);
 
     // Expect the event to be emitted
-    vm.expectEmit(true, true, true, true);
+    vm.expectEmit();
     emit WorkflowRegistry.AllowedDONsUpdatedV1(donIDsToRemove, false);
 
     // Call the function as the owner
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateAuthorizedAddresses.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateAuthorizedAddresses.t.sol
index ac9e9b94bea..01a3ded2c19 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateAuthorizedAddresses.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateAuthorizedAddresses.t.sol
@@ -7,7 +7,7 @@ import {WorkflowRegistrySetup} from "./WorkflowRegistrySetup.t.sol";
 
 contract WorkflowRegistry_updateAuthorizedAddresses is WorkflowRegistrySetup {
   function test_RevertWhen_TheCallerIsNotTheOwner() external {
-    vm.prank(s_nonOwner);
+    vm.prank(s_stranger);
 
     vm.expectRevert(Ownable2Step.OnlyCallableByOwner.selector);
     s_registry.updateAuthorizedAddresses(new address[](0), true);
@@ -36,7 +36,7 @@ contract WorkflowRegistry_updateAuthorizedAddresses is WorkflowRegistrySetup {
     assertEq(authorizedAddresses.length, 1);
 
     // Expect the event to be emitted
-    vm.expectEmit(true, true, true, true);
+    vm.expectEmit();
     emit WorkflowRegistry.AuthorizedAddressesUpdatedV1(addressesToAdd, true);
 
     // Call the function as the owner
@@ -58,7 +58,7 @@ contract WorkflowRegistry_updateAuthorizedAddresses is WorkflowRegistrySetup {
     assertEq(authorizedAddresses.length, 1);
 
     // Expect the event to be emitted
-    vm.expectEmit(true, true, true, true);
+    vm.expectEmit();
     emit WorkflowRegistry.AuthorizedAddressesUpdatedV1(addressesToRemove, false);
 
     // Call the function as the owner
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateWorkflow.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateWorkflow.t.sol
index ff59989fe93..5058512ba7b 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateWorkflow.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistry.updateWorkflow.t.sol
@@ -7,6 +7,8 @@ import {WorkflowRegistrySetup} from "./WorkflowRegistrySetup.t.sol";
 contract WorkflowRegistry_updateWorkflow is WorkflowRegistrySetup {
   bytes32 private s_newValidWorkflowID = keccak256("newValidWorkflowID");
   string private s_newValidSecretsURL = "https://example.com/new-secrets";
+  string private s_newValidConfigURL = "https://example.com/new-config";
+  string private s_newValidBinaryURL = "https://example.com/new-binary";
 
   function test_RevertWhen_TheCallerIsNotAnAuthorizedAddress() external {
     // Register the workflow first as an authorized address.
@@ -163,21 +165,21 @@ contract WorkflowRegistry_updateWorkflow is WorkflowRegistrySetup {
 
     // Update the workflow.
     // It should emit {WorkflowUpdatedV1}.
-    vm.expectEmit(true, true, true, true);
+    vm.expectEmit();
     emit WorkflowRegistry.WorkflowUpdatedV1(
       s_validWorkflowID,
       s_authorizedAddress,
       s_allowedDonID,
       s_newValidWorkflowID,
       s_validWorkflowName,
-      s_validBinaryURL,
-      s_validConfigURL,
+      s_newValidBinaryURL,
+      s_newValidConfigURL,
       s_newValidSecretsURL
     );
 
     vm.startPrank(s_authorizedAddress);
     s_registry.updateWorkflow(
-      s_validWorkflowKey, s_newValidWorkflowID, s_validBinaryURL, s_validConfigURL, s_newValidSecretsURL
+      s_validWorkflowKey, s_newValidWorkflowID, s_newValidBinaryURL, s_newValidConfigURL, s_newValidSecretsURL
     );
 
     // It should update the workflow in s_workflows with the new values
@@ -187,8 +189,8 @@ contract WorkflowRegistry_updateWorkflow is WorkflowRegistrySetup {
     assertEq(workflow.donID, s_allowedDonID);
     assertEq(workflow.workflowName, s_validWorkflowName);
     assertEq(workflow.workflowID, s_newValidWorkflowID);
-    assertEq(workflow.binaryURL, s_validBinaryURL);
-    assertEq(workflow.configURL, s_validConfigURL);
+    assertEq(workflow.binaryURL, s_newValidBinaryURL);
+    assertEq(workflow.configURL, s_newValidConfigURL);
     assertEq(workflow.secretsURL, s_newValidSecretsURL);
     assertTrue(workflow.status == WorkflowRegistry.WorkflowStatus.ACTIVE);
 
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistrySetup.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistrySetup.t.sol
index c1a44e43c8e..b263b1cb79a 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistrySetup.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistry/WorkflowRegistrySetup.t.sol
@@ -7,7 +7,7 @@ import {Test} from "forge-std/Test.sol";
 contract WorkflowRegistrySetup is Test {
   WorkflowRegistry internal s_registry;
   address internal s_owner;
-  address internal s_nonOwner;
+  address internal s_stranger;
   address internal s_authorizedAddress;
   address internal s_unauthorizedAddress;
   uint32 internal s_allowedDonID;
@@ -23,7 +23,7 @@ contract WorkflowRegistrySetup is Test {
 
   function setUp() public virtual {
     s_owner = makeAddr("owner");
-    s_nonOwner = makeAddr("nonOwner");
+    s_stranger = makeAddr("nonOwner");
     s_authorizedAddress = makeAddr("authorizedAddress");
     s_unauthorizedAddress = makeAddr("unauthorizedAddress");
     s_allowedDonID = 1;
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.t.sol
index 555d26e065f..a4c4975c3d4 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.t.sol
@@ -1,33 +1,92 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
-
 import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol";
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+import {Vm} from "forge-std/Vm.sol";
 
 contract WorkflowRegistryManager_activateVersion is WorkflowRegistryManagerSetup {
   function test_RevertWhen_TheCallerIsNotTheOwner() external {
     // it should revert
-    vm.prank(s_nonOwner);
+    vm.prank(s_stranger);
     vm.expectRevert(Ownable2Step.OnlyCallableByOwner.selector);
-    s_registryManager.activateVersion(s_versionNumber);
+    s_registryManager.activateVersion(2);
   }
 
   // whenTheCallerIsTheOwner
   function test_RevertWhen_TheVersionNumberDoesNotExist() external {
     // it should revert
+    vm.prank(s_owner);
+    vm.expectRevert(abi.encodeWithSelector(WorkflowRegistryManager.VersionNotRegistered.selector, 5));
+    s_registryManager.activateVersion(5);
   }
 
   // whenTheCallerIsTheOwner whenTheVersionNumberExists
   function test_RevertWhen_TheVersionNumberIsAlreadyActive() external {
-    // it should revert
+    // Deploy a mock registry and add that to the registry manager
+    _deployMockRegistryAndAddVersion(true);
+
+    // Get the latest version number
+    uint32 versionNumber = s_registryManager.getLatestVersionNumber();
+
+    // Activate the same version
+    vm.prank(s_owner);
+    vm.expectRevert(abi.encodeWithSelector(WorkflowRegistryManager.VersionAlreadyActive.selector, versionNumber));
+    s_registryManager.activateVersion(versionNumber);
   }
 
-  function test_WhenTheVersionNumberIsNotActive() external {
-    // it should deactivate the current active version (if any)
-    // it should activate the specified version and update s_activeVersionNumber
-    // it should add the version to s_versionNumberByAddressAndChainID
-    // it should emit VersionDeactivatedV1 (if a previous version was active)
-    // it should emit VersionActivatedV1
+  function test_WhenTheVersionNumberIsNotActive_AndWhenThereAreNoActiveVersions() external {
+    // Deploy a mock registry and add but not activate it.
+    _deployMockRegistryAndAddVersion(false);
+
+    // Get the latest version number, which should be 1.
+    uint32 versionNumber = s_registryManager.getLatestVersionNumber();
+    assertEq(versionNumber, 1);
+
+    // Start recording logs to check that VersionDeactivated is not emitted.
+    vm.recordLogs();
+
+    // Since there are no existing active versions, this should only activate the version and emit VersionActivated
+    vm.expectEmit(true, true, false, true);
+    emit WorkflowRegistryManager.VersionActivated(address(s_mockWorkflowRegistryContract), s_chainID, versionNumber);
+
+    // Activate the version
+    vm.prank(s_owner);
+    s_registryManager.activateVersion(versionNumber);
+
+    // Retrieve the recorded logs.
+    Vm.Log[] memory entries = vm.getRecordedLogs();
+
+    // Event signature hash for WorkflowForceUpdateSecretsRequestedV1.
+    bytes32 eventSignature = keccak256("VersionDeactivated(string,address,string)");
+
+    // Iterate through the logs to ensure VersionDeactivatedV1 was not emitted.
+    bool deactivateEventEmitted = false;
+    for (uint256 i = 0; i < entries.length; ++i) {
+      if (entries[i].topics[0] == eventSignature) {
+        deactivateEventEmitted = true;
+        break;
+      }
+    }
+
+    // Assert that the event was not emitted.
+    assertFalse(deactivateEventEmitted);
+
+    // Deploy another mock registry.
+    _deployMockRegistryAndAddVersion(false);
+
+    // Get the latest version number, which should now be 2.
+    uint32 newVersionNumber = s_registryManager.getLatestVersionNumber();
+    assertEq(newVersionNumber, 2);
+
+    // It should now emit both VersionActivated and VersionDeactivated.
+    vm.expectEmit(true, true, false, true);
+    emit WorkflowRegistryManager.VersionActivated(address(s_mockWorkflowRegistryContract), s_chainID, newVersionNumber);
+    emit WorkflowRegistryManager.VersionDeactivated(address(s_mockWorkflowRegistryContract), s_chainID, versionNumber);
+
+    // Activate the version
+    vm.prank(s_owner);
+    s_registryManager.activateVersion(newVersionNumber);
   }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.tree
index eb95a4e794c..cee39a0db69 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.activateVersion.tree
@@ -11,5 +11,5 @@ WorkflowRegistryManager.activateVersion
             ├── it should deactivate the current active version (if any)
             ├── it should activate the specified version and update s_activeVersionNumber
             ├── it should add the version to s_versionNumberByAddressAndChainID
-            ├── it should emit VersionDeactivatedV1 (if a previous version was active)
-            └── it should emit VersionActivatedV1
+            ├── it should emit VersionDeactivated (if a previous version was active)
+            └── it should emit VersionActivated
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.addVersion.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.addVersion.t.sol
index 940b15dfd54..218ac44eaa6 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.addVersion.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.addVersion.t.sol
@@ -1,32 +1,103 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-contract WorkflowRegistryManageraddVersion {
+import {Ownable2Step} from "../../../shared/access/Ownable2Step.sol";
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {MockContract} from "../../mocks/MockContract.sol";
+import {MockWorkflowRegistryContract} from "../../mocks/MockWorkflowRegistryContract.sol";
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+
+contract WorkflowRegistryManager_addVersion is WorkflowRegistryManagerSetup {
   function test_RevertWhen_TheCallerIsNotTheOwner() external {
-    // it should revert
+    // Deploy the MockWorkflowRegistryContract contract
+    vm.prank(s_owner);
+    MockWorkflowRegistryContract mockContract = new MockWorkflowRegistryContract();
+
+    // Add it as a non owner
+    vm.prank(s_stranger);
+    vm.expectRevert(Ownable2Step.OnlyCallableByOwner.selector);
+    s_registryManager.addVersion(address(mockContract), s_chainID, s_deployedAt, true);
   }
 
-  modifier whenTheCallerIsTheOwner() {
-    _;
+  // whenTheCallerIsTheOwner
+  function test_RevertWhen_TheContractAddressIsInvalid() external {
+    // Deploy a random contract
+    MockContract mockContract = new MockContract();
+
+    // Add it to the WorkflowRegistryManager
+    vm.prank(s_owner);
+    vm.expectRevert(abi.encodeWithSelector(WorkflowRegistryManager.InvalidContractType.selector, address(mockContract)));
+    s_registryManager.addVersion(address(mockContract), s_chainID, s_deployedAt, true);
   }
 
-  function test_RevertWhen_TheContractAddressIsInvalid() external whenTheCallerIsTheOwner {
-    // it should revert
+  // whenTheCallerIsTheOwner
+  function test_RevertWhen_TheContractAddressIsValid() external {
+    // Add a 0 address to the WorkflowRegistryManager
+    vm.prank(s_owner);
+    vm.expectRevert(abi.encodeWithSelector(WorkflowRegistryManager.InvalidContractAddress.selector, address(0)));
+    s_registryManager.addVersion(address(0), s_chainID, s_deployedAt, true);
   }
 
-  modifier whenTheContractAddressIsValid() {
-    _;
+  // whenTheCallerIsTheOwner whenTheContractAddressIsValid
+  function test_RevertWhen_TheContractTypeIsInvalid() external {
+    // Deploy a random contract
+    MockContract mockContract = new MockContract();
+
+    // Add it to the WorkflowRegistryManager
+    vm.prank(s_owner);
+    vm.expectRevert(abi.encodeWithSelector(WorkflowRegistryManager.InvalidContractType.selector, address(mockContract)));
+    s_registryManager.addVersion(address(mockContract), s_chainID, s_deployedAt, true);
   }
 
-  function test_WhenAutoActivateIsTrue() external whenTheCallerIsTheOwner whenTheContractAddressIsValid {
-    // it should deactivate any currently active version
-    // it should activate the new version
-    // it should emit VersionAddedV1 after adding the version to s_versions
-    // it should emit VersionActivatedV1
+  // whenTheCallerIsTheOwner whenTheContractAddressIsValid whenTheContractTypeIsValid
+  function test_WhenAutoActivateIsTrue() external {
+    // Get the latest version number, which should revert.
+    vm.expectRevert(WorkflowRegistryManager.NoVersionsRegistered.selector);
+    s_registryManager.getLatestVersionNumber();
+
+    // Deploy a MockWorkflowRegistryContract contract
+    MockWorkflowRegistryContract mockWfrContract = new MockWorkflowRegistryContract();
+
+    // Expect both VersionAdded and VersionActivated events to be emitted.
+    vm.expectEmit(true, true, false, true);
+    emit WorkflowRegistryManager.VersionAdded(address(mockWfrContract), s_chainID, s_deployedAt, 1);
+    emit WorkflowRegistryManager.VersionActivated(address(mockWfrContract), s_chainID, 1);
+
+    // Add the MockWorkflowRegistryContract to the WorkflowRegistryManager
+    vm.prank(s_owner);
+    s_registryManager.addVersion(address(mockWfrContract), s_chainID, s_deployedAt, true);
+
+    // Get the latest version number again, which should be 1.
+    uint32 versionNumber = s_registryManager.getLatestVersionNumber();
+    assertEq(versionNumber, 1);
+
+    // Get the latest active version number, which should also be 1.
+    uint32 activeVersionNumber = s_registryManager.getActiveVersionNumber();
+    assertEq(activeVersionNumber, 1);
   }
 
-  function test_WhenAutoActivateIsFalse() external whenTheCallerIsTheOwner whenTheContractAddressIsValid {
-    // it should not activate the new version
-    // it should emit VersionAddedV1 after adding the version to s_versions
+  // whenTheCallerIsTheOwner whenTheContractAddressIsValid whenTheContractTypeIsValid
+  function test_WhenAutoActivateIsFalse() external {
+    // Get the latest version number, which should revert.
+    vm.expectRevert(WorkflowRegistryManager.NoVersionsRegistered.selector);
+    s_registryManager.getLatestVersionNumber();
+
+    // Deploy a MockWorkflowRegistryContract contract
+    MockWorkflowRegistryContract mockWfrContract = new MockWorkflowRegistryContract();
+
+    vm.expectEmit(true, true, false, true);
+    emit WorkflowRegistryManager.VersionAdded(address(mockWfrContract), s_chainID, s_deployedAt, 1);
+
+    // Add the MockWorkflowRegistryContract to the WorkflowRegistryManager
+    vm.prank(s_owner);
+    s_registryManager.addVersion(address(mockWfrContract), s_chainID, s_deployedAt, false);
+
+    // Get the latest version number again, which should be 1.
+    uint32 versionNumber = s_registryManager.getLatestVersionNumber();
+    assertEq(versionNumber, 1);
+
+    // Get the latest active version number, which should revert.
+    vm.expectRevert(WorkflowRegistryManager.NoActiveVersionAvailable.selector);
+    s_registryManager.getActiveVersionNumber();
   }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.addVersion.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.addVersion.tree
index 553db81dbe0..5e1c22b7840 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.addVersion.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.addVersion.tree
@@ -5,11 +5,14 @@ WorkflowRegistryManager.addVersion
     ├── when the contract address is invalid
     │   └── it should revert
     └── when the contract address is valid
-        ├── when autoActivate is true
-        │   ├── it should deactivate any currently active version
-        │   ├── it should activate the new version
-        │   ├── it should emit VersionAddedV1 after adding the version to s_versions
-        │   └── it should emit VersionActivatedV1
-        └── when autoActivate is false
-            ├── it should not activate the new version
-            └── it should emit VersionAddedV1 after adding the version to s_versions
+        ├── when the contract type is invalid
+        │   └── it should revert
+        └── when the contract type is valid
+            ├── when autoActivate is true
+            │   ├── it should deactivate any currently active version
+            │   ├── it should activate the new version
+            │   ├── it should emit VersionAdded after adding the version to s_versions
+            │   └── it should emit VersionActivated
+            └── when autoActivate is false
+                ├── it should not activate the new version
+                └── it should emit VersionAdded after adding the version to s_versions
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersion.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersion.t.sol
index f20fafd5c95..92d59346032 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersion.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersion.t.sol
@@ -1,12 +1,20 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-contract WorkflowRegistryManagergetActiveVersion {
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+
+contract WorkflowRegistryManager_getActiveVersion is WorkflowRegistryManagerSetup {
   function test_WhenNoActiveVersionIsAvailable() external {
-    // it should revert with NoActiveVersionAvailable
+    vm.expectRevert(WorkflowRegistryManager.NoActiveVersionAvailable.selector);
+    s_registryManager.getActiveVersion();
   }
 
   function test_WhenAnActiveVersionExists() external {
-    // it should return the active version details
+    _deployMockRegistryAndAddVersion(true);
+    WorkflowRegistryManager.Version memory activeVersion = s_registryManager.getActiveVersion();
+    assertEq(activeVersion.contractAddress, address(s_mockWorkflowRegistryContract));
+    assertEq(activeVersion.chainID, s_chainID);
+    assertEq(activeVersion.deployedAt, s_deployedAt);
   }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersionNumber.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersionNumber.t.sol
new file mode 100644
index 00000000000..4167dcc803a
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersionNumber.t.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.24;
+
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+
+contract WorkflowRegistryManager_getActiveVersionNumber is WorkflowRegistryManagerSetup {
+  function test_WhenNoActiveVersionIsAvailable() external {
+    vm.expectRevert(WorkflowRegistryManager.NoActiveVersionAvailable.selector);
+    s_registryManager.getActiveVersionNumber();
+  }
+
+  function test_WhenAnActiveVersionExists() external {
+    _deployMockRegistryAndAddVersion(true);
+    uint32 activeVersionNumber = s_registryManager.getActiveVersionNumber();
+    assertEq(activeVersionNumber, 1);
+  }
+}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersionNumber.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersionNumber.tree
new file mode 100644
index 00000000000..7f6fb062eec
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getActiveVersionNumber.tree
@@ -0,0 +1,5 @@
+WorkflowRegistryManager.getActiveVersion
+├── when no active version is available
+│   └── it should revert with NoActiveVersionAvailable
+└── when an active version exists
+    └── it should return the active version number
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getAllVersions.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getAllVersions.t.sol
index 9719d21711a..ccdfacb474f 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getAllVersions.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getAllVersions.t.sol
@@ -1,16 +1,50 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-contract WorkflowRegistryManagergetAllVersions {
-  function test_WhenRequestingWithInvalidStartIndex() external {
-    // it should return an empty array
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+
+import {MockWorkflowRegistryContract} from "../../mocks/MockWorkflowRegistryContract.sol";
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+
+contract WorkflowRegistryManager_getAllVersions is WorkflowRegistryManagerSetup {
+  MockWorkflowRegistryContract internal s_mockContract1;
+  MockWorkflowRegistryContract internal s_mockContract2;
+  MockWorkflowRegistryContract internal s_mockContract3;
+
+  function setUp() public override {
+    super.setUp();
+    // Add 3 versions
+    s_mockContract1 = new MockWorkflowRegistryContract();
+    s_mockContract2 = new MockWorkflowRegistryContract();
+    s_mockContract3 = new MockWorkflowRegistryContract();
+
+    vm.startPrank(s_owner);
+    s_registryManager.addVersion(address(s_mockContract1), s_chainID, s_deployedAt, true);
+    s_registryManager.addVersion(address(s_mockContract2), s_chainID, s_deployedAt, false);
+    s_registryManager.addVersion(address(s_mockContract3), s_chainID, s_deployedAt, true);
+    vm.stopPrank();
+  }
+
+  function test_WhenRequestingWithInvalidStartIndex() external view {
+    // It should return an empty array.
+    WorkflowRegistryManager.Version[] memory versions = s_registryManager.getAllVersions(10, 1);
+    assertEq(versions.length, 0);
   }
 
-  function test_WhenRequestingWithValidStartIndexAndLimitWithinBounds() external {
-    // it should return the correct versions based on pagination
+  function test_WhenRequestingWithValidStartIndexAndLimitWithinBounds() external view {
+    // It should return the correct versions based on pagination.
+    WorkflowRegistryManager.Version[] memory versions = s_registryManager.getAllVersions(1, 2);
+    assertEq(versions.length, 2);
+    assertEq(versions[0].contractAddress, address(s_mockContract1));
+    assertEq(versions[1].contractAddress, address(s_mockContract2));
   }
 
-  function test_WhenLimitExceedsMaximumPaginationLimit() external {
+  function test_WhenLimitExceedsMaximumPaginationLimit() external view {
     // it should return results up to MAX_PAGINATION_LIMIT
+    WorkflowRegistryManager.Version[] memory versions = s_registryManager.getAllVersions(1, 200);
+    assertEq(versions.length, 3);
+    assertEq(versions[0].contractAddress, address(s_mockContract1));
+    assertEq(versions[1].contractAddress, address(s_mockContract2));
+    assertEq(versions[2].contractAddress, address(s_mockContract3));
   }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersion.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersion.t.sol
index 7c38eb6f8a7..9ca2347d8a6 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersion.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersion.t.sol
@@ -1,12 +1,22 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-contract WorkflowRegistryManagergetLatestVersion {
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+
+contract WorkflowRegistryManager_getLatestVersion is WorkflowRegistryManagerSetup {
   function test_WhenNoVersionsHaveBeenRegistered() external {
-    // it should revert with NoActiveVersionAvailable
+    // it should revert with NoVersionsRegistered
+    vm.expectRevert(WorkflowRegistryManager.NoVersionsRegistered.selector);
+    s_registryManager.getLatestVersion();
   }
 
   function test_WhenVersionsHaveBeenRegistered() external {
     // it should return the latest registered version details
+    _deployMockRegistryAndAddVersion(true);
+    WorkflowRegistryManager.Version memory version = s_registryManager.getLatestVersion();
+    assertEq(version.contractAddress, address(s_mockWorkflowRegistryContract));
+    assertEq(version.chainID, s_chainID);
+    assertEq(version.deployedAt, s_deployedAt);
   }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersion.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersion.tree
index 42012a0962f..d5d674f3d93 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersion.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersion.tree
@@ -1,5 +1,5 @@
 WorkflowRegistryManager.getLatestVersion
 ├── when no versions have been registered
-│   └── it should revert with NoActiveVersionAvailable
+│   └── it should revert with NoVersionsRegistered
 └── when versions have been registered
     └── it should return the latest registered version details
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersionNumber.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersionNumber.t.sol
new file mode 100644
index 00000000000..4ac9afc6ea6
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersionNumber.t.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.24;
+
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+
+contract WorkflowRegistryManager_getLatestVersionNumber is WorkflowRegistryManagerSetup {
+  function test_WhenNoVersionsHaveBeenRegistered() external {
+    vm.expectRevert(WorkflowRegistryManager.NoVersionsRegistered.selector);
+    s_registryManager.getLatestVersionNumber();
+  }
+
+  function test_WhenVersionsHaveBeenRegistered() external {
+    _deployMockRegistryAndAddVersion(true);
+    uint32 latestVersionNumber = s_registryManager.getLatestVersionNumber();
+    assertEq(latestVersionNumber, 1);
+  }
+}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersionNumber.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersionNumber.tree
new file mode 100644
index 00000000000..6207f82f5be
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getLatestVersionNumber.tree
@@ -0,0 +1,5 @@
+WorkflowRegistryManager.getLatestVersionNumber
+├── when no versions have been registered
+│   └── it should revert with NoVersionsRegistered
+└── when versions have been registered
+    └── it should return the latest registered version number
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersion.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersion.t.sol
index 54b12211ca7..1c8ea44408f 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersion.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersion.t.sol
@@ -1,12 +1,23 @@
 // SPDX-License-Identifier: MIT
 pragma solidity 0.8.24;
 
-contract WorkflowRegistryManagergetVersion {
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+// import {MockWorkflowRegistryContract} from "../../mocks/MockWorkflowRegistryContract.sol";
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+
+contract WorkflowRegistryManager_getVersion is WorkflowRegistryManagerSetup {
   function test_WhenVersionNumberIsNotRegistered() external {
     // it should revert with VersionNotRegistered
+    vm.expectRevert(abi.encodeWithSelector(WorkflowRegistryManager.VersionNotRegistered.selector, 1));
+    s_registryManager.getVersion(1);
   }
 
   function test_WhenVersionNumberIsRegistered() external {
     // it should return the correct version details
+    _deployMockRegistryAndAddVersion(true);
+    WorkflowRegistryManager.Version memory version = s_registryManager.getVersion(1);
+    assertEq(version.contractAddress, address(s_mockWorkflowRegistryContract));
+    assertEq(version.chainID, s_chainID);
+    assertEq(version.deployedAt, s_deployedAt);
   }
 }
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumber.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumber.t.sol
deleted file mode 100644
index 05ed4c43fda..00000000000
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumber.t.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity 0.8.24;
-
-contract WorkflowRegistryManagergetVersionNumber {
-  function test_WhenTheContractAddressIsInvalid() external {
-    // it should revert with InvalidContractAddress
-  }
-
-  modifier whenTheContractAddressIsValid() {
-    _;
-  }
-
-  function test_WhenNoVersionIsRegisteredForTheContractAddressAndChainIDCombination()
-    external
-    whenTheContractAddressIsValid
-  {
-    // it should revert with NoVersionsRegistered
-  }
-
-  function test_WhenAVersionIsRegisteredForTheContractAddressAndChainIDCombination()
-    external
-    whenTheContractAddressIsValid
-  {
-    // it should return the correct version number
-  }
-}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID.t.sol
new file mode 100644
index 00000000000..a16ad878fc8
--- /dev/null
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID.t.sol
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.24;
+
+import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {WorkflowRegistryManagerSetup} from "./WorkflowRegistryManagerSetup.t.sol";
+
+contract WorkflowRegistryManager_getVersionNumberByContractAddressAndChainID is WorkflowRegistryManagerSetup {
+  function test_WhenTheContractAddressIsInvalid() external {
+    // It should revert with InvalidContractAddress
+    _deployMockRegistryAndAddVersion(true);
+    vm.expectRevert(abi.encodeWithSelector(WorkflowRegistryManager.InvalidContractAddress.selector, address(0)));
+    s_registryManager.getVersionNumberByContractAddressAndChainID(address(0), s_chainID);
+  }
+
+  // whenTheContractAddressIsValid
+  function test_WhenNoVersionIsRegisteredForTheContractAddressAndChainIDCombination() external {
+    // It should revert with NoVersionsRegistered.
+    _deployMockRegistryAndAddVersion(true);
+    vm.expectRevert(WorkflowRegistryManager.NoVersionsRegistered.selector);
+    s_registryManager.getVersionNumberByContractAddressAndChainID(address(s_mockWorkflowRegistryContract), 20);
+  }
+
+  // whenTheContractAddressIsValid
+  function test_WhenAVersionIsRegisteredForTheContractAddressAndChainIDCombination() external {
+    // It should return the correct version number.
+    _deployMockRegistryAndAddVersion(true);
+    uint32 versionNumber =
+      s_registryManager.getVersionNumberByContractAddressAndChainID(address(s_mockWorkflowRegistryContract), s_chainID);
+    assertEq(versionNumber, 1);
+  }
+}
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumber.tree b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID.tree
similarity index 87%
rename from contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumber.tree
rename to contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID.tree
index 361e6192724..09c06911ce3 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumber.tree
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID.tree
@@ -1,4 +1,4 @@
-WorkflowRegistryManager.getVersionNumber
+WorkflowRegistryManager.getVersionNumberByContractAddressAndChainID
 ├── when the contractAddress is invalid
 │   └── it should revert with InvalidContractAddress
 └── when the contractAddress is valid
diff --git a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManagerSetup.t.sol b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManagerSetup.t.sol
index c9e4a84da81..4e271aa5591 100644
--- a/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManagerSetup.t.sol
+++ b/contracts/src/v0.8/workflow/test/WorkflowRegistryManager/WorkflowRegistryManagerSetup.t.sol
@@ -2,27 +2,39 @@
 pragma solidity 0.8.24;
 
 import {WorkflowRegistryManager} from "../../dev/WorkflowRegistryManager.sol";
+import {MockWorkflowRegistryContract} from "../../mocks/MockWorkflowRegistryContract.sol";
 import {Test} from "forge-std/Test.sol";
 
 contract WorkflowRegistryManagerSetup is Test {
   WorkflowRegistryManager internal s_registryManager;
+  MockWorkflowRegistryContract internal s_mockWorkflowRegistryContract;
   address internal s_owner;
-  address internal s_nonOwner;
-  address internal s_contractAddress;
+  address internal s_stranger;
+  address internal s_invalidContractAddress;
   uint64 internal s_chainID;
-  uint32 internal s_versionNumber;
   uint32 internal s_deployedAt;
 
   function setUp() public virtual {
     s_owner = makeAddr("owner");
-    s_nonOwner = makeAddr("nonOwner");
-    s_contractAddress = makeAddr("contractAddress");
+    s_stranger = makeAddr("nonOwner");
+    s_invalidContractAddress = makeAddr("contractAddress");
     s_chainID = 1;
-    s_versionNumber = 1;
     s_deployedAt = uint32(block.timestamp);
 
     // Deploy the WorkflowRegistryManager contract
     vm.prank(s_owner);
     s_registryManager = new WorkflowRegistryManager();
   }
+
+  // Helper function to deploy the MockWorkflowRegistryContract and add it to the WorkflowRegistryManager
+  function _deployMockRegistryAndAddVersion(
+    bool activate
+  ) internal {
+    // Deploy the MockWorkflowRegistryContract contract
+    s_mockWorkflowRegistryContract = new MockWorkflowRegistryContract();
+
+    // Add the MockWorkflowRegistryContract to the WorkflowRegistryManager
+    vm.prank(s_owner);
+    s_registryManager.addVersion(address(s_mockWorkflowRegistryContract), s_chainID, s_deployedAt, activate);
+  }
 }
diff --git a/core/gethwrappers/workflow/generated/workflow_registry_wrapper/workflow_registry_wrapper.go b/core/gethwrappers/workflow/generated/workflow_registry_wrapper/workflow_registry_wrapper.go
index 008fffab28a..c87f59c0e7b 100644
--- a/core/gethwrappers/workflow/generated/workflow_registry_wrapper/workflow_registry_wrapper.go
+++ b/core/gethwrappers/workflow/generated/workflow_registry_wrapper/workflow_registry_wrapper.go
@@ -42,8 +42,8 @@ type WorkflowRegistryWorkflowMetadata struct {
 }
 
 var WorkflowRegistryMetaData = &bind.MetaData{
-	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"AddressNotAuthorized\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"CallerIsNotWorkflowOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"CannotTransferToSelf\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"}],\"name\":\"DONNotAllowed\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidWorkflowID\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"MustBeProposedOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableByOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OwnerCannotBeZero\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"RegistryLocked\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"providedLength\",\"type\":\"uint256\"},{\"internalType\":\"uint8\",\"name\":\"maxAllowedLength\",\"type\":\"uint8\"}],\"name\":\"URLTooLong\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowAlreadyInDesiredStatus\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowAlreadyRegistered\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowContentNotUpdated\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowDoesNotExist\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowIDAlreadyExists\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowIDNotUpdated\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"providedLength\",\"type\":\"uint256\"},{\"internalType\":\"uint8\",\"name\":\"maxAllowedLength\",\"type\":\"uint8\"}],\"name\":\"WorkflowNameTooLong\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint32[]\",\"name\":\"donIDs\",\"type\":\"uint32[]\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"}],\"name\":\"AllowedDONsUpdatedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"addresses\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"}],\"name\":\"AuthorizedAddressesUpdatedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"lockedBy\",\"type\":\"address\"}],\"name\":\"RegistryLockedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"unlockedBy\",\"type\":\"address\"}],\"name\":\"RegistryUnlockedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"WorkflowActivatedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"WorkflowDeletedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"secretsURLHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"WorkflowForceUpdateSecretsRequestedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"WorkflowPausedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"WorkflowRegisteredV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"oldWorkflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"newWorkflowID\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"WorkflowUpdatedV1\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"workflowKey\",\"type\":\"bytes32\"}],\"name\":\"activateWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"field\",\"type\":\"string\"}],\"name\":\"computeHashKey\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"workflowKey\",\"type\":\"bytes32\"}],\"name\":\"deleteWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAllowedDONs\",\"outputs\":[{\"internalType\":\"uint32[]\",\"name\":\"allowedDONs\",\"type\":\"uint32[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAuthorizedAddresses\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"authorizedAddresses\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"getWorkflowMetadata\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"internalType\":\"structWorkflowRegistry.WorkflowMetadata\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"uint256\",\"name\":\"start\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"limit\",\"type\":\"uint256\"}],\"name\":\"getWorkflowMetadataListByDON\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"internalType\":\"structWorkflowRegistry.WorkflowMetadata[]\",\"name\":\"workflowMetadataList\",\"type\":\"tuple[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"start\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"limit\",\"type\":\"uint256\"}],\"name\":\"getWorkflowMetadataListByOwner\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"internalType\":\"structWorkflowRegistry.WorkflowMetadata[]\",\"name\":\"workflowMetadataList\",\"type\":\"tuple[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"isRegistryLocked\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lockRegistry\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"workflowKey\",\"type\":\"bytes32\"}],\"name\":\"pauseWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"registerWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"requestForceUpdateSecrets\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"unlockRegistry\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32[]\",\"name\":\"donIDs\",\"type\":\"uint32[]\"},{\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"}],\"name\":\"updateAllowedDONs\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"addresses\",\"type\":\"address[]\"},{\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"}],\"name\":\"updateAuthorizedAddresses\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"workflowKey\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"newWorkflowID\",\"type\":\"bytes32\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"updateWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
-	Bin: "0x6080806040523461004a57331561003b57600180546001600160a01b03191633179055600a805460ff191690556040516133df90816100508239f35b639b15e16f60e01b8152600490fd5b600080fdfe6080604052600436101561001257600080fd5b60003560e01c806308e7f63a14612082578063181f5a7714611ff35780632303348a14611eb65780632b596f6d14611e2c5780633ccd14ff146114f2578063695e1340146113565780636f3517711461127d578063724c13dd146111865780637497066b1461106b57806379ba509714610f955780637ec0846d14610f0e5780638da5cb5b14610ebc5780639f4cb53414610e9b578063b87a019414610e45578063d4b89c7414610698578063db800092146105fd578063e3dce080146104d6578063e690f33214610362578063f2fde38b14610284578063f794bdeb146101495763f99ecb6b1461010357600080fd5b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457602060ff600a54166040519015158152f35b600080fd5b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760068054610185816123fc565b6101926040519182612283565b81815261019e826123fc565b916020937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe060208401940136853760005b82811061023257505050906040519283926020840190602085525180915260408401929160005b82811061020557505050500390f35b835173ffffffffffffffffffffffffffffffffffffffff16855286955093810193928101926001016101f6565b6001908260005273ffffffffffffffffffffffffffffffffffffffff817ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01541661027d828761252e565b52016101cf565b346101445760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610144576102bb61236a565b6102c3612bc7565b73ffffffffffffffffffffffffffffffffffffffff8091169033821461033857817fffffffffffffffffffffffff00000000000000000000000000000000000000006000541617600055600154167fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae1278600080a3005b60046040517fdad89dca000000000000000000000000000000000000000000000000000000008152fd5b346101445760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760ff600a54166104ac576103a760043533612dad565b600181019081549160ff8360c01c16600281101561047d576001146104535778010000000000000000000000000000000000000000000000007fffffffffffffff00ffffffffffffffffffffffffffffffffffffffffffffffff841617905580547f6a0ed88e9cf3cb493ab4028fcb1dc7d18f0130fcdfba096edde0aadbfbf5e99f63ffffffff604051946020865260a01c16938061044e339560026020840191016125d0565b0390a4005b60046040517f6f861db1000000000000000000000000000000000000000000000000000000008152fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60046040517f78a4e7d9000000000000000000000000000000000000000000000000000000008152fd5b34610144576104e4366122f2565b916104ed612bc7565b60ff600a54166104ac5760005b828110610589575060405191806040840160408552526060830191906000905b8082106105515785151560208601527f509460cccbb176edde6cac28895a4415a24961b8f3a0bd2617b9bb7b4e166c9b85850386a1005b90919283359073ffffffffffffffffffffffffffffffffffffffff82168092036101445760019181526020809101940192019061051a565b60019084156105cb576105c373ffffffffffffffffffffffffffffffffffffffff6105bd6105b8848888612a67565b612ba6565b16612f88565b505b016104fa565b6105f773ffffffffffffffffffffffffffffffffffffffff6105f16105b8848888612a67565b166131b9565b506105c5565b346101445761061d61060e3661238d565b91610617612414565b50612a88565b6000526004602052604060002073ffffffffffffffffffffffffffffffffffffffff6001820154161561066e5761065661066a91612684565b604051918291602083526020830190612140565b0390f35b60046040517f871e01b2000000000000000000000000000000000000000000000000000000008152fd5b346101445760a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760443567ffffffffffffffff8111610144576106e79036906004016122c4565b9060643567ffffffffffffffff8111610144576107089036906004016122c4565b9160843567ffffffffffffffff8111610144576107299036906004016122c4565b60ff600a94929454166104ac57610744818688602435612cbc565b61075060043533612dad565b9163ffffffff600184015460a01c169561076a3388612c12565b8354946024358614610e1b576107a56040516107948161078d8160038b016125d0565b0382612283565b61079f368c85612838565b90612e1c565b6107c76040516107bc8161078d8160048c016125d0565b61079f368688612838565b6107e96040516107de8161078d8160058d016125d0565b61079f36898d612838565b918080610e14575b80610e0d575b610de357602435885515610c8e575b15610b3d575b15610890575b926108807f41161473ce2ed633d9f902aab9702d16a5531da27ec84e1939abeffe54ad7353959361044e93610872610864978d604051998a996024358b5260a060208c0152600260a08c0191016125d0565b9189830360408b01526128fb565b9186830360608801526128fb565b90838203608085015233976128fb565b61089d600586015461257d565b610ad6575b67ffffffffffffffff8411610aa7576108cb846108c2600588015461257d565b600588016128b4565b6000601f85116001146109a757928492610872610880938a9b9c61094f876108649b9a61044e9a7f41161473ce2ed633d9f902aab9702d16a5531da27ec84e1939abeffe54ad73539e9f60009261099c575b50507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b60058a01555b8c8780610972575b50509c9b9a9950935050929495509250610812565b61097c9133612a88565b60005260056020526109946004356040600020612fda565b508c8761095d565b013590508f8061091d565b9860058601600052602060002060005b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe087168110610a8f5750926108726108809361044e969388968c7f41161473ce2ed633d9f902aab9702d16a5531da27ec84e1939abeffe54ad73539c9d9e9f897fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06108649e9d1610610a57575b505050600187811b0160058a0155610955565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88b60031b161c199101351690558e8d81610a44565b898c0135825560209b8c019b600190920191016109b7565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040516020810190610b1c81610af060058a01338661293a565b037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08101835282612283565b5190206000526005602052610b376004356040600020613280565b506108a2565b67ffffffffffffffff8311610aa757610b6683610b5d600489015461257d565b600489016128b4565b600083601f8111600114610bc75780610bb292600091610bbc575b507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b600487015561080c565b90508601358d610b81565b506004870160005260206000209060005b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe086168110610c765750847fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0811610610c3e575b5050600183811b01600487015561080c565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88660031b161c19908601351690558a80610c2c565b9091602060018192858a013581550193019101610bd8565b67ffffffffffffffff8b11610aa757610cb78b610cae60038a015461257d565b60038a016128b4565b60008b601f8111600114610d175780610d0292600091610d0c57507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b6003880155610806565b90508501358e610b81565b506003880160005260206000209060005b8d7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081168210610dca578091507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0811610610d91575b905060018092501b016003880155610806565b60f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9160031b161c19908501351690558b808c610d7e565b5085820135835560019092019160209182019101610d28565b60046040517f6b4a810d000000000000000000000000000000000000000000000000000000008152fd5b50826107f7565b50816107f1565b60046040517f95406722000000000000000000000000000000000000000000000000000000008152fd5b346101445760607ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445761066a610e8f610e8261236a565b6044359060243590612ae3565b604051918291826121e4565b34610144576020610eb4610eae3661238d565b91612a88565b604051908152f35b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457602073ffffffffffffffffffffffffffffffffffffffff60015416604051908152f35b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457610f45612bc7565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00600a5416600a55337f11a03e25ee25bf1459f9e1cb293ea03707d84917f54a65e32c9a7be2f2edd68a600080a2005b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760005473ffffffffffffffffffffffffffffffffffffffff808216330361104157600154917fffffffffffffffffffffffff0000000000000000000000000000000000000000903382851617600155166000553391167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3005b60046040517f02b543c6000000000000000000000000000000000000000000000000000000008152fd5b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457600880546110a7816123fc565b6110b46040519182612283565b8181526110c0826123fc565b916020937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe060208401940136853760005b82811061114457505050906040519283926020840190602085525180915260408401929160005b82811061112757505050500390f35b835163ffffffff1685528695509381019392810192600101611118565b6001908260005263ffffffff817ff3f7a9fe364faab93b216da50a3214154f22a0a2b415b23a84c8169e8b636ee301541661117f828761252e565b52016110f1565b3461014457611194366122f2565b9161119d612bc7565b60ff600a54166104ac5760005b828110611229575060405191806040840160408552526060830191906000905b8082106112015785151560208601527fcab63bf31d1e656baa23cebef64e12033ea0ffbd44b1278c3747beec2d2f618c85850386a1005b90919283359063ffffffff8216809203610144576001918152602080910194019201906111ca565b600190841561125b5761125363ffffffff61124d611248848888612a67565b612a77565b16612ecf565b505b016111aa565b61127763ffffffff611271611248848888612a67565b16613066565b50611255565b346101445760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760ff600a54166104ac576112c260043533612dad565b600181019081549163ffffffff8360a01c169260ff8160c01c16600281101561047d5715610453577fffffffffffffff00ffffffffffffffffffffffffffffffffffffffffffffffff906113163386612c12565b16905580547f17b2d730bb5e064df3fbc6165c8aceb3b0d62c524c196c0bc1012209280bc9a6604051602081528061044e339560026020840191016125d0565b34610144576020807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610144576004359060ff600a54166104ac5761139e8233612dad565b63ffffffff600182015460a01c16926113c4336000526007602052604060002054151590565b156114c25733600052600283526113df816040600020613280565b5083600052600383526113f6816040600020613280565b5060058201611405815461257d565b61148e575b506000526004825261145160056040600020600081556000600182015561143360028201612a1e565b61143f60038201612a1e565b61144b60048201612a1e565b01612a1e565b7f76ee2dfcae10cb8522e62e713e62660e09ecfaab08db15d9404de1914132257161044e82549260405191829186835260023397840191016125d0565b6040516114a381610af087820194338661293a565b519020600052600583526114bb816040600020613280565b508461140a565b60246040517f85982a00000000000000000000000000000000000000000000000000000000008152336004820152fd5b346101445760e07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760043567ffffffffffffffff8111610144576115419036906004016122c4565b6044359163ffffffff8316830361014457600260643510156101445760843567ffffffffffffffff81116101445761157d9036906004016122c4565b91909260a43567ffffffffffffffff8111610144576115a09036906004016122c4565b60c43567ffffffffffffffff8111610144576115c09036906004016122c4565b96909560ff600a54166104ac576115d7338a612c12565b60408511611df4576115ed888483602435612cbc565b6115f8858733612a88565b80600052600460205273ffffffffffffffffffffffffffffffffffffffff60016040600020015416611dca576040519061163182612266565b602435825233602083015263ffffffff8b16604083015261165760643560608401612571565b61166236888a612838565b6080830152611672368486612838565b60a0830152611682368688612838565b60c0830152611692368b8b612838565b60e0830152806000526004602052604060002091805183556001830173ffffffffffffffffffffffffffffffffffffffff60208301511681549077ffffffff0000000000000000000000000000000000000000604085015160a01b16906060850151600281101561047d5778ff0000000000000000000000000000000000000000000000007fffffffffffffff000000000000000000000000000000000000000000000000009160c01b1693161717179055608081015180519067ffffffffffffffff8211610aa7576117758261176c600288015461257d565b600288016128b4565b602090601f8311600114611cfe576117c2929160009183611c275750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b60028401555b60a081015180519067ffffffffffffffff8211610aa7576117f9826117f0600388015461257d565b600388016128b4565b602090601f8311600114611c3257611846929160009183611c275750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b60038401555b60c081015180519067ffffffffffffffff8211610aa75761187d82611874600488015461257d565b600488016128b4565b602090601f8311600114611b5a5791806118ce9260e09594600092611a355750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b60048501555b015180519267ffffffffffffffff8411610aa757838d926119068e966118fd600586015461257d565b600586016128b4565b602090601f8311600114611a40579463ffffffff61087295819a957fc4399022965bad9b2b468bbd8c758a7e80cdde36ff3088ddbb7f93bdfb5623cb9f9e9d99946119928761044e9f9b986005936119f69f9a600092611a355750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b9101555b3360005260026020526119ad836040600020612fda565b501660005260036020526119c5816040600020612fda565b508d82611a0c575b5050506108646040519a8b9a6119e58c6064356120d5565b60a060208d015260a08c01916128fb565b97838903608085015216963396602435966128fb565b611a2c92611a1a9133612a88565b60005260056020526040600020612fda565b508c8f8d6119cd565b01519050388061091d565b906005840160005260206000209160005b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe085168110611b3057506108729563ffffffff9a957fc4399022965bad9b2b468bbd8c758a7e80cdde36ff3088ddbb7f93bdfb5623cb9f9e9d999460018761044e9f9b96928f96936119f69f9a94837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06005971610611af9575b505050811b01910155611996565b01517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88460031b161c19169055388080611aeb565b939550918194969750600160209291839285015181550194019201918f9492918f97969492611a51565b906004860160005260206000209160005b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe085168110611c0f5750918391600193837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe060e098971610611bd8575b505050811b0160048501556118d4565b01517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88460031b161c191690558f8080611bc8565b91926020600181928685015181550194019201611b6b565b015190508f8061091d565b9190600386016000526020600020906000935b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe084168510611ce35760019450837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0811610611cac575b505050811b01600384015561184c565b01517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88460031b161c191690558e8080611c9c565b81810151835560209485019460019093019290910190611c45565b9190600286016000526020600020906000935b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe084168510611daf5760019450837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0811610611d78575b505050811b0160028401556117c8565b01517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88460031b161c191690558e8080611d68565b81810151835560209485019460019093019290910190611d11565b60046040517fa0677dd0000000000000000000000000000000000000000000000000000000008152fd5b604485604051907f36a7c503000000000000000000000000000000000000000000000000000000008252600482015260406024820152fd5b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457611e63612bc7565b60017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00600a541617600a55337f2789711f6fd67d131ad68378617b5d1d21a2c92b34d7c3745d70b3957c08096c600080a2005b34610144576020807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760043567ffffffffffffffff811161014457611f069036906004016122c4565b60ff600a54166104ac57611f1a9133612a88565b90816000526005602052604060002091825491821561066e5760005b838110611f3f57005b80611f4c60019287612eb7565b90549060031b1c60005260048352604060002063ffffffff8382015460a01c1660005260098452604060002054151580611fd6575b611f8d575b5001611f36565b7f95d94f817db4971aa99ba35d0fe019bd8cc39866fbe02b6d47b5f0f3727fb67360405186815260408682015280611fcd339460026040840191016125d0565b0390a286611f86565b50611fee336000526007602052604060002054151590565b611f81565b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457604051604081019080821067ffffffffffffffff831117610aa75761066a91604052601a81527f576f726b666c6f77526567697374727920312e302e302d64657600000000000060208201526040519182916020835260208301906120e2565b346101445760607ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760043563ffffffff8116810361014457610e8f61066a916044359060243590612743565b90600282101561047d5752565b919082519283825260005b84811061212c5750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8460006020809697860101520116010190565b6020818301810151848301820152016120ed565b6121e19160e06121d06121be6121ac6101008651865273ffffffffffffffffffffffffffffffffffffffff602088015116602087015263ffffffff6040880151166040870152612198606088015160608801906120d5565b6080870151908060808801528601906120e2565b60a086015185820360a08701526120e2565b60c085015184820360c08601526120e2565b9201519060e08184039101526120e2565b90565b6020808201906020835283518092526040830192602060408460051b8301019501936000915b84831061221a5750505050505090565b9091929394958480612256837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc086600196030187528a51612140565b980193019301919493929061220a565b610100810190811067ffffffffffffffff821117610aa757604052565b90601f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0910116810190811067ffffffffffffffff821117610aa757604052565b9181601f840112156101445782359167ffffffffffffffff8311610144576020838186019501011161014457565b9060407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc8301126101445760043567ffffffffffffffff9283821161014457806023830112156101445781600401359384116101445760248460051b8301011161014457602401919060243580151581036101445790565b6004359073ffffffffffffffffffffffffffffffffffffffff8216820361014457565b9060407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc8301126101445760043573ffffffffffffffffffffffffffffffffffffffff8116810361014457916024359067ffffffffffffffff8211610144576123f8916004016122c4565b9091565b67ffffffffffffffff8111610aa75760051b60200190565b6040519061242182612266565b606060e0836000815260006020820152600060408201526000838201528260808201528260a08201528260c08201520152565b6040516020810181811067ffffffffffffffff821117610aa7576040526000815290565b90612482826123fc565b61248f6040519182612283565b8281527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06124bd82946123fc565b019060005b8281106124ce57505050565b6020906124d9612414565b828285010152016124c2565b919082018092116124f257565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b919082039182116124f257565b80518210156125425760209160051b010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600282101561047d5752565b90600182811c921680156125c6575b602083101461259757565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b91607f169161258c565b8054600093926125df8261257d565b918282526020936001916001811690816000146126475750600114612606575b5050505050565b90939495506000929192528360002092846000945b838610612633575050505001019038808080806125ff565b80548587018301529401938590820161261b565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00168685015250505090151560051b0101915038808080806125ff565b90600560e060409361273f85519161269b83612266565b6127388397825485526126e560ff600185015473ffffffffffffffffffffffffffffffffffffffff8116602089015263ffffffff8160a01c168489015260c01c1660608701612571565b80516126f88161078d81600288016125d0565b608086015280516127108161078d81600388016125d0565b60a086015280516127288161078d81600488016125d0565b60c08601525180968193016125d0565b0384612283565b0152565b63ffffffff16916000838152600360209060036020526040936040842054908187101561282857612797918160648993118015612820575b612818575b8161278b82856124e5565b11156128085750612521565b946127a186612478565b96845b8781106127b657505050505050505090565b6001908287528486526127d58888206127cf83876124e5565b90612eb7565b905490861b1c8752600486526127ec888820612684565b6127f6828c61252e565b52612801818b61252e565b50016127a4565b6128139150826124e5565b612521565b506064612780565b50801561277b565b50505050505050506121e1612454565b92919267ffffffffffffffff8211610aa7576040519161288060207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8401160184612283565b829481845281830111610144578281602093846000960137010152565b8181106128a8575050565b6000815560010161289d565b9190601f81116128c357505050565b6128ef926000526020600020906020601f840160051c830193106128f1575b601f0160051c019061289d565b565b90915081906128e2565b601f82602094937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0938186528686013760008582860101520116010190565b91907fffffffffffffffffffffffffffffffffffffffff0000000000000000000000009060601b1682526014906000928154926129768461257d565b926001946001811690816000146129dd5750600114612998575b505050505090565b9091929395945060005260209460206000206000905b8582106129ca5750505050601492935001013880808080612990565b80548583018501529087019082016129ae565b92505050601494507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0091935016838301528015150201013880808080612990565b612a28815461257d565b9081612a32575050565b81601f60009311600114612a44575055565b908083918252612a63601f60208420940160051c84016001850161289d565b5555565b91908110156125425760051b0190565b3563ffffffff811681036101445790565b91906034612add91836040519485927fffffffffffffffffffffffffffffffffffffffff000000000000000000000000602085019860601b168852848401378101600083820152036014810184520182612283565b51902090565b73ffffffffffffffffffffffffffffffffffffffff1691600083815260029260209060026020526040936040842054908183101561282857612b3a91816064859311801561282057612818578161278b82856124e5565b94612b4486612478565b96845b878110612b5957505050505050505090565b600190828752838652612b728888206127cf83886124e5565b90549060031b1c875260048652612b8a888820612684565b612b94828c61252e565b52612b9f818b61252e565b5001612b47565b3573ffffffffffffffffffffffffffffffffffffffff811681036101445790565b73ffffffffffffffffffffffffffffffffffffffff600154163303612be857565b60046040517f2b5c74de000000000000000000000000000000000000000000000000000000008152fd5b63ffffffff1680600052600960205260406000205415612c8b575073ffffffffffffffffffffffffffffffffffffffff1680600052600760205260406000205415612c5a5750565b602490604051907f85982a000000000000000000000000000000000000000000000000000000000082526004820152fd5b602490604051907f8fe6d7e10000000000000000000000000000000000000000000000000000000082526004820152fd5b91909115612d835760c891828111612d4d5750818111612d185750808211612ce2575050565b60449250604051917ecd56a800000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b604491604051917ecd56a800000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b60449083604051917ecd56a800000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b60046040517f7dc2f4e1000000000000000000000000000000000000000000000000000000008152fd5b90600052600460205260406000209073ffffffffffffffffffffffffffffffffffffffff8060018401541691821561066e5716809103612deb575090565b602490604051907f31ee6dc70000000000000000000000000000000000000000000000000000000082526004820152fd5b9081518151908181149384612e33575b5050505090565b6020929394508201209201201438808080612e2c565b6008548110156125425760086000527ff3f7a9fe364faab93b216da50a3214154f22a0a2b415b23a84c8169e8b636ee30190600090565b6006548110156125425760066000527ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600090565b80548210156125425760005260206000200190600090565b600081815260096020526040812054612f835760085468010000000000000000811015612f56579082612f42612f0d84600160409601600855612e49565b81939154907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9060031b92831b921b19161790565b905560085492815260096020522055600190565b6024827f4e487b710000000000000000000000000000000000000000000000000000000081526041600452fd5b905090565b600081815260076020526040812054612f835760065468010000000000000000811015612f56579082612fc6612f0d84600160409601600655612e80565b905560065492815260076020522055600190565b9190600183016000908282528060205260408220541560001461306057845494680100000000000000008610156130335783613023612f0d886001604098999a01855584612eb7565b9055549382526020522055600190565b6024837f4e487b710000000000000000000000000000000000000000000000000000000081526041600452fd5b50925050565b60008181526009602052604081205490919080156131b4577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90818101818111613187576008549083820191821161315a57818103613126575b50505060085480156130f9578101906130d882612e49565b909182549160031b1b19169055600855815260096020526040812055600190565b6024847f4e487b710000000000000000000000000000000000000000000000000000000081526031600452fd5b613144613135612f0d93612e49565b90549060031b1c928392612e49565b90558452600960205260408420553880806130c0565b6024867f4e487b710000000000000000000000000000000000000000000000000000000081526011600452fd5b6024857f4e487b710000000000000000000000000000000000000000000000000000000081526011600452fd5b505090565b60008181526007602052604081205490919080156131b4577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff90818101818111613187576006549083820191821161315a5781810361324c575b50505060065480156130f95781019061322b82612e80565b909182549160031b1b19169055600655815260076020526040812055600190565b61326a61325b612f0d93612e80565b90549060031b1c928392612e80565b9055845260076020526040842055388080613213565b90600182019060009281845282602052604084205490811515600014612e2c577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff918281018181116133a55782549084820191821161337857818103613343575b50505080548015613316578201916132f98383612eb7565b909182549160031b1b191690555582526020526040812055600190565b6024867f4e487b710000000000000000000000000000000000000000000000000000000081526031600452fd5b613363613353612f0d9386612eb7565b90549060031b1c92839286612eb7565b905586528460205260408620553880806132e1565b6024887f4e487b710000000000000000000000000000000000000000000000000000000081526011600452fd5b6024877f4e487b710000000000000000000000000000000000000000000000000000000081526011600452fdfea164736f6c6343000818000a",
+	ABI: "[{\"inputs\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"AddressNotAuthorized\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"caller\",\"type\":\"address\"}],\"name\":\"CallerIsNotWorkflowOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"CannotTransferToSelf\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"}],\"name\":\"DONNotAllowed\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"InvalidWorkflowID\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"MustBeProposedOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OnlyCallableByOwner\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"OwnerCannotBeZero\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"RegistryLocked\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"providedLength\",\"type\":\"uint256\"},{\"internalType\":\"uint8\",\"name\":\"maxAllowedLength\",\"type\":\"uint8\"}],\"name\":\"URLTooLong\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowAlreadyInDesiredStatus\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowAlreadyRegistered\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowContentNotUpdated\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowDoesNotExist\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowIDAlreadyExists\",\"type\":\"error\"},{\"inputs\":[],\"name\":\"WorkflowIDNotUpdated\",\"type\":\"error\"},{\"inputs\":[{\"internalType\":\"uint256\",\"name\":\"providedLength\",\"type\":\"uint256\"},{\"internalType\":\"uint8\",\"name\":\"maxAllowedLength\",\"type\":\"uint8\"}],\"name\":\"WorkflowNameTooLong\",\"type\":\"error\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"uint32[]\",\"name\":\"donIDs\",\"type\":\"uint32[]\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"}],\"name\":\"AllowedDONsUpdatedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address[]\",\"name\":\"addresses\",\"type\":\"address[]\"},{\"indexed\":false,\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"}],\"name\":\"AuthorizedAddressesUpdatedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferRequested\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"lockedBy\",\"type\":\"address\"}],\"name\":\"RegistryLockedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":false,\"internalType\":\"address\",\"name\":\"unlockedBy\",\"type\":\"address\"}],\"name\":\"RegistryUnlockedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"WorkflowActivatedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"WorkflowDeletedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"secretsURLHash\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"WorkflowForceUpdateSecretsRequestedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"WorkflowPausedV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"WorkflowRegisteredV1\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"oldWorkflowID\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"indexed\":false,\"internalType\":\"bytes32\",\"name\":\"newWorkflowID\",\"type\":\"bytes32\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"indexed\":false,\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"WorkflowUpdatedV1\",\"type\":\"event\"},{\"inputs\":[],\"name\":\"acceptOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"workflowKey\",\"type\":\"bytes32\"}],\"name\":\"activateWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"field\",\"type\":\"string\"}],\"name\":\"computeHashKey\",\"outputs\":[{\"internalType\":\"bytes32\",\"name\":\"\",\"type\":\"bytes32\"}],\"stateMutability\":\"pure\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"workflowKey\",\"type\":\"bytes32\"}],\"name\":\"deleteWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAllowedDONs\",\"outputs\":[{\"internalType\":\"uint32[]\",\"name\":\"allowedDONs\",\"type\":\"uint32[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"getAllAuthorizedAddresses\",\"outputs\":[{\"internalType\":\"address[]\",\"name\":\"authorizedAddresses\",\"type\":\"address[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"}],\"name\":\"getWorkflowMetadata\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"internalType\":\"structWorkflowRegistry.WorkflowMetadata\",\"name\":\"\",\"type\":\"tuple\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"uint256\",\"name\":\"start\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"limit\",\"type\":\"uint256\"}],\"name\":\"getWorkflowMetadataListByDON\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"internalType\":\"structWorkflowRegistry.WorkflowMetadata[]\",\"name\":\"workflowMetadataList\",\"type\":\"tuple[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"workflowOwner\",\"type\":\"address\"},{\"internalType\":\"uint256\",\"name\":\"start\",\"type\":\"uint256\"},{\"internalType\":\"uint256\",\"name\":\"limit\",\"type\":\"uint256\"}],\"name\":\"getWorkflowMetadataListByOwner\",\"outputs\":[{\"components\":[{\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"internalType\":\"address\",\"name\":\"owner\",\"type\":\"address\"},{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"internalType\":\"structWorkflowRegistry.WorkflowMetadata[]\",\"name\":\"workflowMetadataList\",\"type\":\"tuple[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"isRegistryLocked\",\"outputs\":[{\"internalType\":\"bool\",\"name\":\"\",\"type\":\"bool\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"lockRegistry\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"owner\",\"outputs\":[{\"internalType\":\"address\",\"name\":\"\",\"type\":\"address\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"workflowKey\",\"type\":\"bytes32\"}],\"name\":\"pauseWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"workflowName\",\"type\":\"string\"},{\"internalType\":\"bytes32\",\"name\":\"workflowID\",\"type\":\"bytes32\"},{\"internalType\":\"uint32\",\"name\":\"donID\",\"type\":\"uint32\"},{\"internalType\":\"enumWorkflowRegistry.WorkflowStatus\",\"name\":\"status\",\"type\":\"uint8\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"registerWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"requestForceUpdateSecrets\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"}],\"name\":\"transferOwnership\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"typeAndVersion\",\"outputs\":[{\"internalType\":\"string\",\"name\":\"\",\"type\":\"string\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"unlockRegistry\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"uint32[]\",\"name\":\"donIDs\",\"type\":\"uint32[]\"},{\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"}],\"name\":\"updateAllowedDONs\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"address[]\",\"name\":\"addresses\",\"type\":\"address[]\"},{\"internalType\":\"bool\",\"name\":\"allowed\",\"type\":\"bool\"}],\"name\":\"updateAuthorizedAddresses\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"workflowKey\",\"type\":\"bytes32\"},{\"internalType\":\"bytes32\",\"name\":\"newWorkflowID\",\"type\":\"bytes32\"},{\"internalType\":\"string\",\"name\":\"binaryURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"configURL\",\"type\":\"string\"},{\"internalType\":\"string\",\"name\":\"secretsURL\",\"type\":\"string\"}],\"name\":\"updateWorkflow\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]",
+	Bin: "0x6080806040523461004a57331561003b57600180546001600160a01b03191633179055600a805460ff191690556040516133f390816100508239f35b639b15e16f60e01b8152600490fd5b600080fdfe6080604052600436101561001257600080fd5b60003560e01c806308e7f63a14612096578063181f5a77146120075780632303348a14611eca5780632b596f6d14611e3c5780633ccd14ff14611502578063695e13401461135a5780636f35177114611281578063724c13dd1461118a5780637497066b1461106f57806379ba509714610f995780637ec0846d14610f0e5780638da5cb5b14610ebc5780639f4cb53414610e9b578063b87a019414610e45578063d4b89c7414610698578063db800092146105fd578063e3dce080146104d6578063e690f33214610362578063f2fde38b14610284578063f794bdeb146101495763f99ecb6b1461010357600080fd5b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457602060ff600a54166040519015158152f35b600080fd5b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610144576006805461018581612410565b6101926040519182612297565b81815261019e82612410565b916020937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe060208401940136853760005b82811061023257505050906040519283926020840190602085525180915260408401929160005b82811061020557505050500390f35b835173ffffffffffffffffffffffffffffffffffffffff16855286955093810193928101926001016101f6565b6001908260005273ffffffffffffffffffffffffffffffffffffffff817ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01541661027d8287612542565b52016101cf565b346101445760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610144576102bb61237e565b6102c3612bdb565b73ffffffffffffffffffffffffffffffffffffffff8091169033821461033857817fffffffffffffffffffffffff00000000000000000000000000000000000000006000541617600055600154167fed8889f560326eb138920d842192f0eb3dd22b4f139c87a2c57538e05bae1278600080a3005b60046040517fdad89dca000000000000000000000000000000000000000000000000000000008152fd5b346101445760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760ff600a54166104ac576103a760043533612dc1565b600181019081549160ff8360c01c16600281101561047d576001146104535778010000000000000000000000000000000000000000000000007fffffffffffffff00ffffffffffffffffffffffffffffffffffffffffffffffff841617905580547f6a0ed88e9cf3cb493ab4028fcb1dc7d18f0130fcdfba096edde0aadbfbf5e99f63ffffffff604051946020865260a01c16938061044e339560026020840191016125e4565b0390a4005b60046040517f6f861db1000000000000000000000000000000000000000000000000000000008152fd5b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602160045260246000fd5b60046040517f78a4e7d9000000000000000000000000000000000000000000000000000000008152fd5b34610144576104e436612306565b916104ed612bdb565b60ff600a54166104ac5760005b828110610589575060405191806040840160408552526060830191906000905b8082106105515785151560208601527f509460cccbb176edde6cac28895a4415a24961b8f3a0bd2617b9bb7b4e166c9b85850386a1005b90919283359073ffffffffffffffffffffffffffffffffffffffff82168092036101445760019181526020809101940192019061051a565b60019084156105cb576105c373ffffffffffffffffffffffffffffffffffffffff6105bd6105b8848888612a7b565b612bba565b16612f9c565b505b016104fa565b6105f773ffffffffffffffffffffffffffffffffffffffff6105f16105b8848888612a7b565b166131cd565b506105c5565b346101445761061d61060e366123a1565b91610617612428565b50612a9c565b6000526004602052604060002073ffffffffffffffffffffffffffffffffffffffff6001820154161561066e5761065661066a91612698565b604051918291602083526020830190612154565b0390f35b60046040517f871e01b2000000000000000000000000000000000000000000000000000000008152fd5b346101445760a07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760443567ffffffffffffffff8111610144576106e79036906004016122d8565b9060643567ffffffffffffffff8111610144576107089036906004016122d8565b9160843567ffffffffffffffff8111610144576107299036906004016122d8565b60ff600a94929454166104ac57610744818688602435612cd0565b61075060043533612dc1565b9163ffffffff600184015460a01c169561076a3388612c26565b8354946024358614610e1b576107a56040516107948161078d8160038b016125e4565b0382612297565b61079f368c8561284c565b90612e30565b6107c76040516107bc8161078d8160048c016125e4565b61079f36868861284c565b6107e96040516107de8161078d8160058d016125e4565b61079f36898d61284c565b918080610e14575b80610e0d575b610de357602435885515610c8e575b15610b3d575b15610890575b926108807f41161473ce2ed633d9f902aab9702d16a5531da27ec84e1939abeffe54ad7353959361044e93610872610864978d604051998a996024358b5260a060208c0152600260a08c0191016125e4565b9189830360408b015261290f565b91868303606088015261290f565b908382036080850152339761290f565b61089d6005860154612591565b610ad6575b67ffffffffffffffff8411610aa7576108cb846108c26005880154612591565b600588016128c8565b6000601f85116001146109a757928492610872610880938a9b9c61094f876108649b9a61044e9a7f41161473ce2ed633d9f902aab9702d16a5531da27ec84e1939abeffe54ad73539e9f60009261099c575b50507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b60058a01555b8c8780610972575b50509c9b9a9950935050929495509250610812565b61097c9133612a9c565b60005260056020526109946004356040600020612fee565b508c8761095d565b013590508f8061091d565b9860058601600052602060002060005b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe087168110610a8f5750926108726108809361044e969388968c7f41161473ce2ed633d9f902aab9702d16a5531da27ec84e1939abeffe54ad73539c9d9e9f897fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06108649e9d1610610a57575b505050600187811b0160058a0155610955565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88b60031b161c199101351690558e8d81610a44565b898c0135825560209b8c019b600190920191016109b7565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b6040516020810190610b1c81610af060058a01338661294e565b037fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe08101835282612297565b5190206000526005602052610b376004356040600020613294565b506108a2565b67ffffffffffffffff8311610aa757610b6683610b5d6004890154612591565b600489016128c8565b600083601f8111600114610bc75780610bb292600091610bbc575b507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b600487015561080c565b90508601358d610b81565b506004870160005260206000209060005b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe086168110610c765750847fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0811610610c3e575b5050600183811b01600487015561080c565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88660031b161c19908601351690558a80610c2c565b9091602060018192858a013581550193019101610bd8565b67ffffffffffffffff8b11610aa757610cb78b610cae60038a0154612591565b60038a016128c8565b60008b601f8111600114610d175780610d0292600091610d0c57507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b6003880155610806565b90508501358e610b81565b506003880160005260206000209060005b8d7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe081168210610dca578091507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0811610610d91575b905060018092501b016003880155610806565b60f87fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9160031b161c19908501351690558b808c610d7e565b5085820135835560019092019160209182019101610d28565b60046040517f6b4a810d000000000000000000000000000000000000000000000000000000008152fd5b50826107f7565b50816107f1565b60046040517f95406722000000000000000000000000000000000000000000000000000000008152fd5b346101445760607ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445761066a610e8f610e8261237e565b6044359060243590612af7565b604051918291826121f8565b34610144576020610eb4610eae366123a1565b91612a9c565b604051908152f35b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457602073ffffffffffffffffffffffffffffffffffffffff60015416604051908152f35b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457610f45612bdb565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00600a5416600a557f11a03e25ee25bf1459f9e1cb293ea03707d84917f54a65e32c9a7be2f2edd68a6020604051338152a1005b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760005473ffffffffffffffffffffffffffffffffffffffff808216330361104557600154917fffffffffffffffffffffffff0000000000000000000000000000000000000000903382851617600155166000553391167f8be0079c531659141344cd1fd0a4f28419497f9722a3daafe3b4186f6b6457e0600080a3005b60046040517f02b543c6000000000000000000000000000000000000000000000000000000008152fd5b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457600880546110ab81612410565b6110b86040519182612297565b8181526110c482612410565b916020937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe060208401940136853760005b82811061114857505050906040519283926020840190602085525180915260408401929160005b82811061112b57505050500390f35b835163ffffffff168552869550938101939281019260010161111c565b6001908260005263ffffffff817ff3f7a9fe364faab93b216da50a3214154f22a0a2b415b23a84c8169e8b636ee30154166111838287612542565b52016110f5565b346101445761119836612306565b916111a1612bdb565b60ff600a54166104ac5760005b82811061122d575060405191806040840160408552526060830191906000905b8082106112055785151560208601527fcab63bf31d1e656baa23cebef64e12033ea0ffbd44b1278c3747beec2d2f618c85850386a1005b90919283359063ffffffff8216809203610144576001918152602080910194019201906111ce565b600190841561125f5761125763ffffffff61125161124c848888612a7b565b612a8b565b16612ee3565b505b016111ae565b61127b63ffffffff61127561124c848888612a7b565b1661307a565b50611259565b346101445760207ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760ff600a54166104ac576112c660043533612dc1565b600181019081549163ffffffff8360a01c169260ff8160c01c16600281101561047d5715610453577fffffffffffffff00ffffffffffffffffffffffffffffffffffffffffffffffff9061131a3386612c26565b16905580547f17b2d730bb5e064df3fbc6165c8aceb3b0d62c524c196c0bc1012209280bc9a6604051602081528061044e339560026020840191016125e4565b34610144576020807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc360112610144576004359060ff600a54166104ac576113a28233612dc1565b916113ba336000526007602052604060002054151590565b156114d25760049233600052600283526113d8826040600020613294565b50600181019063ffffffff80835460a01c16600052600385526113ff846040600020613294565b506005820161140e8154612591565b61149e575b508154925460a01c16917f76ee2dfcae10cb8522e62e713e62660e09ecfaab08db15d9404de1914132257160405186815280611456339560028a840191016125e4565b0390a46000525261149c60056040600020600081556000600182015561147e60028201612a32565b61148a60038201612a32565b61149660048201612a32565b01612a32565b005b6040516114b381610af089820194338661294e565b519020600052600585526114cb846040600020613294565b5086611413565b60246040517f85982a00000000000000000000000000000000000000000000000000000000008152336004820152fd5b346101445760e07ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760043567ffffffffffffffff8111610144576115519036906004016122d8565b6044359163ffffffff8316830361014457600260643510156101445760843567ffffffffffffffff81116101445761158d9036906004016122d8565b91909260a43567ffffffffffffffff8111610144576115b09036906004016122d8565b60c43567ffffffffffffffff8111610144576115d09036906004016122d8565b96909560ff600a54166104ac576115e7338a612c26565b60408511611e04576115fd888483602435612cd0565b611608858733612a9c565b80600052600460205273ffffffffffffffffffffffffffffffffffffffff60016040600020015416611dda57604051906116418261227a565b602435825233602083015263ffffffff8b16604083015261166760643560608401612585565b61167236888a61284c565b608083015261168236848661284c565b60a083015261169236868861284c565b60c08301526116a2368b8b61284c565b60e0830152806000526004602052604060002091805183556001830173ffffffffffffffffffffffffffffffffffffffff60208301511681549077ffffffff0000000000000000000000000000000000000000604085015160a01b16906060850151600281101561047d5778ff0000000000000000000000000000000000000000000000007fffffffffffffff000000000000000000000000000000000000000000000000009160c01b1693161717179055608081015180519067ffffffffffffffff8211610aa7576117858261177c6002880154612591565b600288016128c8565b602090601f8311600114611d0e576117d2929160009183611c375750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b60028401555b60a081015180519067ffffffffffffffff8211610aa757611809826118006003880154612591565b600388016128c8565b602090601f8311600114611c4257611856929160009183611c375750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b60038401555b60c081015180519067ffffffffffffffff8211610aa75761188d826118846004880154612591565b600488016128c8565b602090601f8311600114611b6a5791806118de9260e09594600092611a455750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b60048501555b015180519267ffffffffffffffff8411610aa757838d926119168e9661190d6005860154612591565b600586016128c8565b602090601f8311600114611a50579463ffffffff61087295819a957fc4399022965bad9b2b468bbd8c758a7e80cdde36ff3088ddbb7f93bdfb5623cb9f9e9d99946119a28761044e9f9b98600593611a069f9a600092611a455750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8260011b9260031b1c19161790565b9101555b3360005260026020526119bd836040600020612fee565b501660005260036020526119d5816040600020612fee565b508d82611a1c575b5050506108646040519a8b9a6119f58c6064356120e9565b60a060208d015260a08c019161290f565b978389036080850152169633966024359661290f565b611a3c92611a2a9133612a9c565b60005260056020526040600020612fee565b508c8f8d6119dd565b01519050388061091d565b906005840160005260206000209160005b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe085168110611b4057506108729563ffffffff9a957fc4399022965bad9b2b468bbd8c758a7e80cdde36ff3088ddbb7f93bdfb5623cb9f9e9d999460018761044e9f9b96928f9693611a069f9a94837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06005971610611b09575b505050811b019101556119a6565b01517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88460031b161c19169055388080611afb565b939550918194969750600160209291839285015181550194019201918f9492918f97969492611a61565b906004860160005260206000209160005b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe085168110611c1f5750918391600193837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe060e098971610611be8575b505050811b0160048501556118e4565b01517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88460031b161c191690558f8080611bd8565b91926020600181928685015181550194019201611b7b565b015190508f8061091d565b9190600386016000526020600020906000935b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe084168510611cf35760019450837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0811610611cbc575b505050811b01600384015561185c565b01517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88460031b161c191690558e8080611cac565b81810151835560209485019460019093019290910190611c55565b9190600286016000526020600020906000935b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe084168510611dbf5760019450837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0811610611d88575b505050811b0160028401556117d8565b01517fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60f88460031b161c191690558e8080611d78565b81810151835560209485019460019093019290910190611d21565b60046040517fa0677dd0000000000000000000000000000000000000000000000000000000008152fd5b604485604051907f36a7c503000000000000000000000000000000000000000000000000000000008252600482015260406024820152fd5b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457611e73612bdb565b60017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00600a541617600a557f2789711f6fd67d131ad68378617b5d1d21a2c92b34d7c3745d70b3957c08096c6020604051338152a1005b34610144576020807ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760043567ffffffffffffffff811161014457611f1a9036906004016122d8565b60ff600a54166104ac57611f2e9133612a9c565b90816000526005602052604060002091825491821561066e5760005b838110611f5357005b80611f6060019287612ecb565b90549060031b1c60005260048352604060002063ffffffff8382015460a01c1660005260098452604060002054151580611fea575b611fa1575b5001611f4a565b7f95d94f817db4971aa99ba35d0fe019bd8cc39866fbe02b6d47b5f0f3727fb67360405186815260408682015280611fe1339460026040840191016125e4565b0390a286611f9a565b50612002336000526007602052604060002054151590565b611f95565b346101445760007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc36011261014457604051604081019080821067ffffffffffffffff831117610aa75761066a91604052601a81527f576f726b666c6f77526567697374727920312e302e302d64657600000000000060208201526040519182916020835260208301906120f6565b346101445760607ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc3601126101445760043563ffffffff8116810361014457610e8f61066a916044359060243590612757565b90600282101561047d5752565b919082519283825260005b8481106121405750507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8460006020809697860101520116010190565b602081830181015184830182015201612101565b6121f59160e06121e46121d26121c06101008651865273ffffffffffffffffffffffffffffffffffffffff602088015116602087015263ffffffff60408801511660408701526121ac606088015160608801906120e9565b6080870151908060808801528601906120f6565b60a086015185820360a08701526120f6565b60c085015184820360c08601526120f6565b9201519060e08184039101526120f6565b90565b6020808201906020835283518092526040830192602060408460051b8301019501936000915b84831061222e5750505050505090565b909192939495848061226a837fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc086600196030187528a51612154565b980193019301919493929061221e565b610100810190811067ffffffffffffffff821117610aa757604052565b90601f7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0910116810190811067ffffffffffffffff821117610aa757604052565b9181601f840112156101445782359167ffffffffffffffff8311610144576020838186019501011161014457565b9060407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc8301126101445760043567ffffffffffffffff9283821161014457806023830112156101445781600401359384116101445760248460051b8301011161014457602401919060243580151581036101445790565b6004359073ffffffffffffffffffffffffffffffffffffffff8216820361014457565b9060407ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffc8301126101445760043573ffffffffffffffffffffffffffffffffffffffff8116810361014457916024359067ffffffffffffffff82116101445761240c916004016122d8565b9091565b67ffffffffffffffff8111610aa75760051b60200190565b604051906124358261227a565b606060e0836000815260006020820152600060408201526000838201528260808201528260a08201528260c08201520152565b6040516020810181811067ffffffffffffffff821117610aa7576040526000815290565b9061249682612410565b6124a36040519182612297565b8281527fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe06124d18294612410565b019060005b8281106124e257505050565b6020906124ed612428565b828285010152016124d6565b9190820180921161250657565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052601160045260246000fd5b9190820391821161250657565b80518210156125565760209160051b010190565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052603260045260246000fd5b600282101561047d5752565b90600182811c921680156125da575b60208310146125ab57565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052602260045260246000fd5b91607f16916125a0565b8054600093926125f382612591565b9182825260209360019160018116908160001461265b575060011461261a575b5050505050565b90939495506000929192528360002092846000945b83861061264757505050500101903880808080612613565b80548587018301529401938590820161262f565b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00168685015250505090151560051b010191503880808080612613565b90600560e06040936127538551916126af8361227a565b61274c8397825485526126f960ff600185015473ffffffffffffffffffffffffffffffffffffffff8116602089015263ffffffff8160a01c168489015260c01c1660608701612585565b805161270c8161078d81600288016125e4565b608086015280516127248161078d81600388016125e4565b60a0860152805161273c8161078d81600488016125e4565b60c08601525180968193016125e4565b0384612297565b0152565b63ffffffff16916000838152600360209060036020526040936040842054908187101561283c576127ab918160648993118015612834575b61282c575b8161279f82856124f9565b111561281c5750612535565b946127b58661248c565b96845b8781106127ca57505050505050505090565b6001908287528486526127e98888206127e383876124f9565b90612ecb565b905490861b1c875260048652612800888820612698565b61280a828c612542565b52612815818b612542565b50016127b8565b6128279150826124f9565b612535565b506064612794565b50801561278f565b50505050505050506121f5612468565b92919267ffffffffffffffff8211610aa7576040519161289460207fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0601f8401160184612297565b829481845281830111610144578281602093846000960137010152565b8181106128bc575050565b600081556001016128b1565b9190601f81116128d757505050565b612903926000526020600020906020601f840160051c83019310612905575b601f0160051c01906128b1565b565b90915081906128f6565b601f82602094937fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe0938186528686013760008582860101520116010190565b91907fffffffffffffffffffffffffffffffffffffffff0000000000000000000000009060601b16825260149060009281549261298a84612591565b926001946001811690816000146129f157506001146129ac575b505050505090565b9091929395945060005260209460206000206000905b8582106129de57505050506014929350010138808080806129a4565b80548583018501529087019082016129c2565b92505050601494507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00919350168383015280151502010138808080806129a4565b612a3c8154612591565b9081612a46575050565b81601f60009311600114612a58575055565b908083918252612a77601f60208420940160051c8401600185016128b1565b5555565b91908110156125565760051b0190565b3563ffffffff811681036101445790565b91906034612af191836040519485927fffffffffffffffffffffffffffffffffffffffff000000000000000000000000602085019860601b168852848401378101600083820152036014810184520182612297565b51902090565b73ffffffffffffffffffffffffffffffffffffffff1691600083815260029260209060026020526040936040842054908183101561283c57612b4e9181606485931180156128345761282c578161279f82856124f9565b94612b588661248c565b96845b878110612b6d57505050505050505090565b600190828752838652612b868888206127e383886124f9565b90549060031b1c875260048652612b9e888820612698565b612ba8828c612542565b52612bb3818b612542565b5001612b5b565b3573ffffffffffffffffffffffffffffffffffffffff811681036101445790565b73ffffffffffffffffffffffffffffffffffffffff600154163303612bfc57565b60046040517f2b5c74de000000000000000000000000000000000000000000000000000000008152fd5b63ffffffff1680600052600960205260406000205415612c9f575073ffffffffffffffffffffffffffffffffffffffff1680600052600760205260406000205415612c6e5750565b602490604051907f85982a000000000000000000000000000000000000000000000000000000000082526004820152fd5b602490604051907f8fe6d7e10000000000000000000000000000000000000000000000000000000082526004820152fd5b91909115612d975760c891828111612d615750818111612d2c5750808211612cf6575050565b60449250604051917ecd56a800000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b604491604051917ecd56a800000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b60449083604051917ecd56a800000000000000000000000000000000000000000000000000000000835260048301526024820152fd5b60046040517f7dc2f4e1000000000000000000000000000000000000000000000000000000008152fd5b90600052600460205260406000209073ffffffffffffffffffffffffffffffffffffffff8060018401541691821561066e5716809103612dff575090565b602490604051907f31ee6dc70000000000000000000000000000000000000000000000000000000082526004820152fd5b9081518151908181149384612e47575b5050505090565b6020929394508201209201201438808080612e40565b6008548110156125565760086000527ff3f7a9fe364faab93b216da50a3214154f22a0a2b415b23a84c8169e8b636ee30190600090565b6006548110156125565760066000527ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600090565b80548210156125565760005260206000200190600090565b600081815260096020526040812054612f975760085468010000000000000000811015612f6a579082612f56612f2184600160409601600855612e5d565b81939154907fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9060031b92831b921b19161790565b905560085492815260096020522055600190565b6024827f4e487b710000000000000000000000000000000000000000000000000000000081526041600452fd5b905090565b600081815260076020526040812054612f975760065468010000000000000000811015612f6a579082612fda612f2184600160409601600655612e94565b905560065492815260076020522055600190565b9190600183016000908282528060205260408220541560001461307457845494680100000000000000008610156130475783613037612f21886001604098999a01855584612ecb565b9055549382526020522055600190565b6024837f4e487b710000000000000000000000000000000000000000000000000000000081526041600452fd5b50925050565b60008181526009602052604081205490919080156131c8577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9081810181811161319b576008549083820191821161316e5781810361313a575b505050600854801561310d578101906130ec82612e5d565b909182549160031b1b19169055600855815260096020526040812055600190565b6024847f4e487b710000000000000000000000000000000000000000000000000000000081526031600452fd5b613158613149612f2193612e5d565b90549060031b1c928392612e5d565b90558452600960205260408420553880806130d4565b6024867f4e487b710000000000000000000000000000000000000000000000000000000081526011600452fd5b6024857f4e487b710000000000000000000000000000000000000000000000000000000081526011600452fd5b505090565b60008181526007602052604081205490919080156131c8577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9081810181811161319b576006549083820191821161316e57818103613260575b505050600654801561310d5781019061323f82612e94565b909182549160031b1b19169055600655815260076020526040812055600190565b61327e61326f612f2193612e94565b90549060031b1c928392612e94565b9055845260076020526040842055388080613227565b90600182019060009281845282602052604084205490811515600014612e40577fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff918281018181116133b95782549084820191821161338c57818103613357575b5050508054801561332a5782019161330d8383612ecb565b909182549160031b1b191690555582526020526040812055600190565b6024867f4e487b710000000000000000000000000000000000000000000000000000000081526031600452fd5b613377613367612f219386612ecb565b90549060031b1c92839286612ecb565b905586528460205260408620553880806132f5565b6024887f4e487b710000000000000000000000000000000000000000000000000000000081526011600452fd5b6024877f4e487b710000000000000000000000000000000000000000000000000000000081526011600452fdfea164736f6c6343000818000a",
 }
 
 var WorkflowRegistryABI = WorkflowRegistryMetaData.ABI
@@ -1097,28 +1097,18 @@ type WorkflowRegistryRegistryLockedV1 struct {
 	Raw      types.Log
 }
 
-func (_WorkflowRegistry *WorkflowRegistryFilterer) FilterRegistryLockedV1(opts *bind.FilterOpts, lockedBy []common.Address) (*WorkflowRegistryRegistryLockedV1Iterator, error) {
+func (_WorkflowRegistry *WorkflowRegistryFilterer) FilterRegistryLockedV1(opts *bind.FilterOpts) (*WorkflowRegistryRegistryLockedV1Iterator, error) {
 
-	var lockedByRule []interface{}
-	for _, lockedByItem := range lockedBy {
-		lockedByRule = append(lockedByRule, lockedByItem)
-	}
-
-	logs, sub, err := _WorkflowRegistry.contract.FilterLogs(opts, "RegistryLockedV1", lockedByRule)
+	logs, sub, err := _WorkflowRegistry.contract.FilterLogs(opts, "RegistryLockedV1")
 	if err != nil {
 		return nil, err
 	}
 	return &WorkflowRegistryRegistryLockedV1Iterator{contract: _WorkflowRegistry.contract, event: "RegistryLockedV1", logs: logs, sub: sub}, nil
 }
 
-func (_WorkflowRegistry *WorkflowRegistryFilterer) WatchRegistryLockedV1(opts *bind.WatchOpts, sink chan<- *WorkflowRegistryRegistryLockedV1, lockedBy []common.Address) (event.Subscription, error) {
-
-	var lockedByRule []interface{}
-	for _, lockedByItem := range lockedBy {
-		lockedByRule = append(lockedByRule, lockedByItem)
-	}
+func (_WorkflowRegistry *WorkflowRegistryFilterer) WatchRegistryLockedV1(opts *bind.WatchOpts, sink chan<- *WorkflowRegistryRegistryLockedV1) (event.Subscription, error) {
 
-	logs, sub, err := _WorkflowRegistry.contract.WatchLogs(opts, "RegistryLockedV1", lockedByRule)
+	logs, sub, err := _WorkflowRegistry.contract.WatchLogs(opts, "RegistryLockedV1")
 	if err != nil {
 		return nil, err
 	}
@@ -1224,28 +1214,18 @@ type WorkflowRegistryRegistryUnlockedV1 struct {
 	Raw        types.Log
 }
 
-func (_WorkflowRegistry *WorkflowRegistryFilterer) FilterRegistryUnlockedV1(opts *bind.FilterOpts, unlockedBy []common.Address) (*WorkflowRegistryRegistryUnlockedV1Iterator, error) {
+func (_WorkflowRegistry *WorkflowRegistryFilterer) FilterRegistryUnlockedV1(opts *bind.FilterOpts) (*WorkflowRegistryRegistryUnlockedV1Iterator, error) {
 
-	var unlockedByRule []interface{}
-	for _, unlockedByItem := range unlockedBy {
-		unlockedByRule = append(unlockedByRule, unlockedByItem)
-	}
-
-	logs, sub, err := _WorkflowRegistry.contract.FilterLogs(opts, "RegistryUnlockedV1", unlockedByRule)
+	logs, sub, err := _WorkflowRegistry.contract.FilterLogs(opts, "RegistryUnlockedV1")
 	if err != nil {
 		return nil, err
 	}
 	return &WorkflowRegistryRegistryUnlockedV1Iterator{contract: _WorkflowRegistry.contract, event: "RegistryUnlockedV1", logs: logs, sub: sub}, nil
 }
 
-func (_WorkflowRegistry *WorkflowRegistryFilterer) WatchRegistryUnlockedV1(opts *bind.WatchOpts, sink chan<- *WorkflowRegistryRegistryUnlockedV1, unlockedBy []common.Address) (event.Subscription, error) {
-
-	var unlockedByRule []interface{}
-	for _, unlockedByItem := range unlockedBy {
-		unlockedByRule = append(unlockedByRule, unlockedByItem)
-	}
+func (_WorkflowRegistry *WorkflowRegistryFilterer) WatchRegistryUnlockedV1(opts *bind.WatchOpts, sink chan<- *WorkflowRegistryRegistryUnlockedV1) (event.Subscription, error) {
 
-	logs, sub, err := _WorkflowRegistry.contract.WatchLogs(opts, "RegistryUnlockedV1", unlockedByRule)
+	logs, sub, err := _WorkflowRegistry.contract.WatchLogs(opts, "RegistryUnlockedV1")
 	if err != nil {
 		return nil, err
 	}
@@ -2304,15 +2284,15 @@ type WorkflowRegistryInterface interface {
 
 	ParseOwnershipTransferred(log types.Log) (*WorkflowRegistryOwnershipTransferred, error)
 
-	FilterRegistryLockedV1(opts *bind.FilterOpts, lockedBy []common.Address) (*WorkflowRegistryRegistryLockedV1Iterator, error)
+	FilterRegistryLockedV1(opts *bind.FilterOpts) (*WorkflowRegistryRegistryLockedV1Iterator, error)
 
-	WatchRegistryLockedV1(opts *bind.WatchOpts, sink chan<- *WorkflowRegistryRegistryLockedV1, lockedBy []common.Address) (event.Subscription, error)
+	WatchRegistryLockedV1(opts *bind.WatchOpts, sink chan<- *WorkflowRegistryRegistryLockedV1) (event.Subscription, error)
 
 	ParseRegistryLockedV1(log types.Log) (*WorkflowRegistryRegistryLockedV1, error)
 
-	FilterRegistryUnlockedV1(opts *bind.FilterOpts, unlockedBy []common.Address) (*WorkflowRegistryRegistryUnlockedV1Iterator, error)
+	FilterRegistryUnlockedV1(opts *bind.FilterOpts) (*WorkflowRegistryRegistryUnlockedV1Iterator, error)
 
-	WatchRegistryUnlockedV1(opts *bind.WatchOpts, sink chan<- *WorkflowRegistryRegistryUnlockedV1, unlockedBy []common.Address) (event.Subscription, error)
+	WatchRegistryUnlockedV1(opts *bind.WatchOpts, sink chan<- *WorkflowRegistryRegistryUnlockedV1) (event.Subscription, error)
 
 	ParseRegistryUnlockedV1(log types.Log) (*WorkflowRegistryRegistryUnlockedV1, error)
 
diff --git a/core/gethwrappers/workflow/generation/generated-wrapper-dependency-versions-do-not-edit.txt b/core/gethwrappers/workflow/generation/generated-wrapper-dependency-versions-do-not-edit.txt
index b937cc957a6..7552f72d164 100644
--- a/core/gethwrappers/workflow/generation/generated-wrapper-dependency-versions-do-not-edit.txt
+++ b/core/gethwrappers/workflow/generation/generated-wrapper-dependency-versions-do-not-edit.txt
@@ -1,2 +1,2 @@
 GETH_VERSION: 1.14.11
-workflow_registry_wrapper: ../../../contracts/solc/v0.8.24/WorkflowRegistry/WorkflowRegistry.abi ../../../contracts/solc/v0.8.24/WorkflowRegistry/WorkflowRegistry.bin 2f7e6d51370fbb3a6c467515127333b6cb4b998c61f2e0b74d5e07ccb1a8716b
+workflow_registry_wrapper: ../../../contracts/solc/v0.8.24/WorkflowRegistry/WorkflowRegistry.abi ../../../contracts/solc/v0.8.24/WorkflowRegistry/WorkflowRegistry.bin 910925e0786fbe9efb686646ede620e7fc0536c74acdaeef49e96ac67580ea14

From 3230f2aa9a96b760d0e9f375f545741c30e0cd05 Mon Sep 17 00:00:00 2001
From: Bartek Tofel <bartek.tofel@smartcontract.com>
Date: Mon, 25 Nov 2024 21:31:52 +0100
Subject: [PATCH 10/11] remove gotestloghelper from core tests (#15395)

* try gotestloghelper with branch version

* fail core tests on purpose

* use tee by default for processing output of core go tests, do not use -json flag, remove gotestloghelper

* rename log message, filter out no tests/test files from fuzz tests

* remove on-purpose core test failure

* remove non-tee mode from running go core tests, simplify all conditions

* remove extra new line from test

* remove whitespaces

* fix relative path

* remove superfluous if
---
 .github/workflows/ci-core.yml           | 12 ------------
 tools/bin/go_core_ccip_deployment_tests | 20 ++++++--------------
 tools/bin/go_core_fuzz                  |  2 +-
 tools/bin/go_core_race_tests            | 16 ++--------------
 tools/bin/go_core_tests                 | 16 ++++------------
 tools/bin/go_core_tests_integration     | 16 ++++------------
 6 files changed, 17 insertions(+), 65 deletions(-)

diff --git a/.github/workflows/ci-core.yml b/.github/workflows/ci-core.yml
index 7f5f0c091f8..c38ecd918ae 100644
--- a/.github/workflows/ci-core.yml
+++ b/.github/workflows/ci-core.yml
@@ -231,26 +231,14 @@ jobs:
           echo "COUNT=50" >> $GITHUB_ENV
           echo "FUZZ_TIMEOUT_MINUTES=10">> $GITHUB_ENV
 
-      - name: Install gotestloghelper
-        if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
-        run: go install github.com/smartcontractkit/chainlink-testing-framework/tools/gotestloghelper@v1.50.0
-
       - name: Run tests
         if: ${{ needs.filter.outputs.should-run-ci-core == 'true' }}
         id: run-tests
         env:
           OUTPUT_FILE: ./output.txt
-          USE_TEE: false
           CL_DATABASE_URL: ${{ env.DB_URL }}
         run: ./tools/bin/${{ matrix.type.cmd }} ./...
 
-      - name: Print Filtered Test Results
-        if: ${{ failure() && needs.filter.outputs.should-run-ci-core == 'true' && steps.run-tests.conclusion == 'failure' }}
-        run: |
-          if [[ "${{ matrix.type.printResults }}"  == "true" ]]; then
-            cat output.txt | gotestloghelper -ci
-          fi
-      
       - name: Print Races
         id: print-races
         if: ${{ failure() && matrix.type.cmd == 'go_core_race_tests' && needs.filter.outputs.should-run-ci-core == 'true' }}
diff --git a/tools/bin/go_core_ccip_deployment_tests b/tools/bin/go_core_ccip_deployment_tests
index 6f1ef8d01cf..de976741398 100755
--- a/tools/bin/go_core_ccip_deployment_tests
+++ b/tools/bin/go_core_ccip_deployment_tests
@@ -3,26 +3,18 @@ set -o pipefail
 set +e
 
 SCRIPT_PATH=`dirname "$0"`; SCRIPT_PATH=`eval "cd \"$SCRIPT_PATH\" && pwd"`
-OUTPUT_FILE="../output.txt"
-USE_TEE="${USE_TEE:-true}"
+OUTPUT_FILE=${OUTPUT_FILE:-"../output.txt"}
+EXTRA_FLAGS=""
 
 cd ./deployment || exit
 go mod download
-echo "Failed tests and panics: ---------------------"
+echo "Test execution results: ---------------------"
 echo ""
+
 if [[ $GITHUB_EVENT_NAME == "schedule" ]]; then
-  if [[ $DEBUG == "true" ]]; then 
-    go test -json ./... -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt | tee $OUTPUT_FILE
-  else
-    go test -json ./... -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt | cat > $OUTPUT_FILE
-  fi
-else
-  if [[ $DEBUG == "true" ]]; then 
-    go test ./... | tee $OUTPUT_FILE
-  else
-    go test ./... | cat > $OUTPUT_FILE
-  fi
+  EXTRA_FLAGS="-covermode=atomic -coverpkg=./... -coverprofile=coverage.txt"
 fi
+go test ./... "$EXTRA_FLAGS" | tee $OUTPUT_FILE | grep -Ev '\[no test files\]|\[no tests to run\]'
 EXITCODE=${PIPESTATUS[0]}
 
 # Assert no known sensitive strings present in test logger output
diff --git a/tools/bin/go_core_fuzz b/tools/bin/go_core_fuzz
index 49aaf33b65e..65c9273a418 100755
--- a/tools/bin/go_core_fuzz
+++ b/tools/bin/go_core_fuzz
@@ -19,7 +19,7 @@ echo "timeout minutes: $FUZZ_TIMEOUT_MINUTES"
 echo "fuzz seconds: $FUZZ_SECONDS"
 echo "Failed fuzz tests and panics: ---------------------"
 echo ""
-timeout "${FUZZ_TIMEOUT_MINUTES}"m ./fuzz/fuzz_all_native.py --ci --seconds "$FUZZ_SECONDS" --go_module_root ./ | tee $OUTPUT_FILE
+timeout "${FUZZ_TIMEOUT_MINUTES}"m ./fuzz/fuzz_all_native.py --ci --seconds "$FUZZ_SECONDS" --go_module_root ./ | tee $OUTPUT_FILE | grep -Ev '\[no test files\]|\[no tests to run\]'
 EXITCODE=${PIPESTATUS[0]}
 
 # Assert no known sensitive strings present in test logger output
diff --git a/tools/bin/go_core_race_tests b/tools/bin/go_core_race_tests
index 2af12b86403..467dda4e92f 100755
--- a/tools/bin/go_core_race_tests
+++ b/tools/bin/go_core_race_tests
@@ -4,21 +4,9 @@ OUTPUT_FILE=${OUTPUT_FILE:-"./output.txt"}
 TIMEOUT="${TIMEOUT:-10s}"
 COUNT="${COUNT:-5}"
 
-echo "Failed tests and panics: ---------------------"
+echo "Test execution results: ---------------------"
 echo ""
-if [[ $GITHUB_EVENT_NAME == "schedule" ]]; then
-  if [[  $DEBUG == "true" ]]; then 
-    GORACE="log_path=$PWD/race" go test -json -race -shuffle on -timeout "$TIMEOUT" -count "$COUNT" $1 | tee $OUTPUT_FILE
-  else
-    GORACE="log_path=$PWD/race" go test -race -shuffle on -timeout "$TIMEOUT" -count "$COUNT" $1 | cat > $OUTPUT_FILE
-  fi
-else
-  if [[ $DEBUG == "true" ]]; then 
-        GORACE="log_path=$PWD/race" go test -json -race -shuffle on -timeout "$TIMEOUT" -count "$COUNT" $1 | tee $OUTPUT_FILE
-  else
-    GORACE="log_path=$PWD/race" go test -race -shuffle on -timeout "$TIMEOUT" -count "$COUNT" $1 | cat > $OUTPUT_FILE
-  fi
-fi
+GORACE="log_path=$PWD/race" go test -race -shuffle on -timeout "$TIMEOUT" -count "$COUNT" $1 | cat > $OUTPUT_FILE
 EXITCODE=${PIPESTATUS[0]}
 
 
diff --git a/tools/bin/go_core_tests b/tools/bin/go_core_tests
index 92e32b4ae94..0fffcb72a39 100755
--- a/tools/bin/go_core_tests
+++ b/tools/bin/go_core_tests
@@ -4,22 +4,14 @@ set +e
 
 SCRIPT_PATH=`dirname "$0"`; SCRIPT_PATH=`eval "cd \"$SCRIPT_PATH\" && pwd"`
 OUTPUT_FILE=${OUTPUT_FILE:-"./output.txt"}
+EXTRA_FLAGS=""
 
-echo "Failed tests and panics: ---------------------"
+echo "Test execution results: ---------------------"
 echo ""
 if [[ $GITHUB_EVENT_NAME == "schedule" ]]; then
-  if [[ $DEBUG == "true" ]]; then 
-    go test -json -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt $1 | tee $OUTPUT_FILE
-  else
-    go test -json -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt $1 | cat > $OUTPUT_FILE
-  fi
-else
-  if [[ $DEBUG == "true" ]]; then 
-    go test $1 | tee $OUTPUT_FILE
-  else
-    go test $1 | cat > $OUTPUT_FILE
-  fi
+  EXTRA_FLAGS="-covermode=atomic -coverpkg=./... -coverprofile=coverage.txt"
 fi
+go test "$EXTRA_FLAGS" $1 | tee $OUTPUT_FILE | grep -Ev '\[no test files\]|\[no tests to run\]'
 EXITCODE=${PIPESTATUS[0]}
 
 # Assert no known sensitive strings present in test logger output
diff --git a/tools/bin/go_core_tests_integration b/tools/bin/go_core_tests_integration
index fed80c4bbd5..323e9d526ac 100755
--- a/tools/bin/go_core_tests_integration
+++ b/tools/bin/go_core_tests_integration
@@ -4,6 +4,7 @@ set +e
 
 SCRIPT_PATH=$(dirname "$0"); SCRIPT_PATH=$(eval "cd \"$SCRIPT_PATH\" && pwd")
 OUTPUT_FILE=${OUTPUT_FILE:-"./output.txt"}
+EXTRA_FLAGS=""
 
 echo "Finding and running integration-tagged tests"
 INTEGRATION_TAGGED_TEST_FILES=$(find . -name '*_test.go' -exec grep -l '//go:build integration' {} +)
@@ -14,24 +15,15 @@ fi
 INTEGRATION_TEST_DIRS=$(echo "$INTEGRATION_TAGGED_TEST_FILES" | xargs -n1 dirname | sort -u)
 INTEGRATION_TEST_DIRS_SPACE_DELIMITED=$(echo "$INTEGRATION_TEST_DIRS" | tr '\n' ' ')
 
-echo "Failed tests and panics: ---------------------"
+echo "Test execution results: ---------------------"
 echo ""
 if [[ $GITHUB_EVENT_NAME == "schedule" ]]; then
   # Experimental code to minimize size of this coverage report
   # ALL_IMPORTS=$(go list -f '{{ join .Imports "\n" }}' $INTEGRATION_TEST_DIRS | sort -u)
   # COVERPKG_DIRS=$(echo "$INTEGRATION_TEST_DIRS $ALL_IMPORTS" | grep "smartcontractkit/chainlink" | tr '\n' ',')
-  if [[ $DEBUG == "true" ]]; then 
-    go test -json -tags integration -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt $INTEGRATION_TEST_DIRS_SPACE_DELIMITED | tee $OUTPUT_FILE
-  else
-    go test -json -tags integration -covermode=atomic -coverpkg=./... -coverprofile=coverage.txt $INTEGRATION_TEST_DIRS_SPACE_DELIMITED | cat > $OUTPUT_FILE
-  fi
-else
-  if [[ $DEBUG == "true" ]]; then 
-    go test -tags integration $INTEGRATION_TEST_DIRS_SPACE_DELIMITED | tee $OUTPUT_FILE
-  else
-    go test -tags integration $INTEGRATION_TEST_DIRS_SPACE_DELIMITED | cat > $OUTPUT_FILE
-  fi
+  EXTRA_FLAGS="-covermode=atomic -coverpkg=./... -coverprofile=coverage.txt"
 fi
+go test -tags integration "$EXTRA_FLAGS" $INTEGRATION_TEST_DIRS_SPACE_DELIMITED | tee $OUTPUT_FILE | grep -Ev '\[no test files\]|\[no tests to run\]'
 EXITCODE=${PIPESTATUS[0]}
 
 # Assert no known sensitive strings present in test logger output

From 4e6d7ad7f49bbfc8942dc379cf42a4b7b1b21436 Mon Sep 17 00:00:00 2001
From: Makram <makramkd@users.noreply.github.com>
Date: Tue, 26 Nov 2024 12:42:35 +0400
Subject: [PATCH 11/11] integration-tests/smoke/ccip: add max batch size test
 (#15403)

* add max batch size test

* fix lint
---
 .../smoke/ccip/ccip_batching_test.go          | 161 +++++++++++++++---
 1 file changed, 142 insertions(+), 19 deletions(-)

diff --git a/integration-tests/smoke/ccip/ccip_batching_test.go b/integration-tests/smoke/ccip/ccip_batching_test.go
index 0667d1367cc..903861ca21c 100644
--- a/integration-tests/smoke/ccip/ccip_batching_test.go
+++ b/integration-tests/smoke/ccip/ccip_batching_test.go
@@ -9,14 +9,19 @@ import (
 
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
 	"github.com/ethereum/go-ethereum/common"
+	gethtypes "github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/exp/maps"
 
-	"github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
+	chainsel "github.com/smartcontractkit/chain-selectors"
 
+	"github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3"
+	"github.com/smartcontractkit/chainlink-common/pkg/merklemulti"
 	"github.com/smartcontractkit/chainlink/deployment"
 	"github.com/smartcontractkit/chainlink/deployment/ccip/changeset"
 	"github.com/smartcontractkit/chainlink/integration-tests/testsetups"
+	"github.com/smartcontractkit/chainlink/v2/core/chains/evm/assets"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/offramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/onramp"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/router"
@@ -63,21 +68,20 @@ func Test_CCIPBatching(t *testing.T) {
 			sourceChain1: 1,
 			sourceChain2: 1,
 		}
-		endSeqNum = map[uint64]ccipocr3.SeqNum{
-			sourceChain1: ccipocr3.SeqNum(numMessages),
-			sourceChain2: ccipocr3.SeqNum(numMessages),
-		}
 	)
 
 	t.Run("batch data only messages from single source", func(t *testing.T) {
+		var (
+			sourceChain = sourceChain1
+		)
 		err := sendMessages(
 			ctx,
 			t,
-			e.Env.Chains[sourceChain1],
-			e.Env.Chains[sourceChain1].DeployerKey,
-			state.Chains[sourceChain1].OnRamp,
-			state.Chains[sourceChain1].Router,
-			state.Chains[sourceChain1].Multicall3,
+			e.Env.Chains[sourceChain],
+			e.Env.Chains[sourceChain].DeployerKey,
+			state.Chains[sourceChain].OnRamp,
+			state.Chains[sourceChain].Router,
+			state.Chains[sourceChain].Multicall3,
 			destChain,
 			numMessages,
 			common.LeftPadBytes(state.Chains[destChain].Receiver.Address().Bytes(), 32),
@@ -86,21 +90,21 @@ func Test_CCIPBatching(t *testing.T) {
 
 		_, err = changeset.ConfirmCommitWithExpectedSeqNumRange(
 			t,
-			e.Env.Chains[sourceChain1],
+			e.Env.Chains[sourceChain],
 			e.Env.Chains[destChain],
 			state.Chains[destChain].OffRamp,
 			nil,
-			ccipocr3.NewSeqNumRange(startSeqNum[sourceChain1], endSeqNum[sourceChain1]),
+			ccipocr3.NewSeqNumRange(startSeqNum[sourceChain], startSeqNum[sourceChain]+numMessages-1),
 		)
-		require.NoErrorf(t, err, "failed to confirm commit from chain %d", sourceChain1)
+		require.NoErrorf(t, err, "failed to confirm commit from chain %d", sourceChain)
 
 		states, err := changeset.ConfirmExecWithSeqNrs(
 			t,
-			e.Env.Chains[sourceChain1],
+			e.Env.Chains[sourceChain],
 			e.Env.Chains[destChain],
 			state.Chains[destChain].OffRamp,
 			nil,
-			genSeqNrRange(startSeqNum[sourceChain1], endSeqNum[sourceChain1]),
+			genSeqNrRange(startSeqNum[sourceChain], startSeqNum[sourceChain]+numMessages-1),
 		)
 		require.NoError(t, err)
 		// assert that all states are successful
@@ -108,8 +112,7 @@ func Test_CCIPBatching(t *testing.T) {
 			require.Equal(t, changeset.EXECUTION_STATE_SUCCESS, state)
 		}
 
-		startSeqNum[sourceChain1] = endSeqNum[sourceChain1] + 1
-		endSeqNum[sourceChain1] = startSeqNum[sourceChain1] + ccipocr3.SeqNum(numMessages) - 1
+		startSeqNum[sourceChain] = startSeqNum[sourceChain] + numMessages
 	})
 
 	t.Run("batch data only messages from multiple sources", func(t *testing.T) {
@@ -158,7 +161,7 @@ func Test_CCIPBatching(t *testing.T) {
 				srcChain,
 				destChain,
 				startSeqNum[srcChain],
-				endSeqNum[srcChain],
+				startSeqNum[srcChain]+ccipocr3.SeqNum(numMessages)-1,
 				&wg,
 				outputErrs,
 			)
@@ -198,7 +201,7 @@ func Test_CCIPBatching(t *testing.T) {
 				state,
 				srcChain,
 				destChain,
-				genSeqNrRange(startSeqNum[srcChain], endSeqNum[srcChain]),
+				genSeqNrRange(startSeqNum[srcChain], startSeqNum[srcChain]+ccipocr3.SeqNum(numMessages)-1),
 				&wg,
 				execErrs,
 			)
@@ -226,6 +229,77 @@ func Test_CCIPBatching(t *testing.T) {
 				require.Equal(t, changeset.EXECUTION_STATE_SUCCESS, state)
 			}
 		}
+
+		// update the start and end seq nums
+		for _, srcChain := range sourceChains {
+			startSeqNum[srcChain] = startSeqNum[srcChain] + numMessages
+		}
+	})
+
+	t.Run("max evm batch size", func(t *testing.T) {
+		var (
+			sourceChain = sourceChain1
+			otherSender = mustNewTransactor(t, e.Env.Chains[sourceChain])
+			transactors = []*bind.TransactOpts{
+				e.Env.Chains[sourceChain].DeployerKey,
+				otherSender,
+			}
+			errs = make(chan error, len(transactors))
+		)
+
+		// transfer some eth to the other sender from the DeployerKey
+		sendEth(
+			ctx,
+			t,
+			e.Env.Chains[sourceChain],
+			e.Env.Chains[sourceChain].DeployerKey,
+			otherSender.From,
+			assets.Ether(20).ToInt(),
+		)
+
+		for _, transactor := range transactors {
+			go func() {
+				err := sendMessages(
+					ctx,
+					t,
+					e.Env.Chains[sourceChain],
+					transactor,
+					state.Chains[sourceChain].OnRamp,
+					state.Chains[sourceChain].Router,
+					state.Chains[sourceChain].Multicall3,
+					destChain,
+					merklemulti.MaxNumberTreeLeaves/2,
+					common.LeftPadBytes(state.Chains[destChain].Receiver.Address().Bytes(), 32),
+				)
+				t.Log("sendMessages error:", err, ", writing to channel")
+				errs <- err
+				t.Log("sent error to channel")
+			}()
+		}
+
+		var i = 0
+		for i < len(transactors) {
+			select {
+			case err := <-errs:
+				require.NoError(t, err)
+				i++
+			case <-ctx.Done():
+				require.FailNow(t, "didn't get all errors before test context was done")
+			}
+		}
+
+		_, err = changeset.ConfirmCommitWithExpectedSeqNumRange(
+			t,
+			e.Env.Chains[sourceChain],
+			e.Env.Chains[destChain],
+			state.Chains[destChain].OffRamp,
+			nil, // startBlock
+			ccipocr3.NewSeqNumRange(
+				startSeqNum[sourceChain],
+				startSeqNum[sourceChain]+ccipocr3.SeqNum(merklemulti.MaxNumberTreeLeaves)-1,
+			),
+		)
+		require.NoErrorf(t, err, "failed to confirm commit from chain %d", sourceChain)
 	})
 }
 
@@ -333,6 +407,7 @@ func sendMessages(
 	}
 
 	// Send the tx with the messages through the multicall
+	t.Logf("Sending %d messages with total value %s", numMessages, totalValue.String())
 	tx, err := sourceMulticall3.Aggregate3Value(
 		&bind.TransactOpts{
 			From:   sourceTransactOpts.From,
@@ -414,3 +489,51 @@ func genSeqNrRange(start, end ccipocr3.SeqNum) []uint64 {
 	}
 	return seqNrs
 }
+
+func mustNewTransactor(t *testing.T, chain deployment.Chain) *bind.TransactOpts {
+	chainID, err := chainsel.GetChainIDFromSelector(chain.Selector)
+	require.NoError(t, err)
+	chainIDBig, ok := new(big.Int).SetString(chainID, 10)
+	require.True(t, ok, "evm chainID must be integral")
+	key, err := crypto.GenerateKey()
+	require.NoError(t, err)
+	transactor, err := bind.NewKeyedTransactorWithChainID(key, chainIDBig)
+	require.NoError(t, err)
+	return transactor
+}
+
+func sendEth(
+	ctx context.Context,
+	t *testing.T,
+	chain deployment.Chain,
+	from *bind.TransactOpts,
+	to common.Address,
+	value *big.Int,
+) {
+	balance, err := chain.Client.BalanceAt(ctx, from.From, nil)
+	require.NoError(t, err)
+	if balance.Cmp(value) < 0 {
+		t.Fatalf("insufficient balance: %s < %s", balance.String(), value.String())
+	}
+	t.Logf("balance of from account %s: %s", from.From.String(), balance.String())
+
+	nonce, err := chain.Client.PendingNonceAt(ctx, from.From)
+	require.NoError(t, err)
+	gp, err := chain.Client.SuggestGasPrice(ctx)
+	require.NoError(t, err)
+	tx := gethtypes.NewTx(&gethtypes.LegacyTx{
+		Nonce:    nonce,
+		GasPrice: gp,
+		Gas:      21_000,
+		To:       &to,
+		Value:    value,
+		Data:     nil,
+	})
+	signedTx, err := from.Signer(from.From, tx)
+	require.NoError(t, err)
+	err = chain.Client.SendTransaction(ctx, signedTx)
+	require.NoError(t, err)
+	t.Log("sent funding tx:", signedTx.Hash().Hex())
+	_, err = deployment.ConfirmIfNoError(chain, signedTx, err)
+	require.NoError(t, err)
+}