Skip to content

Fix timelock Go bindings #445

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
krebernisak merged 4 commits into from
Dec 16, 2025
Merged

Fix timelock Go bindings #445

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd3feea
Fix timelock Go bindings
krebernisak Dec 16, 2025
1413fa6
Revert removing common.WrappedAddress, use common.SnakeData
krebernisak Dec 16, 2025
5c8995c
Remove usage of SnakeData[*adress.Address]
krebernisak Dec 16, 2025
6daf5eb
Merge branch 'main' into chore/mcms-bindings-fix
krebernisak Dec 16, 2025
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 deployment/mcms/sequence/deploy_mcms.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,10 @@ func deployMCMSSequence(b operations.Bundle, deps mcmsConfig.MCMSDeps, in Deploy
QueryID: 0,
MinDelay: in.ContractsParams.Timelock.MinDelay,
Admin: in.ContractsParams.Timelock.Admin,
Proposers: common.SnakeRef[common.WrappedAddress](common.WrapAddresses(in.ContractsParams.Timelock.Proposers)),
Executors: common.SnakeRef[common.WrappedAddress](common.WrapAddresses(in.ContractsParams.Timelock.Executors)),
Cancellers: common.SnakeRef[common.WrappedAddress](common.WrapAddresses(in.ContractsParams.Timelock.Cancellers)),
Bypassers: common.SnakeRef[common.WrappedAddress](common.WrapAddresses(in.ContractsParams.Timelock.Bypassers)),
Proposers: common.SnakeData[*address.Address](in.ContractsParams.Timelock.Proposers),
Executors: common.SnakeData[*address.Address](in.ContractsParams.Timelock.Executors),
Cancellers: common.SnakeData[*address.Address](in.ContractsParams.Timelock.Cancellers),
Bypassers: common.SnakeData[*address.Address](in.ContractsParams.Timelock.Bypassers),
ExecutorRoleCheckEnabled: true,
OpFinalizationTimeout: 0,
}
Expand Down
8 changes: 4 additions & 4 deletions pkg/bindings/mcms/timelock/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ type Init struct {
Admin *address.Address `tlb:"addr"`

// Collection of addresses to be granted proposer, executor, canceller and bypasser roles.
Proposers common.SnakeRef[common.WrappedAddress] `tlb:"^"`
Executors common.SnakeRef[common.WrappedAddress] `tlb:"^"`
Cancellers common.SnakeRef[common.WrappedAddress] `tlb:"^"`
Bypassers common.SnakeRef[common.WrappedAddress] `tlb:"^"`
Proposers common.SnakeData[*address.Address] `tlb:"^"`
Executors common.SnakeData[*address.Address] `tlb:"^"`
Cancellers common.SnakeData[*address.Address] `tlb:"^"`
Bypassers common.SnakeData[*address.Address] `tlb:"^"`

// Flag to enable/disable the executor role check (if disabled, anyone can execute)
ExecutorRoleCheckEnabled bool `tlb:"bool"`
Expand Down
9 changes: 1 addition & 8 deletions pkg/ccip/bindings/common/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,12 @@ const (
ErrorDispatchNotFromMerkleRoot
)

// TODO: do we need this type anymore? common.SnakeData[*address.Address] seems to work fine.
// WrappedAddress is a simple wrapper around address.Address for TLB serialization. Needed for common.SnakeRef[] of addresses.
type WrappedAddress struct {
WrappedAddress *address.Address `tlb:"addr"`
}

func WrapAddresses(addrs []*address.Address) []WrappedAddress {
wrapped := make([]WrappedAddress, len(addrs))
for i, a := range addrs {
wrapped[i] = WrappedAddress{WrappedAddress: a}
}
return wrapped
}

// TypeAndVersion holds the type and version of the onramp contract.
type TypeAndVersion struct {
Type string `tlb:"str"`
Expand Down
Loading