[WIP] Timelock by JohnChangUK · Pull Request #624 · smartcontractkit/mcms

JohnChangUK · 2026-02-11T05:20:53Z

No description provided.

Add support for the Sui and Ton chain families to the BuildInspectors and BuildConverters helper functions defined in the `chainwrappers` package. --- OPT-398 --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

@krebernisak

This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @smartcontractkit/mcms@0.35.0 ### Minor Changes - [#586](#586) [`19074d4`](19074d4) Thanks [@krebernisak](https://github.com/krebernisak)! - Update to latest chainlink-ton MCMS contracts version + misc fixes/improvements ### Patch Changes - [#603](#603) [`2cd7db1`](2cd7db1) Thanks [@krebernisak](https://github.com/krebernisak)! - Add wait (pending op) support for TON executors - [#610](#610) [`95b0666`](95b0666) Thanks [@gustavogama-cll](https://github.com/gustavogama-cll)! - chore: add sui and ton to chainwrappers helpers - [#611](#611) [`94f50e5`](94f50e5) Thanks [@RodrigoAD](https://github.com/RodrigoAD)! - Bumps chainlink-sui version - [#607](#607) [`40f2af0`](40f2af0) Thanks [@patricios-space](https://github.com/patricios-space)! - Bump chainlink-ton version to latest (642f6eb) Co-authored-by: app-token-issuer-engops[bot] <144731339+app-token-issuer-engops[bot]@users.noreply.github.com>

Updates the CODEOWNERS to be the entire Operations Platform team.

Revert the Solana dep bump made here: https://github.com/smartcontractkit/mcms/pull/607/changes Bump still needed, but to a specific version that has a release available: https://github.com/smartcontractkit/chainlink-ccip/releases/tag/solana-artifacts-localtest-85accaf3d28d Using the specific versions currently in core: https://github.com/smartcontractkit/chainlink/blob/develop/go.mod

changeset-bot · 2026-02-11T05:21:00Z

⚠️ No Changeset found

Latest commit: 9cedc26

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

- Adapts to latest contract changes - Removes DAML client to use raw pb client

This reverts commit d0f55c0, reversing changes made to 9464960.

RodrigoAD · 2026-02-17T10:16:35Z

e2e/tests/canton/timelock.go

+}
+
+// deployCounterContract deploys a Counter contract for testing
+func (s *MCMSTimelockTestSuite) deployCounterContract() {


This should be already available in common.go

I also see it also exists in timelock_inspection.go and timelock_errors.go, let's remove it from where it's duplicated

RodrigoAD · 2026-02-17T10:19:25Z

e2e/tests/canton/timelock.go

+		ChainSelector: s.chainSelector,
+		Transactions: []mcmstypes.Transaction{{
+			To:               s.counterCID,
+			Data:             []byte("increment"),


Is this doing anything? If not, let's remove it to avoid confusions

Suggested change

Data: []byte("increment"),

Data: []byte(""),

RodrigoAD · 2026-02-17T10:21:35Z

e2e/tests/canton/timelock.go

+		ChainSelector: s.chainSelector,
+		Transactions: []mcmstypes.Transaction{{
+			To:               s.counterCID,
+			Data:             []byte("increment"),


Same as before here

Suggested change

Data: []byte("increment"),

Data: []byte(""),

RodrigoAD · 2026-02-17T10:24:01Z

e2e/tests/canton/timelock_proposal.go

@@ -0,0 +1,540 @@
+//go:build e2e


This looks exactly the same as timelock.go, let's remove it

RodrigoAD · 2026-02-17T10:28:30Z

e2e/tests/canton/timelock_errors.go

+}
+
+// SetupSuite runs before the test suite
+func (s *MCMSTimelockErrorTestSuite) SetupSuite() {


This is the same in every Timelock test, let's create a common TimelockTestSuite that specific tests inherit (timelock_proposal/cancel/errors.go) and can use the same SetupSuite

RodrigoAD · 2026-02-17T10:33:19Z

e2e/tests/canton/timelock_inspection.go

+	minDelay, err := inspector.GetMinDelay(ctx, s.mcmsContractID)
+	s.Require().NoError(err, "GetMinDelay should not return an error")
+	// The default minDelay is 0 (we set it to 0 microseconds in the test setup)
+	s.T().Logf("GetMinDelay returned: %d seconds", minDelay)


Let's check that the actual value is the expected

RodrigoAD · 2026-02-17T10:38:51Z

sdk/canton/timelock_converter.go

+			Salt:        cantontypes.TEXT(saltHex),
+			DelaySecs:   cantontypes.INT64(delay.Seconds()),
+		}
+		operationDataEncoded, err = params.MarshalHex()


Make sure the godaml version in go.mod is updated, I don't think this is available in the current version

RodrigoAD · 2026-02-17T10:46:50Z

sdk/canton/timelock_inspector.go

+}
+
+// getMCMSContract queries the active MCMS contract by contract ID.
+func (t *TimelockInspector) getMCMSContract(ctx context.Context, mcmsAddr string) (*mcms.MCMS, error) {


This is almost the same as in inspector.go, let's reuse it 👍

Also, let's rename it to setMCMSContract

RodrigoAD · 2026-02-17T10:55:38Z

sdk/canton/timelock_executor.go

+	return &TimelockExecutor{
+		TimelockInspector: NewTimelockInspector(stateClient, client, userId, party),
+		client:            client,
+		userId:            userId,


I don't see userId used anywhere, can we remove it?

RodrigoAD · 2026-02-17T10:59:27Z

e2e/tests/canton/timelock.go

+	// Build batch operation to increment counter
+	opAdditionalFields := cantonsdk.AdditionalFields{
+		TargetInstanceId: s.counterInstanceID, // Already includes the party from deployCounterContract
+		FunctionName:     "Increment",         // Must match Daml choice name (capital I)


Can we add a test to set the MCMS config through a proposal?

gustavogama-cll and others added 5 commits February 6, 2026 17:54

chore(codeowners): update codeowner to Operations Platform (#616)

1e63db0

Updates the CODEOWNERS to be the entire Operations Platform team.

[WIP] Timelock Canton

2c5659a

JohnChangUK requested review from RodrigoAD and rodrigombsoares February 11, 2026 05:20

RodrigoAD and others added 5 commits February 14, 2026 15:54

Canton bump (#627)

c6616c7

- Adapts to latest contract changes - Removes DAML client to use raw pb client

Timelock SDK interfaces and e2e tests

9464960

Merge branch 'main' into canton-timelock

d0f55c0

Merge branch 'canton-main' into canton-timelock

e76f74a

Revert "Merge branch 'main' into canton-timelock"

9cedc26

This reverts commit d0f55c0, reversing changes made to 9464960.

RodrigoAD reviewed Feb 17, 2026

View reviewed changes

Comments

Conversation

JohnChangUK commented Feb 11, 2026

Uh oh!

changeset-bot bot commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

⚠️ No Changeset found

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

changeset-bot bot commented Feb 11, 2026 •

edited

Loading