default to 0 chain id and inject only if larger than 0

services/components/containers/definitions.go

@@ -41,7 +41,9 @@ func NewBotContainerConfig(
 		config.EnvAgentGrpcPort:      botConfig.GrpcPort(),
 		config.EnvFortaBotID:         botConfig.ID,
 		config.EnvFortaBotOwner:      botConfig.Owner,
-		config.EnvFortaChainID:       fmt.Sprintf("%d", botConfig.ChainID),
+	}
+	if botConfig.ChainID > 0 {
+		env[config.EnvFortaChainID] = fmt.Sprintf("%d", botConfig.ChainID)
 	}
 	if botConfig.IsSharded() {
 		env[config.EnvFortaShardID] = fmt.Sprintf("%d", botConfig.ShardID())

services/components/containers/definitions_test.go

@@ -0,0 +1,50 @@
+package containers
+
+import (
+	"testing"
+
+	"github.com/forta-network/forta-node/config"
+	"github.com/stretchr/testify/require"
+)
+
+func TestContainerEnvVar_ChainID(t *testing.T) {
+	r := require.New(t)
+
+	botConfig := config.AgentConfig{
+		ChainID: 0,
+	}
+	containerConfig := NewBotContainerConfig("", botConfig, config.LogConfig{}, config.ResourcesConfig{})
+	env := containerConfig.Env
+	r.Equal("", env[config.EnvFortaChainID])
+
+	botConfig = config.AgentConfig{
+		ChainID: 137,
+	}
+	containerConfig = NewBotContainerConfig("", botConfig, config.LogConfig{}, config.ResourcesConfig{})
+	env = containerConfig.Env
+	r.Equal("137", env[config.EnvFortaChainID])
+}
+
+func TestContainerEnvVar_Sharding(t *testing.T) {
+	r := require.New(t)
+
+	botConfig := config.AgentConfig{
+		ShardConfig: nil,
+	}
+	containerConfig := NewBotContainerConfig("", botConfig, config.LogConfig{}, config.ResourcesConfig{})
+	env := containerConfig.Env
+	r.Equal("", env[config.EnvFortaShardID])
+	r.Equal("", env[config.EnvFortaShardCount])
+
+	botConfig = config.AgentConfig{
+		ShardConfig: &config.ShardConfig{
+			ShardID: 0,
+			Shards:  2,
+			Target:  3,
+		},
+	}
+	containerConfig = NewBotContainerConfig("", botConfig, config.LogConfig{}, config.ResourcesConfig{})
+	env = containerConfig.Env
+	r.Equal("0", env[config.EnvFortaShardID])
+	r.Equal("2", env[config.EnvFortaShardCount])
+}

store/registry.go

@@ -210,15 +210,11 @@ func (rs *registryStore) loadAssignment(assignment *registry.Assignment) (*confi
 		if !ok {
 			return nil, fmt.Errorf("%w: invalid sharding config", errInvalidBot)
 		}
+		botCfg.ChainID = int(botCfg.ShardConfig.ChainID)
 	} else {
 		botCfg.ShardConfig = sharding.CalculateShardConfig(assignment, agentData, rs.cfg.ChainID)
 	}
 
-	// chain id is found from shard calculation in v2
-	if botCfg.ShardConfig.ChainID > 0 {
-		botCfg.ChainID = int(botCfg.ShardConfig.ChainID)
-	}
-
 	return botCfg, nil
 }
 

store/sharding/calculate_v2.go

@@ -15,8 +15,18 @@ import (
 func CalculateShardConfigV2(
 	assignment *registry.Assignment, agentManifest *manifest.SignedAgentManifest,
 ) (*config.ShardConfig, bool) {
-	// we think of each chain in ascending order
+	if agentManifest == nil || agentManifest.Manifest == nil {
+		return nil, false
+	}
 	chainIDs := agentManifest.Manifest.ChainIDs
+
+	// if no chain ids were specified, then default to zero chain id with
+	// default target count (no sharding)
+	if len(chainIDs) == 0 {
+		return CreateShardConfig(defaultShardID, minShardCount, defaultTargetCount, 0), true
+	}
+
+	// we think of each chain in ascending order
 	sort.Slice(chainIDs, func(i, j int) bool {
 		return chainIDs[i] < chainIDs[j]
 	})

store/sharding/calculate_v2_test.go

@@ -153,6 +153,18 @@ func TestCalculateShardConfigV2(t *testing.T) {
 			expectedShardConfig: nil,
 			invalid:             true,
 		},
+		{
+			name: "should return a default config if chain ids are not specified",
+			args: args{
+				chainSettings: nil,
+			},
+			expectedShardConfig: &config.ShardConfig{
+				ShardID: 0,
+				Target:  3,
+				Shards:  1,
+				ChainID: 0,
+			},
+		},
 		// Add more test cases as needed
 	}