Merge branch 'main' into infoplat-14703-chip_client-label

Author: pkcll

observability-lib/grafana/dashboard.go

@@ -210,9 +210,21 @@ func (o *Observability) DeployToGrafana(options *DeployOptions) error {
 				// update alert rule if it already exists
 				alertToUpdate := getAlertRuleByTitle(alertsRule, alert.Title)
 				if alertToUpdate != nil {
-					_, _, errPutAlertRule := grafanaClient.UpdateAlertRule(*alertToUpdate.Uid, alert)
+					_, updateResp, errPutAlertRule := grafanaClient.UpdateAlertRule(*alertToUpdate.Uid, alert)
 					if errPutAlertRule != nil {
-						return errPutAlertRule
+						// A 409 means a provenance mismatch: the stored rule was created with a
+						// different provenance (e.g. "api") than what we send (""). Migrate by
+						// deleting the old rule and recreating it with the current provenance.
+						if updateResp == nil || updateResp.StatusCode() != 409 {
+							return errPutAlertRule
+						}
+
+						if _, _, errDelete := grafanaClient.DeleteAlertRule(*alertToUpdate.Uid); errDelete != nil {
+							return fmt.Errorf("provenance migration: delete alert rule %q: %w", alert.Title, errDelete)
+						}
+						if _, _, errPost := grafanaClient.PostAlertRule(alert); errPost != nil {
+							return fmt.Errorf("provenance migration: recreate alert rule %q: %w", alert.Title, errPost)
+						}
 					}
 				}
 			} else {

pkg/chains/evm/evm.pb.go

@@ -25,6 +25,7 @@ service EVM{
   rpc CalculateTransactionFee(CalculateTransactionFeeRequest) returns (CalculateTransactionFeeReply);
   rpc GetForwarderForEOA(GetForwarderForEOARequest) returns (GetForwarderForEOAReply);
   rpc GetLatestLPBlock(google.protobuf.Empty) returns (GetLatestLPBlockReply);
+  rpc LPSkipToBlock(LPSkipToBlockRequest) returns (google.protobuf.Empty);
 }
 
 // represents simplified evm-style CallMsg
@@ -373,3 +374,7 @@ message GetForwarderForEOAReply {
 message GetFiltersNamesReply {
   repeated string items = 1;
 }
+
+message LPSkipToBlockRequest {
+  int64 block_number = 1; // block number to skip to
+}

pkg/chains/evm/evm.proto

@@ -303,6 +303,11 @@ func (e *EVMClient) GetLatestLPBlock(ctx context.Context) (*evmtypes.LPBlock, er
 	}, nil
 }
 
+func (e *EVMClient) LPSkipToBlock(ctx context.Context, blockNumber int64) error {
+	_, err := e.grpcClient.LPSkipToBlock(ctx, &evmpb.LPSkipToBlockRequest{BlockNumber: blockNumber})
+	return net.WrapRPCErr(err)
+}
+
 type evmServer struct {
 	evmpb.UnimplementedEVMServer
 
@@ -570,6 +575,13 @@ func (e *evmServer) GetLatestLPBlock(ctx context.Context, _ *emptypb.Empty) (*ev
 	}, nil
 }
 
+func (e *evmServer) LPSkipToBlock(ctx context.Context, request *evmpb.LPSkipToBlockRequest) (*emptypb.Empty, error) {
+	if err := e.impl.LPSkipToBlock(ctx, request.GetBlockNumber()); err != nil {
+		return nil, err
+	}
+	return &emptypb.Empty{}, nil
+}
+
 func (e *evmServer) CalculateTransactionFee(ctx context.Context, request *evmpb.CalculateTransactionFeeRequest) (*evmpb.CalculateTransactionFeeReply, error) {
 	txFee, err := e.impl.CalculateTransactionFee(ctx, evmtypes.ReceiptGasInfo{
 		GasUsed:           request.GasInfo.GasUsed,

pkg/chains/evm/evm_grpc.pb.go

@@ -340,6 +340,17 @@ func Test_EVMDomainRoundTripThroughGRPC(t *testing.T) {
 		require.Equal(t, expectedNames, actualNames)
 	})
 
+	t.Run("LPSkipToBlock", func(t *testing.T) {
+		skipBlock := blockNum.Int64()
+		evmService.EXPECT().LPSkipToBlock(mock.Anything, mock.Anything).RunAndReturn(func(ctx context.Context, blockNumber int64) error {
+			require.Equal(t, skipBlock, blockNumber)
+			return nil
+		})
+
+		err := client.LPSkipToBlock(ctx, skipBlock)
+		require.NoError(t, err)
+	})
+
 	t.Run("CalculateTransactionFee", func(t *testing.T) {
 		gasInfo := evm.ReceiptGasInfo{
 			GasUsed:           gas,

pkg/loop/internal/relayer/evm.go

@@ -95,6 +95,10 @@ func (e evmClient) GetLatestLPBlock(ctx context.Context, in *emptypb.Empty, opts
 	return e.client.GetLatestLPBlock(appendRelayID(ctx, e.relayID), in, opts...)
 }
 
+func (e evmClient) LPSkipToBlock(ctx context.Context, in *evmpb.LPSkipToBlockRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) {
+	return e.client.LPSkipToBlock(appendRelayID(ctx, e.relayID), in, opts...)
+}
+
 type evmServer struct {
 	evmpb.UnimplementedEVMServer
 	parent *Server
@@ -489,6 +493,19 @@ func (es *evmServer) GetLatestLPBlock(ctx context.Context, in *emptypb.Empty) (*
 	}, nil
 }
 
+func (es *evmServer) LPSkipToBlock(ctx context.Context, request *evmpb.LPSkipToBlockRequest) (*emptypb.Empty, error) {
+	evmService, err := es.parent.getEVMService(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	if err = evmService.LPSkipToBlock(ctx, request.GetBlockNumber()); err != nil {
+		return nil, err
+	}
+
+	return &emptypb.Empty{}, nil
+}
+
 func (es *evmServer) GetForwarderForEOA(ctx context.Context, request *evmpb.GetForwarderForEOARequest) (*evmpb.GetForwarderForEOAReply, error) {
 	evmService, err := es.parent.getEVMService(ctx)
 	if err != nil {

pkg/loop/internal/relayer/evm_test.go

@@ -199,6 +199,9 @@ type EVMService interface {
 	// GetLatestLPBlock retrieves current LatestBlock from cache perspective
 	GetLatestLPBlock(ctx context.Context) (*evm.LPBlock, error)
 
+	// LPSkipToBlock skips log poller to the given block number
+	LPSkipToBlock(ctx context.Context, blockNumber int64) error
+
 	// GetFiltersNames returns all registered filters' names for later pruning
 	// TODO PLEX-1465: once code is moved away, remove this GetFiltersNames method
 	GetFiltersNames(ctx context.Context) ([]string, error)
@@ -539,6 +542,10 @@ func (ues *UnimplementedEVMService) GetLatestLPBlock(ctx context.Context) (*evm.
 	return nil, status.Errorf(codes.Unimplemented, "method GetLatestLPBlock not implemented")
 }
 
+func (ues *UnimplementedEVMService) LPSkipToBlock(ctx context.Context, blockNumber int64) error {
+	return status.Errorf(codes.Unimplemented, "method LPSkipToBlock not implemented")
+}
+
 func (ues *UnimplementedEVMService) GetFiltersNames(ctx context.Context) ([]string, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method GetFiltersNames not implemented")
 }