Add force option in curse/uncurse changeset (#17633)

* Add const for chain id in curse/uncurse tests

* Add a force option while uncursing and cursing

* Run new tests in CI

* Linting issues

Author: carte7000

.github/integration-in-memory-tests.yml

@@ -277,6 +277,16 @@ runner-test-matrix:
     test_cmd: go test smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go -run "^TestRMNCurseOneConnectedLanesLaneOnlyOnSource$" -timeout 20m -test.parallel=1 -count=1 -json
     test_go_project_path: integration-tests
 
+  - id: smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go:TestRMNUncurseForceOption
+    path: integration-tests/smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go
+    test_env_type: in-memory
+    runs_on: ubuntu-latest
+    triggers:
+      - PR Integration CCIP Tests
+      - Nightly Integration CCIP Tests
+    test_cmd: go test smoke/ccip/ccip_cs_rmn_curse_uncurse_test.go -run "^TestRMNUncurseForceOption$" -timeout 20m -test.parallel=1 -count=1 -json
+    test_go_project_path: integration-tests    
+
   - id: smoke/ccip/ccip_disable_lane_test.go:*
     path: integration-tests/smoke/ccip/ccip_disable_lane_test.go
     test_env_type: in-memory

deployment/ccip/changeset/v1_6/cs_rmn_curse_uncurse.go

@@ -40,7 +40,9 @@ type RMNCurseConfig struct {
 	CurseActions []CurseAction
 	// Use this if you need to include lanes that are not in sourcechain in the offramp. i.e. not yet migrated lane from 1.5
 	IncludeNotConnectedLanes bool
-	Reason                   string
+	// Use this if you want to include curse subject even when they are already cursed (CurseChangeset) or already uncursed (UncurseChangeset)
+	Force  bool
+	Reason string
 }
 
 func (c RMNCurseConfig) Validate(e deployment.Environment) error {
@@ -377,7 +379,7 @@ func RMNCurseChangeset(e deployment.Environment, cfg RMNCurseConfig) (deployment
 					return deployment.ChangesetOutput{}, fmt.Errorf("failed to check if chain %d is cursed: %w", selector, err)
 				}
 
-				if !cursed {
+				if !cursed || cfg.Force {
 					notAlreadyCursedSubjects = append(notAlreadyCursedSubjects, subject)
 				} else {
 					e.Logger.Warnf("chain %s subject %x is already cursed, ignoring it while cursing", cursableChains[selector].Name(), subject)
@@ -460,7 +462,7 @@ func RMNUncurseChangeset(e deployment.Environment, cfg RMNCurseConfig) (deployme
 					return deployment.ChangesetOutput{}, fmt.Errorf("failed to check if chain %d is cursed: %w", selector, err)
 				}
 
-				if cursed {
+				if cursed || cfg.Force {
 					actuallyCursedSubjects = append(actuallyCursedSubjects, subject)
 				} else {
 					e.Logger.Warnf("chain %s subject %x is not cursed, ignoring it while uncursing", cursableChains[selector].Name(), subject)