Skip to content

Commit 2fb7bb2

Browse files
committed
fix: ton overrides
1 parent a3511c0 commit 2fb7bb2

2 files changed

Lines changed: 27 additions & 23 deletions

File tree

devenv/common/config.go

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,31 @@ func DeriveOCRParamsForExec(
164164
return override(params)
165165
}
166166

167+
func withTONOCRConfigOverrides(params CCIPOCRParams) CCIPOCRParams {
168+
// Source of truth: chainlink-deployments/domains/ccip/shared/chainconfigs.go:1076
169+
// TON offramp enforces one root per commit report + one message per exec report.
170+
if params.CommitOffChainConfig != nil {
171+
params.CommitOffChainConfig.MultipleReportsEnabled = true
172+
params.CommitOffChainConfig.MaxMerkleRootsPerReport = 1
173+
params.CommitOffChainConfig.MaxPricesPerReport = 3
174+
params.CommitOffChainConfig.MaxMerkleTreeSize = 10
175+
params.CommitOffChainConfig.TransmissionDelayMultiplier = 2 * time.Minute
176+
params.CommitOffChainConfig.MaxReportTransmissionCheckAttempts = 2
177+
}
178+
if params.ExecuteOffChainConfig != nil {
179+
params.ExecuteOffChainConfig.MaxReportMessages = 1
180+
params.ExecuteOffChainConfig.MaxSingleChainReports = 1
181+
params.ExecuteOffChainConfig.BatchGasLimit = 1_000_000
182+
params.ExecuteOffChainConfig.TransmissionDelayMultiplier = 2 * time.Minute
183+
params.ExecuteOffChainConfig.MaxCommitReportsToFetch = 250
184+
params.ExecuteOffChainConfig.InflightCacheExpiry = *config.MustNewDuration(1 * time.Minute)
185+
params.ExecuteOffChainConfig.MessageVisibilityInterval = *config.MustNewDuration(8 * time.Hour)
186+
params.ExecuteOffChainConfig.RootSnoozeTime = *config.MustNewDuration(5 * time.Minute)
187+
params.ExecuteOffChainConfig.MultipleReportsEnabled = true
188+
}
189+
return params
190+
}
191+
167192
type ConfigType string
168193

169194
const (

devenv/common/implcommon.go

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
chainsel "github.com/smartcontractkit/chain-selectors"
2222
mcms_types "github.com/smartcontractkit/mcms/types"
2323

24-
"github.com/smartcontractkit/chainlink-common/pkg/config"
2524
ccipocr3common "github.com/smartcontractkit/chainlink-common/pkg/types/ccipocr3"
2625
"github.com/smartcontractkit/chainlink-deployments-framework/datastore"
2726
"github.com/smartcontractkit/chainlink-deployments-framework/deployment"
@@ -34,14 +33,14 @@ import (
3433
mcmstypes "github.com/smartcontractkit/mcms/types"
3534

3635
"github.com/smartcontractkit/chainlink-ccip/chainconfig"
36+
evmdeploy "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/deploy"
3737
evmadapters "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_0_0/adapters"
3838
_ "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_5_1/adapters" // register v1.5.1 token pool adapter
3939
_ "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v1_6_1/adapters" // register v1.6.0/v1.6.1 token pool adapter
4040
_ "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/v2_0_0/adapters" // register FeeQuoter 2.0 updater for UpdateFeeQuoterChangeset
4141
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/ccip_home"
4242
"github.com/smartcontractkit/chainlink-ccip/chains/evm/gobindings/generated/v1_6_0/rmn_home"
4343
solseq "github.com/smartcontractkit/chainlink-ccip/chains/solana/deployment/v1_6_0/sequences"
44-
evmdeploy "github.com/smartcontractkit/chainlink-ccip/chains/evm/deployment/deploy"
4544
deployops "github.com/smartcontractkit/chainlink-ccip/deployment/deploy"
4645
lanesapi "github.com/smartcontractkit/chainlink-ccip/deployment/lanes"
4746
"github.com/smartcontractkit/chainlink-ccip/deployment/testadapters"
@@ -450,28 +449,8 @@ func AddNodesToContracts(
450449
if ocrParams.CommitOffChainConfig != nil {
451450
ocrParams.CommitOffChainConfig.RMNEnabled = false
452451
}
453-
// Source of truth: chainlink-deployments/domains/ccip/shared/chainconfigs.go:1076
454-
// TON offramp enforces one root per commit report + one message per exec report.
455452
if family == chainsel.FamilyTon {
456-
if ocrParams.CommitOffChainConfig != nil {
457-
ocrParams.CommitOffChainConfig.MultipleReportsEnabled = true
458-
ocrParams.CommitOffChainConfig.MaxMerkleRootsPerReport = 1
459-
ocrParams.CommitOffChainConfig.MaxPricesPerReport = 3
460-
ocrParams.CommitOffChainConfig.MaxMerkleTreeSize = 10
461-
ocrParams.CommitOffChainConfig.TransmissionDelayMultiplier = 2 * time.Minute
462-
ocrParams.CommitOffChainConfig.MaxReportTransmissionCheckAttempts = 2
463-
}
464-
if ocrParams.ExecuteOffChainConfig != nil {
465-
ocrParams.ExecuteOffChainConfig.MaxReportMessages = 1
466-
ocrParams.ExecuteOffChainConfig.MaxSingleChainReports = 1
467-
ocrParams.ExecuteOffChainConfig.BatchGasLimit = 1_000_000
468-
ocrParams.ExecuteOffChainConfig.TransmissionDelayMultiplier = 2 * time.Minute
469-
ocrParams.ExecuteOffChainConfig.MaxCommitReportsToFetch = 250
470-
ocrParams.ExecuteOffChainConfig.InflightCacheExpiry = *config.MustNewDuration(1 * time.Minute)
471-
ocrParams.ExecuteOffChainConfig.MessageVisibilityInterval = *config.MustNewDuration(8 * time.Hour)
472-
ocrParams.ExecuteOffChainConfig.RootSnoozeTime = *config.MustNewDuration(5 * time.Minute)
473-
ocrParams.ExecuteOffChainConfig.MultipleReportsEnabled = true
474-
}
453+
return withTONOCRConfigOverrides(ocrParams)
475454
}
476455
return ocrParams
477456
}

0 commit comments

Comments
 (0)