CCIP-4703: Adding check for ChainFeeUpdates field

commit/chainfee/validate_observation.go

@@ -4,6 +4,8 @@ import (
 	"fmt"
 	"math/big"
 
+	"github.com/pkg/errors"
+
 	"github.com/smartcontractkit/chainlink-ccip/internal/plugincommon"
 
 	"golang.org/x/exp/maps"
@@ -21,32 +23,71 @@ func (p *processor) ValidateObservation(
 		return fmt.Errorf("failed to validate FChain: %w", err)
 	}
 
-	observerSupportedChains, err := p.chainSupport.SupportedChains(ao.OracleID)
-	if err != nil {
-		return fmt.Errorf("failed to get supported chains: %w", err)
+	if err := p.ValidateObservedChains(ao); err != nil {
+		return errors.Wrap(err, "failed to validate observed chains")
 	}
 
-	observedChains := append(maps.Keys(obs.FeeComponents), maps.Keys(obs.NativeTokenPrices)...)
+	if err := validateFeeComponents(ao); err != nil {
+		return errors.Wrap(err, "failed to validate fee components")
+	}
 
-	for _, chain := range observedChains {
-		if !observerSupportedChains.Contains(chain) {
-			return fmt.Errorf("chain %d is not supported by observer", chain)
+	if err := validateChainFeeUpdates(ao); err != nil {
+		return errors.Wrap(err, "failed to validate chain fee updates")
+	}
+
+	for _, token := range obs.NativeTokenPrices {
+		if token.Int == nil || token.Int.Cmp(zero) <= 0 {
+			return fmt.Errorf("nil or non-positive %s", "execution fee")
 		}
 	}
 
-	for _, feeComponent := range obs.FeeComponents {
-		if feeComponent.ExecutionFee == nil || feeComponent.ExecutionFee.Cmp(zero) <= 0 {
+	return nil
+}
+
+func validateChainFeeUpdates(
+	ao plugincommon.AttributedObservation[Observation],
+) error {
+	for _, update := range ao.Observation.ChainFeeUpdates {
+		if update.ChainFee.ExecutionFeePriceUSD == nil || update.ChainFee.ExecutionFeePriceUSD.Cmp(big.NewInt(0)) <= 0 {
+			return fmt.Errorf("nil or non-positive %s", "execution fee price")
+		}
+
+		if update.ChainFee.DataAvFeePriceUSD == nil || update.ChainFee.DataAvFeePriceUSD.Cmp(big.NewInt(0)) < 0 {
+			return fmt.Errorf("nil or negative %s", "data availability fee price")
+		}
+	}
+	return nil
+}
+
+func validateFeeComponents(
+	ao plugincommon.AttributedObservation[Observation],
+) error {
+	for _, feeComponent := range ao.Observation.FeeComponents {
+		if feeComponent.ExecutionFee == nil || feeComponent.ExecutionFee.Cmp(big.NewInt(0)) <= 0 {
 			return fmt.Errorf("nil or non-positive %s", "execution fee")
 		}
 
-		if feeComponent.DataAvailabilityFee == nil || feeComponent.DataAvailabilityFee.Cmp(zero) < 0 {
+		if feeComponent.DataAvailabilityFee == nil || feeComponent.DataAvailabilityFee.Cmp(big.NewInt(0)) < 0 {
 			return fmt.Errorf("nil or negative %s", "data availability fee")
 		}
 	}
+	return nil
+}
 
-	for _, token := range obs.NativeTokenPrices {
-		if token.Int == nil || token.Int.Cmp(zero) <= 0 {
-			return fmt.Errorf("nil or non-positive %s", "execution fee")
+func (p *processor) ValidateObservedChains(
+	ao plugincommon.AttributedObservation[Observation],
+) error {
+	obs := ao.Observation
+	observerSupportedChains, err := p.chainSupport.SupportedChains(ao.OracleID)
+	if err != nil {
+		return errors.Wrap(err, "failed to get supported chains")
+	}
+
+	observedChains := append(maps.Keys(obs.FeeComponents), maps.Keys(obs.NativeTokenPrices)...)
+	observedChains = append(observedChains, maps.Keys(obs.ChainFeeUpdates)...)
+	for _, chain := range observedChains {
+		if !observerSupportedChains.Contains(chain) {
+			return fmt.Errorf("chain %d is not supported by observer", chain)
 		}
 	}
 

go.mod

@@ -5,6 +5,7 @@ go 1.23.3
 require (
 	github.com/deckarep/golang-set/v2 v2.6.0
 	github.com/patrickmn/go-cache v2.1.0+incompatible
+	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.20.0
 	github.com/prometheus/client_model v0.6.1
 	github.com/smartcontractkit/chain-selectors v1.0.34
@@ -38,7 +39,6 @@ require (
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/common v0.59.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect