Merge branch 'main' into ng/fee-boost-fix3

.mockery.yaml

@@ -33,6 +33,11 @@ packages:
     github.com/smartcontractkit/chainlink-ccip/pkg/types/ccipocr3:
         interfaces:
             ExecutePluginCodec:
+    github.com/smartcontractkit/chainlink-common/pkg/types:
+            interfaces:
+                ChainWriter:
+                    config:
+                        dir: mocks/chainlink_common/
     github.com/smartcontractkit/libocr/networking:
         interfaces:
             PeerGroupFactory:

commit/chainfee/observation.go

@@ -19,7 +19,7 @@ func (p *processor) Observation(
 	}
 
 	// Get the fee components for all available chains that we can read from
-	feeComponents := p.ccipReader.GetAvailableChainsFeeComponents(ctx, supportedChains.ToSlice())
+	feeComponents := p.ccipReader.GetChainsFeeComponents(ctx, supportedChains.ToSlice())
 	// Get the native token prices for all available chains that we can read from
 	nativeTokenPrices := p.ccipReader.GetWrappedNativeTokenPriceUSD(ctx, supportedChains.ToSlice())
 	// Get the latest chain fee price updates for the source chains

commit/plugin_e2e_test.go

@@ -450,7 +450,7 @@ func TestPlugin_E2E_AllNodesAgree_ChainFee(t *testing.T) {
 			},
 			mockCCIPReader: func(m *readerpkg_mock.MockCCIPReader) {
 				m.EXPECT().
-					GetAvailableChainsFeeComponents(params.ctx, mock.Anything).
+					GetChainsFeeComponents(params.ctx, mock.Anything).
 					Return(
 						map[ccipocr3.ChainSelector]types.ChainFeeComponents{
 							destChain:    newFeeComponents,
@@ -476,7 +476,7 @@ func TestPlugin_E2E_AllNodesAgree_ChainFee(t *testing.T) {
 			},
 			mockCCIPReader: func(m *readerpkg_mock.MockCCIPReader) {
 				m.EXPECT().
-					GetAvailableChainsFeeComponents(params.ctx, mock.Anything).
+					GetChainsFeeComponents(params.ctx, mock.Anything).
 					Return(
 						map[ccipocr3.ChainSelector]types.ChainFeeComponents{
 							destChain: newFeeComponents,
@@ -503,7 +503,7 @@ func TestPlugin_E2E_AllNodesAgree_ChainFee(t *testing.T) {
 			},
 			mockCCIPReader: func(m *readerpkg_mock.MockCCIPReader) {
 				m.EXPECT().
-					GetAvailableChainsFeeComponents(params.ctx, mock.Anything).
+					GetChainsFeeComponents(params.ctx, mock.Anything).
 					Return(
 						map[ccipocr3.ChainSelector]types.ChainFeeComponents{
 							destChain: newFeeComponents,
@@ -535,7 +535,7 @@ func TestPlugin_E2E_AllNodesAgree_ChainFee(t *testing.T) {
 			},
 			mockCCIPReader: func(m *readerpkg_mock.MockCCIPReader) {
 				m.EXPECT().
-					GetAvailableChainsFeeComponents(params.ctx, mock.Anything).
+					GetChainsFeeComponents(params.ctx, mock.Anything).
 					Return(
 						map[ccipocr3.ChainSelector]types.ChainFeeComponents{
 							destChain: newFeeComponents2,
@@ -567,7 +567,7 @@ func TestPlugin_E2E_AllNodesAgree_ChainFee(t *testing.T) {
 			},
 			mockCCIPReader: func(m *readerpkg_mock.MockCCIPReader) {
 				m.EXPECT().
-					GetAvailableChainsFeeComponents(params.ctx, mock.Anything).
+					GetChainsFeeComponents(params.ctx, mock.Anything).
 					Return(
 						map[ccipocr3.ChainSelector]types.ChainFeeComponents{
 							destChain: newFeeComponents2,
@@ -641,7 +641,7 @@ func prepareCcipReaderMock(
 
 	if mockChainFee {
 		ccipReader.EXPECT().
-			GetAvailableChainsFeeComponents(ctx, mock.Anything).
+			GetChainsFeeComponents(ctx, mock.Anything).
 			Return(map[ccipocr3.ChainSelector]types.ChainFeeComponents{}).Maybe()
 		ccipReader.EXPECT().
 			GetWrappedNativeTokenPriceUSD(ctx, mock.Anything).

internal/mocks/inmem/ccipreader_inmem.go

@@ -120,7 +120,7 @@ func (r InMemoryCCIPReader) Nonces(
 	return nil, nil
 }
 
-func (r InMemoryCCIPReader) GetAvailableChainsFeeComponents(
+func (r InMemoryCCIPReader) GetChainsFeeComponents(
 	ctx context.Context,
 	chains []cciptypes.ChainSelector,
 ) map[cciptypes.ChainSelector]types.ChainFeeComponents {