Add weth feed

integration-tests/deployment/ccip/add_chain.go

@@ -164,7 +164,7 @@ func AddDonAndSetCandidateForCommitProposal(
 		state.Chains[newChainSel].OffRamp,
 		e.Chains[newChainSel],
 		feedChainSel,
-		tokenConfig.GetTokenInfo(e.Logger, state.Chains[newChainSel].LinkToken),
+		tokenConfig.GetLinkInfo(e.Logger, state.Chains[newChainSel].LinkToken, state.Chains[newChainSel].Weth9),
 		nodes.NonBootstraps(),
 		rmnHomeAddress,
 	)

integration-tests/deployment/ccip/add_chain_test.go

@@ -42,6 +42,13 @@ func TestAddChainInbound(t *testing.T) {
 			DeviationPPB:      cciptypes.NewBigIntFromInt64(1e9),
 		},
 	)
+	tokenConfig.UpsertTokenInfo(WethSymbol,
+		pluginconfig.TokenInfo{
+			AggregatorAddress: feeds[WethSymbol].Address().String(),
+			Decimals:          WethDecimals,
+			DeviationPPB:      cciptypes.NewBigIntFromInt64(1e9),
+		},
+	)
 	err = DeployCCIPContracts(e.Env, e.Ab, DeployCCIPContractConfig{
 		HomeChainSel:       e.HomeChainSel,
 		FeedChainSel:       e.FeedChainSel,

integration-tests/deployment/ccip/changeset/initial_deploy_test.go

@@ -38,6 +38,13 @@ func TestInitialDeploy(t *testing.T) {
 			DeviationPPB:      cciptypes.NewBigIntFromInt64(1e9),
 		},
 	)
+	tokenConfig.UpsertTokenInfo(ccdeploy.WethSymbol,
+		pluginconfig.TokenInfo{
+			AggregatorAddress: feeds[ccdeploy.WethSymbol].Address().String(),
+			Decimals:          ccdeploy.WethDecimals,
+			DeviationPPB:      cciptypes.NewBigIntFromInt64(1e9),
+		},
+	)
 
 	output, err := InitialDeployChangeSet(tenv.Ab, tenv.Env, ccdeploy.DeployCCIPContractConfig{
 		HomeChainSel:       tenv.HomeChainSel,

integration-tests/deployment/ccip/deploy.go

@@ -216,7 +216,7 @@ func DeployCCIPContracts(e deployment.Environment, ab deployment.AddressBook, c
 			return err
 		}
 
-		tokenInfo := c.TokenConfig.GetTokenInfo(e.Logger, c.FeeTokenContracts[chainSel].LinkToken)
+		tokenInfo := c.TokenConfig.GetLinkInfo(e.Logger, c.FeeTokenContracts[chainSel].LinkToken, c.FeeTokenContracts[chainSel].Weth9)
 		// TODO: Do we want to extract this?
 		// Add chain config for each chain.
 		_, err = AddChainConfig(

integration-tests/deployment/ccip/propose_home_chain.go

@@ -27,7 +27,7 @@ func SetCandidateExecPluginProposal(
 		state.Chains[newChainSel].OffRamp,
 		e.Chains[newChainSel],
 		feedChainSel,
-		tokenConfig.GetTokenInfo(e.Logger, state.Chains[newChainSel].LinkToken),
+		tokenConfig.GetLinkInfo(e.Logger, state.Chains[newChainSel].LinkToken, state.Chains[newChainSel].Weth9),
 		nodes.NonBootstraps(),
 		rmnHomeAddress,
 	)

integration-tests/deployment/ccip/test_helpers.go

@@ -3,6 +3,7 @@ package ccipdeployment
 import (
 	"context"
 	"fmt"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/generated/mock_ethusd_aggregator_wrapper"
 	"math/big"
 	"sort"
 	"testing"
@@ -316,6 +317,13 @@ func NewLocalDevEnvironmentWithRMN(t *testing.T, lggr logger.Logger) (DeployedEn
 			DeviationPPB:      cciptypes.NewBigIntFromInt64(1e9),
 		},
 	)
+	tokenConfig.UpsertTokenInfo(WethSymbol,
+		pluginconfig.TokenInfo{
+			AggregatorAddress: feeds[WethSymbol].Address().String(),
+			Decimals:          WethDecimals,
+			DeviationPPB:      cciptypes.NewBigIntFromInt64(1e9),
+		},
+	)
 	// Deploy CCIP contracts.
 	err = DeployCCIPContracts(tenv.Env, tenv.Ab, DeployCCIPContractConfig{
 		HomeChainSel:       tenv.HomeChainSel,
@@ -458,49 +466,93 @@ const (
 
 var (
 	MockLinkPrice = big.NewInt(5e18)
+	MockWethPrice = big.NewInt(9e18)
 	// MockDescriptionToTokenSymbol maps a mock feed description to token descriptor
 	MockDescriptionToTokenSymbol = map[string]TokenSymbol{
 		MockLinkAggregatorDescription: LinkSymbol,
 		MockWETHAggregatorDescription: WethSymbol,
 	}
+	MockSymbolToDescription = map[TokenSymbol]string{
+		LinkSymbol: MockLinkAggregatorDescription,
+		WethSymbol: MockWETHAggregatorDescription,
+	}
+	MockSymbolToDecimals = map[TokenSymbol]uint8{
+		LinkSymbol: LinkDecimals,
+		WethSymbol: WethDecimals,
+	}
 )
 
 func DeployFeeds(lggr logger.Logger, ab deployment.AddressBook, chain deployment.Chain) (map[string]common.Address, error) {
 	linkTV := deployment.NewTypeAndVersion(PriceFeed, deployment.Version1_0_0)
-	mockLinkFeed, err := deployContract(lggr, chain, ab,
-		func(chain deployment.Chain) ContractDeploy[*aggregator_v3_interface.AggregatorV3Interface] {
-			linkFeed, tx, _, err1 := mock_v3_aggregator_contract.DeployMockV3Aggregator(
-				chain.DeployerKey,
-				chain.Client,
-				LinkDecimals,  // decimals
-				MockLinkPrice, // initialAnswer
-			)
-			aggregatorCr, err2 := aggregator_v3_interface.NewAggregatorV3Interface(linkFeed, chain.Client)
-
-			return ContractDeploy[*aggregator_v3_interface.AggregatorV3Interface]{
-				Address: linkFeed, Contract: aggregatorCr, Tv: linkTV, Tx: tx, Err: multierr.Append(err1, err2),
-			}
-		})
+	mockLinkFeed := func(chain deployment.Chain) ContractDeploy[*aggregator_v3_interface.AggregatorV3Interface] {
+		linkFeed, tx, _, err1 := mock_v3_aggregator_contract.DeployMockV3Aggregator(
+			chain.DeployerKey,
+			chain.Client,
+			LinkDecimals,  // decimals
+			MockLinkPrice, // initialAnswer
+		)
+		aggregatorCr, err2 := aggregator_v3_interface.NewAggregatorV3Interface(linkFeed, chain.Client)
+
+		return ContractDeploy[*aggregator_v3_interface.AggregatorV3Interface]{
+			Address: linkFeed, Contract: aggregatorCr, Tv: linkTV, Tx: tx, Err: multierr.Append(err1, err2),
+		}
+	}
+
+	mockWethFeed := func(chain deployment.Chain) ContractDeploy[*aggregator_v3_interface.AggregatorV3Interface] {
+		wethFeed, tx, _, err1 := mock_ethusd_aggregator_wrapper.DeployMockETHUSDAggregator(
+			chain.DeployerKey,
+			chain.Client,
+			MockWethPrice, // initialAnswer
+		)
+		aggregatorCr, err2 := aggregator_v3_interface.NewAggregatorV3Interface(wethFeed, chain.Client)
+
+		return ContractDeploy[*aggregator_v3_interface.AggregatorV3Interface]{
+			Address: wethFeed, Contract: aggregatorCr, Tv: linkTV, Tx: tx, Err: multierr.Append(err1, err2),
+		}
+	}
+
+	linkFeedAddress, linkFeedDescription, err := deploySingleFeed(lggr, ab, chain, mockLinkFeed, LinkSymbol)
 	if err != nil {
-		lggr.Errorw("Failed to deploy link feed", "err", err)
 		return nil, err
 	}
 
-	lggr.Infow("deployed mockLinkFeed", "addr", mockLinkFeed.Address)
+	wethFeedAddress, wethFeedDescription, err := deploySingleFeed(lggr, ab, chain, mockWethFeed, WethSymbol)
+
+	descriptionToAddress := map[string]common.Address{
+		linkFeedDescription: linkFeedAddress,
+		wethFeedDescription: wethFeedAddress,
+	}
 
-	desc, err := mockLinkFeed.Contract.Description(&bind.CallOpts{})
+	return descriptionToAddress, nil
+}
+
+func deploySingleFeed(
+	lggr logger.Logger,
+	ab deployment.AddressBook,
+	chain deployment.Chain,
+	deployFunc func(deployment.Chain) ContractDeploy[*aggregator_v3_interface.AggregatorV3Interface],
+	symbol TokenSymbol,
+) (common.Address, string, error) {
+	//tokenTV := deployment.NewTypeAndVersion(PriceFeed, deployment.Version1_0_0)
+	mockTokenFeed, err := deployContract(lggr, chain, ab, deployFunc)
 	if err != nil {
-		lggr.Errorw("Failed to get description", "err", err)
-		return nil, err
+		lggr.Errorw("Failed to deploy token feed", "err", err, "symbol", symbol)
+		return common.Address{}, "", err
 	}
 
-	if desc != MockLinkAggregatorDescription {
-		lggr.Errorw("Unexpected description for Link token", "desc", desc)
-		return nil, fmt.Errorf("unexpected description: %s", desc)
+	lggr.Infow("deployed mockTokenFeed", "addr", mockTokenFeed.Address)
+
+	desc, err := mockTokenFeed.Contract.Description(&bind.CallOpts{})
+	if err != nil {
+		lggr.Errorw("Failed to get description", "err", err, "symbol", symbol)
+		return common.Address{}, "", err
 	}
 
-	tvToAddress := map[string]common.Address{
-		desc: mockLinkFeed.Address,
+	if desc != MockSymbolToDescription[symbol] {
+		lggr.Errorw("Unexpected description for token", "symbol", symbol, "desc", desc)
+		return common.Address{}, "", fmt.Errorf("unexpected description: %s", desc)
 	}
-	return tvToAddress, nil
+
+	return mockTokenFeed.Address, desc, nil
+
 }

integration-tests/deployment/ccip/token_info.go

@@ -2,6 +2,7 @@ package ccipdeployment
 
 import (
 	"github.com/smartcontractkit/chainlink-ccip/pluginconfig"
+	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/ccip/generated/weth9"
 	"github.com/smartcontractkit/chainlink/v2/core/gethwrappers/shared/generated/burn_mint_erc677"
 
 	"github.com/smartcontractkit/chainlink-common/pkg/logger"
@@ -28,10 +29,11 @@ func (tc *TokenConfig) UpsertTokenInfo(
 	tc.TokenSymbolToInfo[symbol] = info
 }
 
-// GetTokenInfo Adds mapping between dest chain tokens and their respective aggregators on feed chain.
-func (tc *TokenConfig) GetTokenInfo(
+// GetLinkInfo Adds mapping between dest chain tokens and their respective aggregators on feed chain.
+func (tc *TokenConfig) GetLinkInfo(
 	lggr logger.Logger,
 	linkToken *burn_mint_erc677.BurnMintERC677,
+	wethToken *weth9.WETH9,
 ) map[ocrtypes.Account]pluginconfig.TokenInfo {
 	tokenToAggregate := make(map[ocrtypes.Account]pluginconfig.TokenInfo)
 	if _, ok := tc.TokenSymbolToInfo[LinkSymbol]; !ok {
@@ -42,7 +44,13 @@ func (tc *TokenConfig) GetTokenInfo(
 		tokenToAggregate[acc] = tc.TokenSymbolToInfo[LinkSymbol]
 	}
 
-	// TODO: Populate tokenInfo with weth and the token map in destState
+	if _, ok := tc.TokenSymbolToInfo[WethSymbol]; !ok {
+		lggr.Debugw("Weth aggregator not found, deploy without mapping link token")
+	} else {
+		lggr.Debugw("Mapping WethToken to Weth aggregator")
+		acc := ocrtypes.Account(wethToken.Address().String())
+		tokenToAggregate[acc] = tc.TokenSymbolToInfo[WethSymbol]
+	}
 
 	return tokenToAggregate
 }