feat: Convert per-repo weight

Author: jonathanchang31

gittensor/classes.py

@@ -150,7 +150,6 @@ class Issue:
     discovery_base_score: float = 0.0
     discovery_earned_score: float = 0.0
     discovery_review_quality_multiplier: float = 1.0
-    discovery_repo_weight_multiplier: float = 1.0
     discovery_time_decay_multiplier: float = 1.0
     discovery_credibility_multiplier: float = 1.0
     discovery_open_issue_spam_multiplier: float = 1.0
@@ -182,7 +181,6 @@ class PullRequest:
     pr_state: PRState
 
     # Score fields
-    repo_weight_multiplier: float = 1.0
     base_score: float = 0.0
     issue_multiplier: float = 1.0
     open_pr_spam_multiplier: float = 1.0
@@ -234,7 +232,6 @@ def is_pioneer_eligible(self) -> bool:
     def calculate_final_earned_score(self) -> float:
         """Combine base score with all multipliers. Pioneer dividend is added separately after."""
         multipliers = {
-            'repo': self.repo_weight_multiplier,
             'issue': self.issue_multiplier,
             'label': self.label_multiplier,
             'spam': self.open_pr_spam_multiplier,
@@ -289,6 +286,7 @@ class MinerEvaluation:
     total_valid_solved_issues: int = 0  # solved issues where solving PR has token_score >= 5
     total_closed_issues: int = 0
     total_open_issues: int = 0  # mirror-tracked open issues in lookback window (set by issue_discovery.scan)
+    issue_discovery_scores_by_repo: Dict[str, float] = field(default_factory=dict)
 
     @property
     def total_prs(self) -> int:

gittensor/cli/miner_commands/score.py

@@ -280,7 +280,7 @@ async def _run() -> Dict[str, Any]:
             issue_rewards = await issue_discovery(
                 miner_evaluations, master_repositories, programming_languages, token_config, miner_uids
             )
-        rewards = blend_emission_pools(oss_rewards, issue_rewards, miner_uids)
+        rewards = blend_emission_pools(miner_evaluations, miner_uids, master_repositories)
 
         return {
             'success': True,

gittensor/constants.py

@@ -74,7 +74,7 @@
 # =============================================================================
 # Repository & PR Scoring
 # =============================================================================
-DEFAULT_REPO_WEIGHT = 0.01  # fallback weight for repos not in master_repositories.json
+DEFAULT_REPO_EMISSION_SHARE = 0.01  # fallback share for repos not in master_repositories.json
 PR_LOOKBACK_DAYS = 35  # rolling window for scoring
 MERGED_PR_BASE_SCORE = 25
 MIN_TOKEN_SCORE_FOR_BASE_SCORE = 5  # PRs below this get 0 base score
@@ -155,10 +155,8 @@
 RECYCLE_UID = 0
 
 # Hardcoded emission splits per competition (replaces dynamic emissions)
-OSS_EMISSION_SHARE = 0.30  # 30% to OSS contributions (PR scoring)
-ISSUE_DISCOVERY_EMISSION_SHARE = 0.10  # 10% to issue discovery
-RECYCLE_EMISSION_SHARE = 0.45  # 45% to recycle UID 0
-# ISSUES_TREASURY_EMISSION_SHARE = 0.15 defined below (15% to smart contract treasury)
+OSS_EMISSION_SHARE = 0.90  # 90% scoring pool allocated by per-repo emission_share
+# ISSUES_TREASURY_EMISSION_SHARE = 0.10 defined below (10% to smart contract treasury)
 
 # =============================================================================
 # Spam & Gaming Mitigation
@@ -187,5 +185,5 @@
 # =============================================================================
 CONTRACT_ADDRESS = '5FWNdk8YNtNcHKrAx2krqenFrFAZG7vmsd2XN2isJSew3MrD'
 ISSUES_TREASURY_UID = 111  # UID of the smart contract neuron, if set to RECYCLE_UID then it's disabled
-ISSUES_TREASURY_EMISSION_SHARE = 0.15  # % of emissions allocated to funding issues treasury
+ISSUES_TREASURY_EMISSION_SHARE = 0.10  # % of emissions allocated to funding issues treasury
 MAX_ISSUE_ID = 1_000_000  # sanity-check upper bound for any real deployment

gittensor/validator/forward.py

@@ -9,11 +9,9 @@
 
 from gittensor.classes import MinerEvaluation, MinerEvaluationCache
 from gittensor.constants import (
-    ISSUE_DISCOVERY_EMISSION_SHARE,
     ISSUES_TREASURY_EMISSION_SHARE,
     ISSUES_TREASURY_UID,
     OSS_EMISSION_SHARE,
-    RECYCLE_EMISSION_SHARE,
     RECYCLE_UID,
 )
 from gittensor.utils.uids import get_all_uids
@@ -62,12 +60,12 @@ async def forward(self: 'Validator') -> None:
         token_config = load_token_config()
 
         # 1. Score OSS contributions
-        oss_rewards, miner_evaluations, cached_uids, penalized_uids = await oss_contributions(
+        _, miner_evaluations, cached_uids, penalized_uids = await oss_contributions(
             self, miner_uids, master_repositories, programming_languages, token_config
         )
 
         # 2. Score issue discovery
-        issue_rewards = await issue_discovery(
+        _ = await issue_discovery(
             miner_evaluations,
             master_repositories,
             programming_languages,
@@ -86,7 +84,7 @@ async def forward(self: 'Validator') -> None:
         await self.bulk_store_evaluation(miner_evaluations, skip_uids=cached_uids)
 
         # 5. Blend 4 emission pools into final rewards
-        rewards = blend_emission_pools(oss_rewards, issue_rewards, miner_uids)
+        rewards = blend_emission_pools(miner_evaluations, miner_uids, master_repositories)
 
         self.update_scores(rewards, miner_uids, blacklisted_uids=sorted(penalized_uids))
 
@@ -150,49 +148,84 @@ async def issue_discovery(
 
 
 def blend_emission_pools(
-    oss_rewards: np.ndarray,
-    issue_rewards: np.ndarray,
+    miner_evaluations: Dict[int, MinerEvaluation],
     miner_uids: set[int],
+    master_repositories: Dict[str, RepositoryConfig],
 ) -> np.ndarray:
-    """Blend 4 emission pools into a single rewards array.
+    """Blend the round emission pools using per-repo emission shares.
 
-    - OSS contributions: 30%
-    - Issue discovery:   30%
-    - Issue treasury:    15% (flat to UID 111)
-    - Recycle:           25% (flat to UID 0)
+    - OSS scoring pool: 90% distributed by repo emission_share
+    - Treasury: 10% flat to UID 111
+    - Recycle: natural slack from unallocated registry share + unclaimed repo slices
     """
     sorted_uids = sorted(miner_uids)
     rewards = np.zeros(len(sorted_uids))
+    uid_to_index = {uid: idx for idx, uid in enumerate(sorted_uids)}
     recycle_extra = 0.0
 
-    # Pool 1: OSS contributions (30%)
-    oss_total = float(oss_rewards.sum())
-    if oss_total > 0:
-        rewards += oss_rewards * OSS_EMISSION_SHARE
-    else:
-        recycle_extra += OSS_EMISSION_SHARE
-
-    # Pool 2: Issue discovery (30%)
-    issue_total = float(issue_rewards.sum())
-    if issue_total > 0:
-        rewards += issue_rewards * ISSUE_DISCOVERY_EMISSION_SHARE
-    else:
-        recycle_extra += ISSUE_DISCOVERY_EMISSION_SHARE
-
-    # Pool 3: Issue treasury (15% flat to UID 111)
+    total_registry_share = sum(repo.emission_share for repo in master_repositories.values())
+    if total_registry_share < 1.0:
+        recycle_extra += OSS_EMISSION_SHARE * (1.0 - total_registry_share)
+
+    for repo_name, repo_config in master_repositories.items():
+        repo_slice = OSS_EMISSION_SHARE * repo_config.emission_share
+        if repo_slice <= 0.0:
+            continue
+
+        pr_scores: Dict[int, float] = {}
+        issue_scores: Dict[int, float] = {}
+        for uid, evaluation in miner_evaluations.items():
+            pr_score = sum(
+                pr.earned_score
+                for pr in evaluation.merged_prs
+                if pr.repository_full_name == repo_name and pr.earned_score > 0
+            )
+            if pr_score > 0:
+                pr_scores[uid] = pr_score
+
+            issue_score = evaluation.issue_discovery_scores_by_repo.get(repo_name, 0.0)
+            if issue_score > 0:
+                issue_scores[uid] = issue_score
+
+        pr_total = sum(pr_scores.values())
+        issue_total = sum(issue_scores.values())
+
+        if pr_total <= 0.0 and issue_total <= 0.0:
+            recycle_extra += repo_slice
+            continue
+
+        issue_subslice = repo_slice * repo_config.issue_discovery_share
+        pr_subslice = repo_slice * (1.0 - repo_config.issue_discovery_share)
+
+        if pr_total <= 0.0:
+            issue_subslice += pr_subslice
+            pr_subslice = 0.0
+        elif issue_total <= 0.0:
+            pr_subslice += issue_subslice
+            issue_subslice = 0.0
+
+        if pr_subslice > 0.0 and pr_total > 0.0:
+            for uid, score in pr_scores.items():
+                idx = uid_to_index.get(uid)
+                if idx is not None:
+                    rewards[idx] += pr_subslice * (score / pr_total)
+
+        if issue_subslice > 0.0 and issue_total > 0.0:
+            for uid, score in issue_scores.items():
+                idx = uid_to_index.get(uid)
+                if idx is not None:
+                    rewards[idx] += issue_subslice * (score / issue_total)
+
+    # Treasury pool (10% flat to UID 111)
     if ISSUES_TREASURY_UID > 0 and ISSUES_TREASURY_UID in miner_uids:
         treasury_idx = sorted_uids.index(ISSUES_TREASURY_UID)
         rewards[treasury_idx] += ISSUES_TREASURY_EMISSION_SHARE
-        bt.logging.info(
-            f'Treasury allocation: UID {ISSUES_TREASURY_UID} receives '
-            f'{ISSUES_TREASURY_EMISSION_SHARE * 100:.0f}% of emissions'
-        )
+    else:
+        recycle_extra += ISSUES_TREASURY_EMISSION_SHARE
 
-    # Pool 4: Recycle (25% + unclaimed from empty pools)
+    # Recycle pool: unclaimed repo slices + registry slack (+ treasury fallback)
     if RECYCLE_UID in miner_uids:
         recycle_idx = sorted_uids.index(RECYCLE_UID)
-        rewards[recycle_idx] += RECYCLE_EMISSION_SHARE + recycle_extra
-        if recycle_extra > 0:
-            bt.logging.info(f'Recycling {recycle_extra * 100:.0f}% unclaimed emissions from empty pools')
+        rewards[recycle_idx] += recycle_extra
 
     return rewards

gittensor/validator/issue_discovery/scan.py

@@ -60,7 +60,6 @@
     LanguageConfig,
     RepositoryConfig,
     TokenConfig,
-    resolve_repo_weight,
 )
 
 
@@ -224,6 +223,7 @@ def _clear_issue_discovery_fields(evaluation: MinerEvaluation) -> None:
     evaluation.total_valid_solved_issues = 0
     evaluation.total_closed_issues = 0
     evaluation.total_open_issues = 0
+    evaluation.issue_discovery_scores_by_repo = {}
 
 
 def _copy_issue_discovery_fields(target: MinerEvaluation, source: MinerEvaluation) -> None:
@@ -235,6 +235,7 @@ def _copy_issue_discovery_fields(target: MinerEvaluation, source: MinerEvaluatio
     target.total_valid_solved_issues = source.total_valid_solved_issues
     target.total_closed_issues = source.total_closed_issues
     target.total_open_issues = source.total_open_issues
+    target.issue_discovery_scores_by_repo = dict(source.issue_discovery_scores_by_repo)
 
 
 def _restore_issue_discovery_from_cache(
@@ -339,6 +340,7 @@ async def _score_miner_issues(
     valid_solved_count = 0
     closed_count = 0
     issue_token_score = 0.0
+    repo_issue_scores: Dict[str, float] = {}
     score_fetch_failed = False
     scored_issues: List[Issue] = []
 
@@ -456,16 +458,20 @@ async def _score_miner_issues(
         issue.discovery_open_issue_spam_multiplier = spam_mult
         issue.discovery_earned_score = round(
             issue.discovery_base_score
-            * issue.discovery_repo_weight_multiplier
             * issue.discovery_time_decay_multiplier
             * issue.discovery_review_quality_multiplier
             * issue.discovery_credibility_multiplier
             * issue.discovery_open_issue_spam_multiplier,
             2,
         )
         total_discovery_score += issue.discovery_earned_score
+        if issue.discovery_earned_score > 0:
+            repo_issue_scores[issue.repository_full_name] = (
+                repo_issue_scores.get(issue.repository_full_name, 0.0) + issue.discovery_earned_score
+            )
 
     evaluation.issue_discovery_score = round(total_discovery_score, 2)
+    evaluation.issue_discovery_scores_by_repo = repo_issue_scores
 
     bt.logging.info(
         f'├─ UID {evaluation.uid}: {solved_count} solved ({valid_solved_count} valid) | '
@@ -620,7 +626,6 @@ def _mirror_issue_for_scoring(
     )
 
     adapted.discovery_base_score = base_score
-    adapted.discovery_repo_weight_multiplier = resolve_repo_weight(repo_config)
     adapted.discovery_time_decay_multiplier = round(calculate_time_decay(solving_pr.merged_at), 2)
     adapted.discovery_review_quality_multiplier = round(
         calculate_issue_review_quality_multiplier(solving_pr.review_summary.maintainer_changes_requested_count),

gittensor/validator/oss_contributions/mirror/adapters.py

@@ -116,7 +116,6 @@ def mirror_scored_pr_to_legacy_pull_request(
         merged_at=pr.merged_at,
         created_at=pr.created_at,
         pr_state=PRState(pr.state),
-        repo_weight_multiplier=scored.repo_weight_multiplier,
         base_score=scored.base_score,
         issue_multiplier=scored.issue_multiplier,
         open_pr_spam_multiplier=scored.open_pr_spam_multiplier,

gittensor/validator/oss_contributions/mirror/scored_pr.py

@@ -27,7 +27,6 @@ class ScoredPR:
     pr: MirrorPullRequest
 
     # Multipliers (default 1.0 — neutral if not yet computed)
-    repo_weight_multiplier: float = 1.0
     issue_multiplier: float = 1.0
     open_pr_spam_multiplier: float = 1.0
     time_decay_multiplier: float = 1.0
@@ -88,7 +87,6 @@ def is_pioneer_eligible(self) -> bool:
     def calculate_final_earned_score(self) -> float:
         """Combine base score with all multipliers. Pioneer dividend is added separately after."""
         multipliers = {
-            'repo': self.repo_weight_multiplier,
             'issue': self.issue_multiplier,
             'label': self.label_multiplier,
             'spam': self.open_pr_spam_multiplier,

gittensor/validator/oss_contributions/mirror/scoring.py

@@ -54,7 +54,6 @@
     LanguageConfig,
     RepositoryConfig,
     TokenConfig,
-    resolve_repo_weight,
 )
 from gittensor.validator.utils.tree_sitter_scoring import calculate_token_score_from_file_changes
 
@@ -338,16 +337,14 @@ def calculate_base_score_for_pr_files(
 
 
 def _calculate_pr_multipliers(scored: ScoredPR, repo_config: RepositoryConfig) -> None:
-    """Compute repo_weight, time_decay, review_quality, label, issue multipliers.
+    """Compute time_decay, review_quality, label, issue multipliers.
 
     Spam and credibility multipliers are deferred to ``finalize_miner_scores``
     — they depend on per-miner aggregate counts.
     """
     pr = scored.pr
     is_merged = pr.state == 'MERGED'
 
-    scored.repo_weight_multiplier = resolve_repo_weight(repo_config)
-
     chosen_label, label_multiplier = _resolve_trusted_scoring_label(pr, repo_config)
     scored.label = chosen_label
     scored.label_multiplier = label_multiplier

gittensor/validator/oss_contributions/scoring.py

@@ -283,14 +283,13 @@ def calculate_open_pr_collateral_score(pr: 'ScoredPR') -> float:
 
     Collateral = base_score * applicable_multipliers * OPEN_PR_COLLATERAL_PERCENT
 
-    Applicable multipliers: repo_weight, issue, label, review_collateral
+    Applicable multipliers: issue, label, review_collateral
     NOT applicable: time_decay (merge-based), credibility_multiplier (merge-based),
                     open_pr_spam (not for collateral)
     """
     from math import prod
 
     multipliers = {
-        'repo_weight': pr.repo_weight_multiplier,
         'issue': pr.issue_multiplier,
         'label': pr.label_multiplier,
         'review_collateral': calculate_review_collateral_multiplier(pr.changes_requested_count, pr.number),

gittensor/validator/storage/queries.py

@@ -45,7 +45,7 @@
 INSERT INTO pull_requests (
     number, repository_full_name, uid, hotkey, github_id, title, author_login,
     merged_at, pr_created_at, pr_state,
-    repo_weight_multiplier, base_score, issue_multiplier,
+    base_score, issue_multiplier,
     open_pr_spam_multiplier, pioneer_dividend, pioneer_rank, time_decay_multiplier,
     credibility_multiplier, review_quality_multiplier, label_multiplier, label,
     earned_score, collateral_score,
@@ -54,7 +54,7 @@
     code_density, token_score, structural_count, structural_score, leaf_count, leaf_score
 ) VALUES (
     %s, %s, %s, %s, %s, %s, %s,
-    %s, %s, %s,
+    %s, %s,
     %s, %s, %s,
     %s, %s, %s, %s,
     %s, %s, %s, %s,
@@ -71,7 +71,6 @@
     author_login = EXCLUDED.author_login,
     merged_at = EXCLUDED.merged_at,
     pr_state = EXCLUDED.pr_state,
-    repo_weight_multiplier = EXCLUDED.repo_weight_multiplier,
     base_score = EXCLUDED.base_score,
     issue_multiplier = EXCLUDED.issue_multiplier,
     open_pr_spam_multiplier = EXCLUDED.open_pr_spam_multiplier,
@@ -117,14 +116,14 @@
     author_login, state, author_association,
     author_github_id, is_transferred, updated_at,
     discovery_base_score, discovery_earned_score,
-    discovery_review_quality_multiplier, discovery_repo_weight_multiplier,
+    discovery_review_quality_multiplier,
     discovery_time_decay_multiplier, discovery_credibility_multiplier,
     discovery_open_issue_spam_multiplier
 ) VALUES (
     %s, %s, %s, %s, %s, %s,
     %s, %s, %s,
     %s, %s, %s,
-    %s, %s,
+    %s,
     %s, %s,
     %s, %s,
     %s
@@ -142,7 +141,6 @@
     discovery_base_score = EXCLUDED.discovery_base_score,
     discovery_earned_score = EXCLUDED.discovery_earned_score,
     discovery_review_quality_multiplier = EXCLUDED.discovery_review_quality_multiplier,
-    discovery_repo_weight_multiplier = EXCLUDED.discovery_repo_weight_multiplier,
     discovery_time_decay_multiplier = EXCLUDED.discovery_time_decay_multiplier,
     discovery_credibility_multiplier = EXCLUDED.discovery_credibility_multiplier,
     discovery_open_issue_spam_multiplier = EXCLUDED.discovery_open_issue_spam_multiplier