Skip to content

fix mcms reader #579

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stackman27 merged 9 commits into from
Jun 4, 2026
Merged

fix mcms reader #579

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4b348d6
fix mcms reader
stackman27 May 31, 2026
316b368
Merge branch 'main' into sish/update-mcms
stackman27 Jun 4, 2026
f55227a
mcms reader
stackman27 Jun 4, 2026
0b2d58c
fix hex encode
stackman27 Jun 4, 2026
7777e09
Remove scripts that should not be tracked
stackman27 Jun 4, 2026
44a1afd
Restore scripts/ to match main; drop accidental upload-localnet-dars …
stackman27 Jun 4, 2026
b469a71
use bytex for other fields
stackman27 Jun 4, 2026
6f925a1
Merge branch 'main' into sish/update-mcms
stackman27 Jun 4, 2026
932342d
bump go-daml
stackman27 Jun 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions bindings/generated/latest/ccip/burnminttokenpool/burnminttokenpool.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/committeeverifier/committeeverifier.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions bindings/generated/latest/ccip/core/core.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/generated/latest/ccip/factory/factory.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bindings/generated/latest/ccip/lockreleasetokenpool/lockreleasetokenpool.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions contracts/cmd/bindings/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,14 @@ func main() {
"root": true, // Merkle root hash (32 bytes)
"newRoot": true, // New merkle root hash (32 bytes)
"versionTag": true, // CCV version tag is a 4-byte BytesHex field
"onRampAddresses": true, // Daml [BytesHex] → hex:"[]bytes" on []types.TEXT
"signerKeys": true, // Daml [BytesHex] → hex:"[]bytes" on []types.TEXT
"offRampAddress": true, // Daml BytesHex scalar → hex:"bytes" on types.TEXT
"subject": true, // Daml BytesHex scalar → hex:"bytes"; RMNRemote Curse/Uncurse subject (chain selector hash)
"remoteTokenAddress": true, // Daml BytesHex scalar → hex:"bytes"; token pool remote token address on dest chain
"subjects": true, // Daml [BytesHex] → hex:"[]bytes"; RMNRemote CurseMultiple/UncurseMultiple
"cursedSubjects": true, // Daml [BytesHex] → hex:"[]bytes"; Factory DeployRMNRemote initial cursed subjects
"remotePools": true, // Daml [BytesHex] → hex:"[]bytes"; token pool allowed remote pool addresses per chain
},
// hex:"bytes16" — fields that may exceed 255 bytes (uint16 length prefix)
BytesHexFields: map[string]bool{
Expand Down
5 changes: 2 additions & 3 deletions deployment/utils/mcms/proposal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,14 @@ func GenerateTimelockProposal(
return nil, fmt.Errorf("failed to get MCMS contract state: %w", err)
}

txCount := countTransactions(batchOps)
multisigId := makeMultisigId(string(mcmsContract.InstanceId), string(mcmsContract.Owner), config.Role)

// postOpCount and overridePreviousRoot are applied at sign/execute time by mcms (encoder + executor), not in chainMetadata.
metadata, err := cantonsdk.NewChainMetadata(
opCount,
opCount+txCount,
int64(mcmsContract.ChainId),
multisigId,
mcmsAddrHex,
config.OverridePreviousRoot,
string(mcmsContract.InstanceId),
)
if err != nil {
Expand All @@ -109,6 +107,7 @@ func GenerateTimelockProposal(
SetVersion("v1").
SetValidUntil(validUntil).
SetDescription(config.Description).
SetOverridePreviousRoot(config.OverridePreviousRoot).
AddTimelockAddress(config.ChainSelector, timelockAddr).
AddChainMetadata(config.ChainSelector, metadata).
SetAction(config.Action)
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ require (
github.com/smartcontractkit/chainlink-deployments-framework v0.108.0
github.com/smartcontractkit/chainlink-testing-framework/framework v0.16.4
github.com/smartcontractkit/chainlink-testing-framework/wasp v1.51.3
github.com/smartcontractkit/go-daml v0.0.0-20260601190909-414e6d9dc2bd
github.com/smartcontractkit/go-daml v0.0.0-20260604143752-c6f6567940ba
github.com/stretchr/testify v1.11.1
github.com/testcontainers/testcontainers-go v0.42.0
go.opentelemetry.io/otel v1.44.0
Expand Down Expand Up @@ -451,7 +451,7 @@ require (
github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad // indirect
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
github.com/smartcontractkit/libocr v0.0.0-20260304194147-a03701e2c02e // indirect
github.com/smartcontractkit/mcms v0.45.2-0.20260602204056-81248906ce6a
github.com/smartcontractkit/mcms v0.45.2-0.20260604053848-48d8a8691ced
github.com/smartcontractkit/wsrpc v0.8.5-0.20250502134807-c57d3d995945 // indirect
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
github.com/speakeasy-api/jsonpath v0.6.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1230,14 +1230,14 @@ github.com/smartcontractkit/chainlink/v2 v2.29.0 h1:MyvQ/LAhHw//yDXgo2EvH7jq4NH3
github.com/smartcontractkit/chainlink/v2 v2.29.0/go.mod h1:6SHH9QHlKh1mKuEhG8Y7nGutUzhQwu1Qrpp/0qLzaR0=
github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad h1:lgHxTHuzJIF3Vj6LSMOnjhqKgRqYW+0MV2SExtCYL1Q=
github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad/go.mod h1:T4zH9R8R8lVWKfU7tUvYz2o2jMv1OpGCdpY2j2QZXzU=
github.com/smartcontractkit/go-daml v0.0.0-20260601190909-414e6d9dc2bd h1:t8V2eqMZFoVXFMf+BHeti0zHeMDQ2ss4QngGtyFbGMs=
github.com/smartcontractkit/go-daml v0.0.0-20260601190909-414e6d9dc2bd/go.mod h1:SqWfl3Bp9NleC9jhzFUaOGzOZeKfldpY4QOW6A6NSNM=
github.com/smartcontractkit/go-daml v0.0.0-20260604143752-c6f6567940ba h1:peYJwUWOv54aigdk1VFzkmXdZmZK4xixfxv0Af1l6/I=
github.com/smartcontractkit/go-daml v0.0.0-20260604143752-c6f6567940ba/go.mod h1:SqWfl3Bp9NleC9jhzFUaOGzOZeKfldpY4QOW6A6NSNM=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20260304194147-a03701e2c02e h1:poXTj5cFVM6XfC4HICIDYkDVc/A6OYB0eeID0wU2JQE=
github.com/smartcontractkit/libocr v0.0.0-20260304194147-a03701e2c02e/go.mod h1:PLdNK6GlqfxIWXzziPkU7dCAVlVFeYkyyW7AQY0R+4Q=
github.com/smartcontractkit/mcms v0.45.2-0.20260602204056-81248906ce6a h1:iUSbJqRa4pqmm4v4yvRUqFB4I9mW1zj/yNkkd6I/k0w=
github.com/smartcontractkit/mcms v0.45.2-0.20260602204056-81248906ce6a/go.mod h1:asEx9cQTOCz6p6KJececNlqVdVS72IX3x8Xpha9+nqw=
github.com/smartcontractkit/mcms v0.45.2-0.20260604053848-48d8a8691ced h1:pGCTXKk/EwBO5qgwR4LM9B+aWJA0hZj0JIj0Y3bME3w=
github.com/smartcontractkit/mcms v0.45.2-0.20260604053848-48d8a8691ced/go.mod h1:asEx9cQTOCz6p6KJececNlqVdVS72IX3x8Xpha9+nqw=
github.com/smartcontractkit/wsrpc v0.8.5-0.20250502134807-c57d3d995945 h1:zxcODLrFytOKmAd8ty8S/XK6WcIEJEgRBaL7sY/7l4Y=
github.com/smartcontractkit/wsrpc v0.8.5-0.20250502134807-c57d3d995945/go.mod h1:m3pdp17i4bD50XgktkzWetcV5yaLsi7Gunbv4ZgN6qg=
github.com/sony/gobreaker/v2 v2.1.0 h1:av2BnjtRmVPWBvy5gSFPytm1J8BmN5AGhq875FfGKDM=
Expand Down
4 changes: 2 additions & 2 deletions integration-tests/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ require (
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260506120607-7f10be016c89
github.com/smartcontractkit/chainlink-deployments-framework v0.108.0
github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad
github.com/smartcontractkit/go-daml v0.0.0-20260601190909-414e6d9dc2bd
github.com/smartcontractkit/mcms v0.45.2-0.20260602204056-81248906ce6a
github.com/smartcontractkit/go-daml v0.0.0-20260604143752-c6f6567940ba
github.com/smartcontractkit/mcms v0.45.2-0.20260604053848-48d8a8691ced
github.com/stretchr/testify v1.11.1
google.golang.org/protobuf v1.36.11
)
Expand Down
8 changes: 4 additions & 4 deletions integration-tests/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,14 +770,14 @@ github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.202510141
github.com/smartcontractkit/chainlink-tron/relayer/gotron-sdk v0.0.5-0.20251014120029-d73d15cc23f7/go.mod h1:ea1LESxlSSOgc2zZBqf1RTkXTMthHaspdqUHd7W4lF0=
github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad h1:lgHxTHuzJIF3Vj6LSMOnjhqKgRqYW+0MV2SExtCYL1Q=
github.com/smartcontractkit/freeport v0.1.3-0.20250828155247-add56fa28aad/go.mod h1:T4zH9R8R8lVWKfU7tUvYz2o2jMv1OpGCdpY2j2QZXzU=
github.com/smartcontractkit/go-daml v0.0.0-20260601190909-414e6d9dc2bd h1:t8V2eqMZFoVXFMf+BHeti0zHeMDQ2ss4QngGtyFbGMs=
github.com/smartcontractkit/go-daml v0.0.0-20260601190909-414e6d9dc2bd/go.mod h1:SqWfl3Bp9NleC9jhzFUaOGzOZeKfldpY4QOW6A6NSNM=
github.com/smartcontractkit/go-daml v0.0.0-20260604143752-c6f6567940ba h1:peYJwUWOv54aigdk1VFzkmXdZmZK4xixfxv0Af1l6/I=
github.com/smartcontractkit/go-daml v0.0.0-20260604143752-c6f6567940ba/go.mod h1:SqWfl3Bp9NleC9jhzFUaOGzOZeKfldpY4QOW6A6NSNM=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 h1:12ijqMM9tvYVEm+nR826WsrNi6zCKpwBhuApq127wHs=
github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7/go.mod h1:FX7/bVdoep147QQhsOPkYsPEXhGZjeYx6lBSaSXtZOA=
github.com/smartcontractkit/libocr v0.0.0-20260304194147-a03701e2c02e h1:poXTj5cFVM6XfC4HICIDYkDVc/A6OYB0eeID0wU2JQE=
github.com/smartcontractkit/libocr v0.0.0-20260304194147-a03701e2c02e/go.mod h1:PLdNK6GlqfxIWXzziPkU7dCAVlVFeYkyyW7AQY0R+4Q=
github.com/smartcontractkit/mcms v0.45.2-0.20260602204056-81248906ce6a h1:iUSbJqRa4pqmm4v4yvRUqFB4I9mW1zj/yNkkd6I/k0w=
github.com/smartcontractkit/mcms v0.45.2-0.20260602204056-81248906ce6a/go.mod h1:asEx9cQTOCz6p6KJececNlqVdVS72IX3x8Xpha9+nqw=
github.com/smartcontractkit/mcms v0.45.2-0.20260604053848-48d8a8691ced h1:pGCTXKk/EwBO5qgwR4LM9B+aWJA0hZj0JIj0Y3bME3w=
github.com/smartcontractkit/mcms v0.45.2-0.20260604053848-48d8a8691ced/go.mod h1:asEx9cQTOCz6p6KJececNlqVdVS72IX3x8Xpha9+nqw=
github.com/smartcontractkit/wsrpc v0.8.5-0.20250502134807-c57d3d995945 h1:zxcODLrFytOKmAd8ty8S/XK6WcIEJEgRBaL7sY/7l4Y=
github.com/smartcontractkit/wsrpc v0.8.5-0.20250502134807-c57d3d995945/go.mod h1:m3pdp17i4bD50XgktkzWetcV5yaLsi7Gunbv4ZgN6qg=
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw=
Expand Down
Loading