update protobufs for GetFeeQuoterTokenUpdates

Author: ogtownsend

pkg/loop/internal/pb/ccipocr3/chainaccessor.pb.go

@@ -368,8 +368,7 @@ message GetFeedPricesUSDResponse {
 }
 
 message GetFeeQuoterTokenUpdatesRequest {
-  repeated string tokens = 1; // UnknownEncodedAddress
-  uint64 chain_selector = 2;
+  repeated bytes tokens_bytes = 1; // UnknownAddress
 }
 
 message GetFeeQuoterTokenUpdatesResponse {

pkg/loop/internal/pb/ccipocr3/chainaccessor.proto

@@ -337,15 +337,14 @@ func (c *ChainAccessorClient) GetFeedPricesUSD(ctx context.Context, tokens []cci
 	return pbToTokenPriceMap(resp.Prices), nil
 }
 
-func (c *ChainAccessorClient) GetFeeQuoterTokenUpdates(ctx context.Context, tokens []ccipocr3.UnknownEncodedAddress, chain ccipocr3.ChainSelector) (map[ccipocr3.UnknownEncodedAddress]ccipocr3.TimestampedUnixBig, error) {
-	var tokenStrs []string
-	for _, token := range tokens {
-		tokenStrs = append(tokenStrs, string(token))
+func (c *ChainAccessorClient) GetFeeQuoterTokenUpdates(ctx context.Context, tokensBytes []ccipocr3.UnknownAddress) (map[ccipocr3.UnknownEncodedAddress]ccipocr3.TimestampedUnixBig, error) {
+	var tokensBytesSlice [][]byte
+	for _, token := range tokensBytes {
+		tokensBytesSlice = append(tokensBytesSlice, token)
 	}
 
 	resp, err := c.grpc.GetFeeQuoterTokenUpdates(ctx, &ccipocr3pb.GetFeeQuoterTokenUpdatesRequest{
-		Tokens:        tokenStrs,
-		ChainSelector: uint64(chain),
+		TokensBytes: tokensBytesSlice,
 	})
 	if err != nil {
 		return nil, err
@@ -663,15 +662,14 @@ func (s *chainAccessorServer) GetFeedPricesUSD(ctx context.Context, req *ccipocr
 }
 
 func (s *chainAccessorServer) GetFeeQuoterTokenUpdates(ctx context.Context, req *ccipocr3pb.GetFeeQuoterTokenUpdatesRequest) (*ccipocr3pb.GetFeeQuoterTokenUpdatesResponse, error) {
-	var tokens []ccipocr3.UnknownEncodedAddress
-	for _, tokenStr := range req.Tokens {
-		tokens = append(tokens, ccipocr3.UnknownEncodedAddress(tokenStr))
+	var tokensBytes []ccipocr3.UnknownAddress
+	for _, tokenBytes := range req.TokensBytes {
+		tokensBytes = append(tokensBytes, ccipocr3.UnknownAddress(tokenBytes))
 	}
 
 	updates, err := s.impl.GetFeeQuoterTokenUpdates(
 		ctx,
-		tokens,
-		ccipocr3.ChainSelector(req.ChainSelector),
+		tokensBytes,
 	)
 	if err != nil {
 		return nil, err

pkg/loop/internal/relayer/pluginprovider/ext/ccipocr3/chainaccessor.go

@@ -404,15 +404,15 @@ func (s staticChainAccessor) GetFeedPricesUSD(ctx context.Context, tokens []ccip
 	return result, nil
 }
 
-func (s staticChainAccessor) GetFeeQuoterTokenUpdates(ctx context.Context, tokens []ccipocr3.UnknownEncodedAddress, chain ccipocr3.ChainSelector) (map[ccipocr3.UnknownEncodedAddress]ccipocr3.TimestampedUnixBig, error) {
+func (s staticChainAccessor) GetFeeQuoterTokenUpdates(ctx context.Context, tokensBytes []ccipocr3.UnknownAddress) (map[ccipocr3.UnknownEncodedAddress]ccipocr3.TimestampedUnixBig, error) {
 	// Return static test token updates
 	result := make(map[ccipocr3.UnknownEncodedAddress]ccipocr3.TimestampedUnixBig)
 	testTime := time.Date(2024, 1, 15, 12, 0, 0, 0, time.UTC)
 
-	for i, token := range tokens {
+	for i, token := range tokensBytes {
 		// Generate different prices for different tokens
 		price := big.NewInt(2000000 + int64(i)*50000) // Different prices from GetFeedPricesUSD
-		result[token] = ccipocr3.TimestampedUnixBig{
+		result[ccipocr3.UnknownEncodedAddress(token)] = ccipocr3.TimestampedUnixBig{
 			Timestamp: uint32(testTime.Add(time.Duration(i) * time.Minute).Unix()), // Different timestamps
 			Value:     price,
 		}
@@ -1023,14 +1023,13 @@ func (s staticChainAccessor) evaluateGetFeedPricesUSD(ctx context.Context, other
 }
 
 func (s staticChainAccessor) evaluateGetFeeQuoterTokenUpdates(ctx context.Context, other ccipocr3.ChainAccessor) error {
-	tokens := []ccipocr3.UnknownEncodedAddress{"token1", "token2"}
-	chain := ccipocr3.ChainSelector(1)
+	tokensBytes := []ccipocr3.UnknownAddress{ccipocr3.UnknownAddress("token1"), ccipocr3.UnknownAddress("token2")}
 
-	otherUpdates, err := other.GetFeeQuoterTokenUpdates(ctx, tokens, chain)
+	otherUpdates, err := other.GetFeeQuoterTokenUpdates(ctx, tokensBytes)
 	if err != nil {
 		return fmt.Errorf("GetFeeQuoterTokenUpdates failed: %w", err)
 	}
-	myUpdates, err := s.GetFeeQuoterTokenUpdates(ctx, tokens, chain)
+	myUpdates, err := s.GetFeeQuoterTokenUpdates(ctx, tokensBytes)
 	if err != nil {
 		return fmt.Errorf("GetFeeQuoterTokenUpdates failed: %w", err)
 	}

pkg/loop/internal/relayer/pluginprovider/ext/ccipocr3/test/chain_accessor.go

@@ -148,8 +148,8 @@ func TestChainAccessor(t *testing.T) {
 	})
 
 	t.Run("GetFeeQuoterTokenUpdates", func(t *testing.T) {
-		tokens := []ccipocr3.UnknownEncodedAddress{"token1", "token2"}
-		updates, err := chainAccessor.GetFeeQuoterTokenUpdates(ctx, tokens, ccipocr3.ChainSelector(1))
+		tokensBytes := []ccipocr3.UnknownAddress{ccipocr3.UnknownAddress("token1"), ccipocr3.UnknownAddress("token2")}
+		updates, err := chainAccessor.GetFeeQuoterTokenUpdates(ctx, tokensBytes)
 		assert.NoError(t, err)
 		assert.NotNil(t, updates)
 		assert.Len(t, updates, 2)