Merge branch 'master' into startup-config-validation

.github/workflows/goreleaser-actions.yml

@@ -95,7 +95,6 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          submodules: 'recursive'
 
       - uses: docker://ghcr.io/synapsecns/sanguine/git-changes-action:latest
         id: filter_go
@@ -140,8 +139,7 @@ jobs:
       - name: Git Checkout
         uses: actions/checkout@v4
         with:
-          fetch-depth: 0
-          submodules: 'recursive'
+          fetch-depth: ${{ github.ref == 'refs/heads/master' && '0' || '1' }}
 
       - name: Set up cache
         if:  ${{ !contains(runner.name, 'nsc') }}
@@ -179,10 +177,12 @@ jobs:
 
       -
         name: Fetch all tags
+        if: steps.branch-name.outputs.is_default == 'true'
         run: git fetch --force --tags
 
       # get the tag we just created
       - name: Git Fetch Unshallow
+        if: steps.branch-name.outputs.is_default == 'true'
         run: git fetch
 
       - name: Import GPG key

contrib/screener-api/screener/screener.go

@@ -31,6 +31,7 @@ import (
 	"github.com/synapsecns/sanguine/core/metrics"
 	baseServer "github.com/synapsecns/sanguine/core/server"
 	"go.opentelemetry.io/otel/attribute"
+	"go.opentelemetry.io/otel/metric"
 	"go.opentelemetry.io/otel/trace"
 
 	swaggerfiles "github.com/swaggo/files"
@@ -40,6 +41,7 @@ import (
 const (
 	okResponse  = "OK"
 	errResponse = "ERROR"
+	meterName   = "github.com/synapsecns/sanguine/contrib/screener-api"
 )
 
 // Screener is the interface for the screener.
@@ -48,15 +50,17 @@ type Screener interface {
 }
 
 type screenerImpl struct {
-	db                db.DB
-	router            *gin.Engine
-	metrics           metrics.Handler
-	cfg               config.Config
-	client            chainalysis.Client
-	whitelist         map[string]bool
-	blacklist         map[string]bool
-	blacklistCacheMux sync.RWMutex
-	requestMux        mapmutex.StringMapMutex
+	db                       db.DB
+	router                   *gin.Engine
+	metrics                  metrics.Handler
+	cfg                      config.Config
+	client                   chainalysis.Client
+	whitelist                map[string]bool
+	blacklist                map[string]bool
+	blacklistCacheMux        sync.RWMutex
+	requestMux               mapmutex.StringMapMutex
+	blockedAddressesMetric   metric.Int64Counter
+	unblockedAddressesMetric metric.Int64Counter
 }
 
 var logger = log.Logger("screener")
@@ -93,6 +97,15 @@ func NewScreener(ctx context.Context, cfg config.Config, metricHandler metrics.H
 		return nil, fmt.Errorf("could not connect to rules db: %w", err)
 	}
 
+	meter := metricHandler.Meter(meterName)
+	if screener.blockedAddressesMetric, err = meter.Int64Counter("blocked_addresses"); err != nil {
+		return nil, fmt.Errorf("could not create blocked addresses metric: %w", err)
+	}
+
+	if screener.unblockedAddressesMetric, err = meter.Int64Counter("unblocked_addresses"); err != nil {
+		return nil, fmt.Errorf("could not create unblocked addresses metric: %w", err)
+	}
+
 	screener.router = ginhelper.New(logger)
 	screener.router.Use(screener.metrics.Gin()...)
 
@@ -235,6 +248,12 @@ func (s *screenerImpl) screenAddress(c *gin.Context) {
 		return
 	}
 
+	if isAPIBlocked || isDBBlocked {
+		s.blockedAddressesMetric.Add(ctx, 1)
+	} else {
+		s.unblockedAddressesMetric.Add(ctx, 1)
+	}
+
 	c.JSON(http.StatusOK, gin.H{"risk": isAPIBlocked || isDBBlocked})
 }
 

ethergo/listener/listener.go

@@ -79,12 +79,6 @@ func NewChainListener(omnirpcClient client.EVM, store listenerDB.ChainListenerDB
 		option(c)
 	}
 
-	var err error
-	c.otelRecorder, err = newOtelRecorder(handler, int(c.chainID))
-	if err != nil {
-		return nil, fmt.Errorf("could not create otel recorder: %w", err)
-	}
-
 	return c, nil
 }
 
@@ -99,6 +93,13 @@ func (c *chainListener) Listen(ctx context.Context, handler HandleLog) (err erro
 		return fmt.Errorf("could not get metadata: %w", err)
 	}
 
+	if c.otelRecorder == nil {
+		c.otelRecorder, err = newOtelRecorder(c.handler, int(c.chainID))
+		if err != nil {
+			return fmt.Errorf("could not create otel recorder: %w", err)
+		}
+	}
+
 	c.pollInterval = time.Duration(0)
 
 	for {
@@ -151,7 +152,11 @@ func (c *chainListener) doPoll(parentCtx context.Context, handler HandleLog) (er
 	}
 
 	// Check if latest block is the same as start block (for chains with slow block times)
+	didPoll := true
+	defer span.SetAttributes(attribute.Bool("did_poll", didPoll))
 	if c.latestBlock == c.startBlock {
+		//nolint:ineffassign
+		didPoll = false
 		return nil
 	}
 

packages/explorer-ui/components/ChainChart/index.tsx

@@ -314,6 +314,12 @@ export const OverviewChart: React.FC<OverviewChartProps> = ({
                 stackId="a"
                 fill={loading ? 'rgba(255, 255, 255, 0.1)' : '#FFEEDA'}
               />
+              <Bar
+                isAnimationActive={false}
+                dataKey="linea"
+                stackId="a"
+                fill={loading ? 'rgba(255, 255, 255, 0.1)' : '#000000'}
+              />
             </>
           )}
         </BarChart>

packages/explorer-ui/graphql/queries/index.ts

@@ -210,6 +210,7 @@ export const DAILY_STATISTICS_BY_CHAIN = gql`
       base
       blast
       scroll
+      linea
       total
     }
   }

packages/synapse-constants/constants/assets/chains/index.ts

@@ -17,3 +17,4 @@ export * as moonbeamImg from './moonbeam.svg'
 export * as moonriverImg from './moonriver.svg'
 export * as optimismImg from './optimism.svg'
 export * as polygonImg from './polygon.svg'
+export * as lineaImg from './linea.svg'

packages/synapse-constants/constants/assets/explorer/index.ts

@@ -17,3 +17,5 @@ export * as moonbeamExplorerImg from './moonbeam.svg'
 export * as moonriverExplorerImg from './moonriver.svg'
 export * as dogeExplorerImg from './dogechain.svg'
 export * as baseExplorerImg from './basescan.svg'
+export * as scrollExplorerImg from './scroll.svg'
+export * as lineaExplorerImg from './linea.svg'