pushing changes

smartcontractkit · Feb 26, 2025 · c107307 · c107307
1 parent 82268d5
commit c107307
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/deployment/ccip/changeset/globals/config.go b/deployment/ccip/changeset/globals/config.go
@@ -10,7 +10,7 @@ const (
 	ConfigTypeActive    ConfigType = "active"
 	ConfigTypeCandidate ConfigType = "candidate"
 	// ========= Changeset Defaults =========
-	PermissionLessExecutionThreshold        = 8 * time.Hour
+	PermissionLessExecutionThreshold        = 86400 * time.Second
 	RemoteGasPriceBatchWriteFrequency       = 30 * time.Minute
 	TokenPriceBatchWriteFrequency           = 30 * time.Minute
 	BatchGasLimit                           = 6_500_000

diff --git a/deployment/environment/crib/ccip_deployer.go b/deployment/environment/crib/ccip_deployer.go
@@ -213,7 +213,7 @@ func ConnectCCIPLanes(ctx context.Context, lggr logger.Logger, envConfig devenv.
 
 // ConfigureCCIPOCR is a group of changesets used from CRIB to redeploy the chainlink don on an existing setup
 func ConfigureCCIPOCR(ctx context.Context, lggr logger.Logger, envConfig devenv.EnvironmentConfig, homeChainSel, feedChainSel uint64, ab deployment.AddressBook) (DeployCCIPOutput, error) {
-	e, _, err := devenv.NewEnvironment(func() context.Context { return ctx }, lggr, envConfig)
+	e, don, err := devenv.NewEnvironment(func() context.Context { return ctx }, lggr, envConfig)
 	if err != nil {
 		return DeployCCIPOutput{}, fmt.Errorf("failed to initiate new environment: %w", err)
 	}
@@ -224,6 +224,10 @@ func ConfigureCCIPOCR(ctx context.Context, lggr logger.Logger, envConfig devenv.
 	if err != nil {
 		return DeployCCIPOutput{}, fmt.Errorf("failed to apply changesets for setting up OCR: %w", err)
 	}
+	err = distributeTransmitterFunds(lggr, don.PluginNodes(), *e)
+	if err != nil {
+		return DeployCCIPOutput{}, err
+	}
 
 	addresses, err := e.ExistingAddresses.Addresses()
 	if err != nil {

diff --git a/integration-tests/load/ccip/destination_gun.go b/integration-tests/load/ccip/destination_gun.go
@@ -129,8 +129,8 @@ func (m *DestinationGun) Call(_ *wasp.Generator) *wasp.Response {
 		defer func() { acc.Value = nil }()
 	}
 	// todo: remove once CCIP-5143 is implemented
-	acc.GasLimit = *m.testConfig.GasLimit
-	
+	//acc.GasLimit = *m.testConfig.GasLimit
+
 	m.l.Debugw("sending message ",
 		"srcChain", src,
 		"dstChain", m.chainSelector,

diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod
@@ -29,6 +29,8 @@ require (
 	github.com/smartcontractkit/chainlink-ccip v0.0.0-20250226083129-e596590f48f7
 	github.com/smartcontractkit/chainlink-common v0.4.2-0.20250221174903-e1e47fdb11b0
 	github.com/smartcontractkit/chainlink-integrations/evm v0.0.0-20250213145514-41d874782c02
+	github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e
+	github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e
 	github.com/smartcontractkit/chainlink-testing-framework/lib v1.51.1-0.20250225210020-fc215b29321e
 	github.com/smartcontractkit/chainlink-testing-framework/seth v1.50.14-0.20250225174253-0fe1e95e89b2
 	github.com/smartcontractkit/chainlink-testing-framework/wasp v1.50.6-0.20250225210020-fc215b29321e
@@ -439,8 +441,6 @@ require (
 	github.com/smartcontractkit/chainlink-protos/rmn/v1.6/go v0.0.0-20250131130834-15e0d4cde2a6 // indirect
 	github.com/smartcontractkit/chainlink-protos/svr v0.0.0-20250123084029-58cce9b32112 // indirect
 	github.com/smartcontractkit/chainlink-solana v1.1.2-0.20250213203720-e15b1333a14a // indirect
-	github.com/smartcontractkit/chainlink-testing-framework/framework v0.5.8-0.20250225210020-fc215b29321e // indirect
-	github.com/smartcontractkit/chainlink-testing-framework/havoc v1.50.5-0.20250225210020-fc215b29321e // indirect
 	github.com/smartcontractkit/chainlink-testing-framework/lib/grafana v1.50.1-0.20250225210020-fc215b29321e // indirect
 	github.com/smartcontractkit/grpc-proxy v0.0.0-20240830132753-a7e17fec5ab7 // indirect
 	github.com/smartcontractkit/libocr v0.0.0-20250220133800-f3b940c4f298 // indirect

diff --git a/integration-tests/testconfig/ccip/ccip.toml b/integration-tests/testconfig/ccip/ccip.toml
@@ -244,9 +244,9 @@ ephemeral_addresses_number = 0
 [Load.CCIP.Load]
 # 0 - no chaos, 1 - rpc latency, 2 - full chaos suite
 ChaosMode = 1
-# works only with Load.CCIP.ChaosMode = 0
+# works only with Load.CCIP.ChaosMode = 1
 RPCLatency = "400ms"
-RPCJitter = "50ms"
+RPCJitter = "0ms"
 # MessageTypeWeights corresponds with [data only, token only, message with token]
 MessageTypeWeights = [10,45,45]
 # each destination chain will receive 1 incoming request per RequestFrequency for the duration of LoadDuration
@@ -262,12 +262,12 @@ GasLimit = 700_000
 
 [CCIP.Chaos]
 # works only with Load.CCIP.ChaosMode = 2
-Namespace = "crib-ccip-chaos-tests"
+Namespace = "crib-aw-remote"
 # RPC, commit, exec dashboards, can be found here: https://grafana.ops.prod.cldev.sh/d/dde396ff-5d22-42fb-9e92-00845c17688c/load-ccipv2-exec-plugin-v2?orgId=1&editview=dashboard_json
 DashboardUIDs = ["e08d9f98-a39a-4603-8b44-e9a2958330e4", "ed3d5742-57cb-440f-b432-65f229c124ec", "dde396ff-5d22-42fb-9e92-00845c17688c"]
-WaitBeforeStart = "30s"
+WaitBeforeStart = "0s"
 # Chaos experiment total duration (chaos + recovery)
-ExperimentFullInterval = "10m"
+ExperimentFullInterval = "1h"
 # Chaos time
 ExperimentInjectionInterval = "5m"
 # Src and Dst chain URLs, change it according to your namespace name