Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions core/scripts/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ require (
github.com/smartcontractkit/chainlink-common v0.11.2-0.20260403093224-b39dab3bfe2a
github.com/smartcontractkit/chainlink-common/keystore v1.0.2
github.com/smartcontractkit/chainlink-data-streams v0.1.13
github.com/smartcontractkit/chainlink-deployments-framework v0.86.3
github.com/smartcontractkit/chainlink-deployments-framework v0.93.1
github.com/smartcontractkit/chainlink-evm v0.3.4-0.20260330133421-5151ea0c3b05
github.com/smartcontractkit/chainlink-evm/gethwrappers v0.0.0-20260119171452-39c98c3b33cd
github.com/smartcontractkit/chainlink-protos/cre/go v0.0.0-20260326111235-8c09d1a4491f
github.com/smartcontractkit/chainlink-protos/job-distributor v0.18.0
github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.12
github.com/smartcontractkit/chainlink-testing-framework/framework v0.15.13
github.com/smartcontractkit/chainlink-testing-framework/framework/components/dockercompose v0.1.20
github.com/smartcontractkit/chainlink-testing-framework/lib v1.54.5
github.com/smartcontractkit/chainlink-testing-framework/seth v1.51.5
Expand Down Expand Up @@ -118,21 +118,21 @@ require (
github.com/avast/retry-go v3.0.0+incompatible // indirect
github.com/awalterschulze/gographviz v2.0.3+incompatible // indirect
github.com/aws/aws-sdk-go v1.55.8 // indirect
github.com/aws/aws-sdk-go-v2 v1.41.3 // indirect
github.com/aws/aws-sdk-go-v2/config v1.32.10 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.19.10 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.19 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.19 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.59.1 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18 // indirect
github.com/aws/aws-sdk-go-v2 v1.41.4 // indirect
github.com/aws/aws-sdk-go-v2/config v1.32.12 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.19.12 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.59.2 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 // indirect
github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.34.2 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.0.6 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.30.11 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.41.7 // indirect
github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.30.13 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.17 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.41.9 // indirect
github.com/aws/constructs-go/constructs/v10 v10.4.2 // indirect
github.com/aws/jsii-runtime-go v1.112.0 // indirect
github.com/aws/smithy-go v1.24.2 // indirect
Expand Down Expand Up @@ -520,7 +520,7 @@ require (
github.com/smartcontractkit/chainlink-tron/relayer v0.0.11-0.20260218133534-cbd44da2856b // indirect
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/mcms v0.38.2 // indirect
github.com/smartcontractkit/mcms v0.39.0 // indirect
github.com/smartcontractkit/smdkg v0.0.0-20251029093710-c38905e58aeb // indirect
github.com/smartcontractkit/tdh2/go/ocr2/decryptionplugin v0.0.0-20241009055228-33d0c0bf38de // indirect
github.com/smartcontractkit/tdh2/go/tdh2 v0.0.0-20251120172354-e8ec0386b06c // indirect
Expand Down
68 changes: 34 additions & 34 deletions core/scripts/go.sum

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

4 changes: 4 additions & 0 deletions deployment/common/changeset/test_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,10 @@ func ApplyChangesets(t *testing.T, e cldf.Environment, changesetApplications []C
// This has been a cause of flakiness in the past (caused an AlreadyScheduled error).
saltOverride := utils.RandomHash()
prop.SaltOverride = &saltOverride
_, err = prop.SetOperationIDs(t.Context(), true)
if err != nil {
return cldf.Environment{}, nil, fmt.Errorf("failed to set operation IDs for timelock proposal: %w", err)
}

p := proposalutils.SignMCMSTimelockProposal(t, currentEnv, &prop, opt.realBackend)
err = proposalutils.ExecuteMCMSProposalV2(t, currentEnv, p)
Expand Down
11 changes: 9 additions & 2 deletions deployment/common/proposalutils/propose.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ func (c *ChainMetadata) Set(chainSelector uint64, key string, value any) *ChainM
type BuildProposalOption func(*buildProposalOptions)

type buildProposalOptions struct {
clock func() time.Time
chainMetadata ChainMetadata
}

Expand All @@ -209,6 +210,12 @@ func WithChainMetadata(chainMetadata ChainMetadata) BuildProposalOption {
}
}

func WithClock(clock func() time.Time) BuildProposalOption {
return func(opts *buildProposalOptions) {
opts.clock = clock
}
}

// BuildProposalFromBatchesV2 uses the new MCMS library which replaces the implementation in BuildProposalFromBatches.
func BuildProposalFromBatchesV2(
e cldf.Environment,
Expand All @@ -220,7 +227,7 @@ func BuildProposalFromBatchesV2(
mcmsCfg TimelockConfig,
opts ...BuildProposalOption,
) (*mcmslib.TimelockProposal, error) {
buildOptions := buildProposalOptions{}
buildOptions := buildProposalOptions{clock: time.Now}
for _, opt := range opts {
opt(&buildOptions)
}
Expand Down Expand Up @@ -252,7 +259,7 @@ func BuildProposalFromBatchesV2(
if mcmsCfg.ValidDuration != nil {
proposalDuration = mcmsCfg.ValidDuration.Duration()
}
validUntil := time.Now().Add(proposalDuration).Unix()
validUntil := buildOptions.clock().Add(proposalDuration).Unix()

builder := mcmslib.NewTimelockProposalBuilder()
builder.
Expand Down
Loading
Loading