use correct input for sigmoid EM

ct-app/core/core.py

@@ -57,7 +57,7 @@ def __init__(self):
         self.nodes = list[Node]()
 
         self.budget: Budget = None
-        self.legacy_model: EconomicModelSigmoid = None
+        self.legacy_model: EconomicModelLegacy = None
         self.sigmoid_model: EconomicModelSigmoid = None
 
         self.tasks = set[asyncio.Task]()
@@ -375,14 +375,12 @@ async def distribute_rewards(self):
         self.debug(f"Waiting {delay} seconds for next distribution.")
         await asyncio.sleep(delay)
 
-        min_peers = self.params.distribution.minEligiblePeers
-
         peers = list[Peer]()
 
-        while len(peers) < min_peers:
+        while len(peers) < self.params.distribution.minEligiblePeers:
             peers = await self.eligible_list.get()
             self.warning(
-                f"Min. {min_peers} peers required to distribute rewards (having {len(peers)})."
+                f"Min. {self.params.distribution.minEligiblePeers} peers required to distribute rewards (having {len(peers)})."
             )
             await asyncio.sleep(2)
 
@@ -399,10 +397,14 @@ async def distribute_rewards(self):
             broker=f"amqp://{self.params.rabbitmq.username}:{self.params.rabbitmq.password}@{self.params.rabbitmq.host}/{self.params.rabbitmq.virtualhost}",
         )
         app.autodiscover_tasks(force=True)
+
+        economic_security = sum([peer.split_stake for peer in peers]) / self.params.economicModel.sigmoid.totalTokenSupply
+        network_capacity = len(peers) / self.params.economicModel.sigmoid.networkCapacity
+        sigmoid_model_input = [economic_security, network_capacity]
 
-        for peer in peers:
+        for peer in peers:    
             legacy_count = self.legacy_model.message_count_for_reward(peer.split_stake)
-            sigmoid_count = self.sigmoid_model.message_count_for_reward(peer.split_stake)
+            sigmoid_count = self.sigmoid_model.message_count_for_reward(peer.split_stake, sigmoid_model_input) 
 
             Utils.taskSendMessage(
                 app,

ct-app/scripts/core_production_config.yaml

@@ -60,6 +60,8 @@ economicModel:
     proportion: 0.1
     maxAPRPercentage: 15.0
     offset: 10
+    networkCapacity: 2000
+    totalTokenSupply: 1000000000
 
     buckets:
       economicSecurity:

ct-app/scripts/core_staging_config.yaml

@@ -59,7 +59,9 @@ economicModel:
     proportion: 0.1
     maxAPRPercentage: 15.0
     offset: 10
-
+    networkCapacity: 50
+    totalTokenSupply: 1000000000
+
     buckets:
       economicSecurity:
         flatness: 1.65

helm/ctdapp/templates/deployment-core.yaml

@@ -49,5 +49,7 @@ spec:
             - python
             - '-m'
             - core
+            - '--configfile'
+            - './scripts/core_staging_config.yaml'
           resources:
             {{- toYaml .Values.ctdapp.core.resources | nindent 12 }}