Merge develop and resolve go.mod/go.sum conflicts

Author: nadahalli

.changeset/bright-pens-glow.md

@@ -0,0 +1,5 @@
+---
+"chainlink": patch
+---
+
+#added Add ListPendingJobProposals and ApproveJobProposalByID to the GQL SDK Client

.github/copilot-instructions.md

@@ -18,3 +18,11 @@ Identify specific code blocks that require **scrupulous human review**. Focus on
 Analyze the `CODEOWNERS` file and the git history (recent editors) to suggest the most qualified reviewers.
 - Prioritize individuals who have made significant recent contributions to the specific files modified.
 - Cross-reference these contributors with the defined `CODEOWNERS` for the directory.
+
+### 4. Code Style
+Give style advice based on the following guides, in order of priority.
+1. [Effective Go](https://go.dev/doc/effective_go)
+2. [Google Code Review Comments](https://go.dev/wiki/CodeReviewComments)
+3. [Google Style Guide](https://google.github.io/styleguide/go/)
+
+Style exceptions are acceptable when aligning with pre-existing "local" style from the same file or package, but they should still be noted.

core/scripts/go.mod

@@ -487,11 +487,11 @@ require (
 	github.com/smartcontractkit/ccip-owner-contracts v0.1.0 // indirect
 	github.com/smartcontractkit/chain-selectors v1.0.97 // indirect
 	github.com/smartcontractkit/chainlink-aptos v0.0.0-20260318173523-755cafb24200 // indirect
-	github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319175550-83cf59fe6839 // indirect
+	github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260323224438-d819cb3228e1 // indirect
 	github.com/smartcontractkit/chainlink-ccip/chains/solana v0.0.0-20260310183131-8d0f0e383288 // indirect
 	github.com/smartcontractkit/chainlink-ccip/chains/solana/gobindings v0.0.0-20260310183131-8d0f0e383288 // indirect
 	github.com/smartcontractkit/chainlink-ccip/deployment v0.0.0-20260317185256-d5f7db87ae70 // indirect
-	github.com/smartcontractkit/chainlink-ccv v0.0.0-20260320145055-eb20b529ff95 // indirect
+	github.com/smartcontractkit/chainlink-ccv v0.0.0-20260324000441-d4cfddc9f7d2 // indirect
 	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.11-0.20251211140724-319861e514c4 // indirect
 	github.com/smartcontractkit/chainlink-evm/contracts/cre/gobindings v0.0.0-20260107191744-4b93f62cffe3 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect

core/scripts/go.sum

@@ -262,6 +262,12 @@ type TokenPoolConfig struct {
 
 	// SkipOwnershipValidation, if true, skips validation of ownership on the token pool. Optional, defaults to false.
 	SkipOwnershipValidation bool `json:"skipOwnershipValidation,omitempty"`
+
+	// AllowAdditiveRemotePools, if true, allows adding additional remote pools to existing chain configurations
+	// without removing and re-adding the chain selector. When false (default), the behavior is to remove
+	// the chain selector and re-add it with the new pool configuration (spot replacement).
+	// This is particularly useful for Solana and other chains where multiple pools may need to coexist.
+	AllowAdditiveRemotePools bool `json:"allowAdditiveRemotePools,omitempty"`
 }
 
 func (c TokenPoolConfig) Validate(ctx context.Context, chain cldf_evm.Chain, ccipState stateview.CCIPOnChainState, useMcms bool, tokenSymbol shared.TokenSymbol) error {
@@ -482,13 +488,29 @@ func configureTokenPool(
 					break
 				}
 			}
-			if !bytes.Equal(remoteTokenAddress.Bytes(), remoteToken) || !isRemotePoolSupported {
-				// Remove & later re-add the chain if the remote token has changed OR the remote pool address is not supported
+
+			// Determine the action based on token and pool status
+			switch {
+			case !bytes.Equal(remoteTokenAddress.Bytes(), remoteToken):
+				// Remote token has changed - this always requires chain removal/re-addition
 				chainRemovals = append(chainRemovals, remoteChainSelector)
 				addChain = true
-			} else {
-				// Update the rate limits if the chain is already supported
-				// We dont need to add a new remote pool because solana only supports one remote pool per token
+			case !isRemotePoolSupported:
+				// Remote pool is not supported - behavior depends on AllowAdditiveRemotePools flag
+				if poolUpdate.AllowAdditiveRemotePools {
+					// Add the new remote pool without removing the chain
+					remotePoolAddressAdditions[remoteChainSelector] = common.LeftPadBytes(remotePoolAddress.Bytes(), 32)
+					// Also update rate limits
+					remoteChainSelectorsToUpdate = append(remoteChainSelectorsToUpdate, remoteChainSelector)
+					updatedOutboundConfigs = append(updatedOutboundConfigs, chainUpdate.RateLimiterConfig.Outbound)
+					updatedInboundConfigs = append(updatedInboundConfigs, chainUpdate.RateLimiterConfig.Inbound)
+				} else {
+					// Default behavior: Remove & later re-add the chain (spot replacement)
+					chainRemovals = append(chainRemovals, remoteChainSelector)
+					addChain = true
+				}
+			default:
+				// Remote pool is already supported, just update the rate limits
 				remoteChainSelectorsToUpdate = append(remoteChainSelectorsToUpdate, remoteChainSelector)
 				updatedOutboundConfigs = append(updatedOutboundConfigs, chainUpdate.RateLimiterConfig.Outbound)
 				updatedInboundConfigs = append(updatedInboundConfigs, chainUpdate.RateLimiterConfig.Inbound)
@@ -500,8 +522,8 @@ func configureTokenPool(
 				RemoteChainSelector:       remoteChainSelector,
 				InboundRateLimiterConfig:  chainUpdate.RateLimiterConfig.Inbound,
 				OutboundRateLimiterConfig: chainUpdate.RateLimiterConfig.Outbound,
-				RemoteTokenAddress:        remoteTokenAddress.Bytes(),
-				RemotePoolAddresses:       [][]byte{remotePoolAddress.Bytes()},
+				RemoteTokenAddress:        common.LeftPadBytes(remoteTokenAddress.Bytes(), 32),
+				RemotePoolAddresses:       [][]byte{common.LeftPadBytes(remotePoolAddress.Bytes(), 32)},
 			})
 		}
 	}
@@ -587,7 +609,9 @@ func configureTokenPool(
 				}
 			}
 			// Check if the remote pool to-be-set is non-empty and not already configured on the token pool
-			if len(remotePoolAddress) == 0 && !isRemotePoolSupported {
+			// For Sui, the default behavior has always been additive, so we maintain backward compatibility
+			// The AllowAdditiveRemotePools flag doesn't change Sui's existing behavior
+			if len(remotePoolAddress) > 0 && !isRemotePoolSupported {
 				remotePoolAddressAdditions[remoteChainSelector] = common.LeftPadBytes(remotePoolAddress, 32)
 			}
 		} else {

deployment/ccip/changeset/v1_5_1/cs_configure_token_pools.go

@@ -1,13 +1,33 @@
 ## GQL SDK
 
-This package exports a `Client` for interacting with the `feeds-manager` service of core. The implementation is based on code generated via `[genqlient](https://github.com/Khan/genqlient)`.
+This package exports a `Client` for interacting with the `feeds-manager` service of core. The implementation is based on code generated via [genqlient](https://github.com/Khan/genqlient).
+
+### Structure
+
+```
+client/          # Client interface, implementation, and types
+internal/        # GraphQL queries/mutations and generated code
+  genqlient.graphql
+  generated/
+```
+
+### Prerequisites
+
+- [go-task](https://taskfile.dev/) (`task` CLI)
+- Go 1.21+
 
 ### Extending the Client
 
-Add additional queries or mutations to `genqlient.graphql` and then regenerate the implementation via the Taskfile:
+If your feature requires **new GraphQL operations**, add queries or mutations to `genqlient.graphql` and then regenerate the implementation via the Taskfile:
 
 ```bash
 $ task generate
 ```
 
 Next, extend the `Client` interface and the `client` implementation.
+
+If your feature **composes existing operations** (e.g. filtering or combining results from already-generated queries), you can extend the `Client` interface and implementation directly without modifying `genqlient.graphql` or regenerating.
+
+### Usage
+
+See `devenv/don.go` and `keystone/scripts/main.go` for real-world usage examples.

deployment/environment/web/sdk/README.md

@@ -37,6 +37,8 @@ type Client interface {
 	CancelJobProposalSpec(ctx context.Context, id string) (*generated.CancelJobProposalSpecCancelJobProposalSpecCancelJobProposalSpecSuccessSpecJobProposalSpec, error)
 	RejectJobProposalSpec(ctx context.Context, id string) (*generated.RejectJobProposalSpecResponse, error)
 	UpdateJobProposalSpecDefinition(ctx context.Context, id string, cmd generated.UpdateJobProposalSpecDefinitionInput) (*generated.UpdateJobProposalSpecDefinitionResponse, error)
+	ListPendingJobProposals(ctx context.Context) ([]PendingJobProposal, error)
+	ApproveJobProposalByID(ctx context.Context, proposalID string, force bool) (*JobProposalApprovalSuccessSpec, error)
 }
 
 type client struct {
@@ -405,6 +407,46 @@ func (c *client) login() error {
 	return fmt.Errorf("no set-cookie found in header. Check credentials and scheme. Response code was: %d", res.StatusCode)
 }
 
+// ListPendingJobProposals returns all job proposals whose latest spec has a
+// pending status, across all job distributors registered on the node.
+func (c *client) ListPendingJobProposals(ctx context.Context) ([]PendingJobProposal, error) {
+	resp, err := generated.ListFeedsManagers(ctx, c.gqlClient)
+	if err != nil {
+		return nil, fmt.Errorf("failed to list job distributors: %w", err)
+	}
+	if resp == nil {
+		return nil, errors.New("unexpected nil response from list job distributors")
+	}
+
+	var pending []PendingJobProposal
+	for _, fm := range resp.FeedsManagers.Results {
+		for _, jp := range fm.JobProposals {
+			if jp.LatestSpec.Status == generated.SpecStatusPending {
+				pending = append(pending, PendingJobProposal{
+					ProposalID:       jp.Id,
+					SpecID:           jp.LatestSpec.Id,
+					ProposalStatus:   string(jp.Status),
+					SpecStatus:       string(jp.LatestSpec.Status),
+					Definition:       jp.LatestSpec.Definition,
+					Version:          jp.LatestSpec.Version,
+					JobDistributorID: fm.Id,
+				})
+			}
+		}
+	}
+	return pending, nil
+}
+
+// ApproveJobProposalByID looks up a job proposal by its proposal ID, resolves
+// the latest spec, and approves it.
+func (c *client) ApproveJobProposalByID(ctx context.Context, proposalID string, force bool) (*JobProposalApprovalSuccessSpec, error) {
+	proposal, err := c.GetJobProposal(ctx, proposalID)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get job proposal %s: %w", proposalID, err)
+	}
+	return c.ApproveJobProposalSpec(ctx, proposal.LatestSpec.Id, force)
+}
+
 // CreateOCR2KeyBundle creates a new OCR2 key bundle for the specified chain type
 // and returns the ID of the created bundle
 func (c *client) CreateOCR2KeyBundle(ctx context.Context, chainType string) (string, error) {

deployment/environment/web/sdk/client/client.go

@@ -61,6 +61,17 @@ func DecodeInput(in, out any) error {
 	return decoder.Decode(out)
 }
 
+// PendingJobProposal represents a job proposal with a pending latest spec
+type PendingJobProposal struct {
+	ProposalID       string `json:"proposalId"`
+	SpecID           string `json:"specId"`
+	ProposalStatus   string `json:"proposalStatus"`
+	SpecStatus       string `json:"specStatus"`
+	Definition       string `json:"definition"`
+	Version          int    `json:"version"`
+	JobDistributorID string `json:"jobDistributorId"`
+}
+
 type OCR2ChainType = string
 
 const (

deployment/environment/web/sdk/client/types.go

@@ -421,8 +421,8 @@ require (
 	github.com/sigurn/crc16 v0.0.0-20211026045750-20ab5afb07e3 // indirect
 	github.com/sirupsen/logrus v1.9.4 // indirect
 	github.com/smartcontractkit/chainlink-automation v0.8.1 // indirect
-	github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260319175550-83cf59fe6839 // indirect
-	github.com/smartcontractkit/chainlink-ccv v0.0.0-20260320145055-eb20b529ff95 // indirect
+	github.com/smartcontractkit/chainlink-ccip/ccv/chains/evm v0.0.0-20260323224438-d819cb3228e1 // indirect
+	github.com/smartcontractkit/chainlink-ccv v0.0.0-20260324000441-d4cfddc9f7d2 // indirect
 	github.com/smartcontractkit/chainlink-common/pkg/chipingress v0.0.10 // indirect
 	github.com/smartcontractkit/chainlink-data-streams v0.1.13 // indirect
 	github.com/smartcontractkit/chainlink-feeds v0.1.2-0.20250227211209-7cd000095135 // indirect