autosetup: keep solc_optimize_map consistent when files change

certora_autosetup/utils/enhanced_config_manager.py

@@ -416,12 +416,14 @@ def _update_compiler_maps_for_new_contracts(
         contracts_added: List[ContractHandle],
     ) -> bool:
         """
-        Update compiler_map and solc_via_ir_map when new contracts are added.
+        Update compiler_map, solc_via_ir_map, and solc_optimize_map when new
+        contracts are added.
 
         Delegates to CompilationWorkaroundManager which handles:
         - Parsing pragma from source files
         - Creating/updating compiler_map entries
         - Creating/updating solc_via_ir_map entries
+        - Creating/updating solc_optimize_map entries
 
         Args:
             conf_object: The config dict to modify in-place
@@ -438,6 +440,7 @@ def _update_compiler_maps_for_new_contracts(
         for contract in contracts_added:
             modified |= self.update_compiler_map_for_contract(conf_object, contract, ref_maps)
             modified |= self.update_via_ir_map_for_contract(conf_object, contract, ref_maps)
+            modified |= self.update_optimize_map_for_contract(conf_object, contract, ref_maps)
 
         return modified
 
@@ -1012,12 +1015,33 @@ def update_via_ir_map_for_contract(
 
         return modified
 
+    def update_optimize_map_for_contract(
+        self,
+        conf_object: Dict[str, Any],
+        contract: ContractHandle,
+        reference_maps: Optional[Dict[str, Any]] = None,
+    ) -> bool:
+        """Add a solc_optimize_map entry for a newly-added contract. Mirrors
+        `update_via_ir_map_for_contract` for the optimize map. Only the map form is
+        extended; a scalar `solc_optimize` already applies to every file."""
+        contract_name = contract.contract_name
+        if "solc_optimize_map" not in conf_object:
+            return False
+        if contract_name in conf_object["solc_optimize_map"]:
+            return False
+        ref_optimize_map = (reference_maps or {}).get("solc_optimize_map", {})
+        optimize_value = ref_optimize_map.get(contract_name, "200")
+        conf_object["solc_optimize_map"][contract_name] = optimize_value
+        self.log(f"Added {contract_name} to solc_optimize_map (value={optimize_value})")
+        return True
+
     def sync_compiler_maps_with_files(
         self,
         conf_object: Dict[str, Any],
         convention: Optional[SolcConvention] = None,
     ) -> bool:
-        """Reconcile compiler_map, solc_via_ir_map, and solc_evm_version_map with `files`.
+        """Reconcile compiler_map, solc_via_ir_map, solc_evm_version_map, and
+        solc_optimize_map with `files`.
 
         Invariant: when `compiler_map` is present, every contract in `files`
         has a matching entry. Stale entries (no longer in `files`) get trimmed;
@@ -1097,6 +1121,20 @@ def sync_compiler_maps_with_files(
                 )
                 modified = True
 
+        if "solc_optimize_map" in conf_object:
+            original_len = len(conf_object["solc_optimize_map"])
+            conf_object["solc_optimize_map"] = {
+                key: value
+                for key, value in conf_object["solc_optimize_map"].items()
+                if self._key_matches_any_contract(key, contracts_in_files)
+            }
+            if len(conf_object["solc_optimize_map"]) != original_len:
+                self.log(
+                    f"Trimmed solc_optimize_map from {original_len}"
+                    f" to {len(conf_object['solc_optimize_map'])} entries"
+                )
+                modified = True
+
         return modified
 
     def create_copy_with_prover_args(

tests/test_compiler_flag_reconciliation.py

@@ -27,21 +27,21 @@
 
 
 def test_drops_solc_when_compiler_map_present() -> None:
-    conf = {"solc": "solc8.30", "compiler_map": {"Vault": "solc8.35"}}
+    conf = {"solc": "solc8.30", "compiler_map": {"Widget": "solc8.35"}}
     ConfigManager.drop_scalars_superseded_by_maps(conf)
-    assert conf == {"compiler_map": {"Vault": "solc8.35"}}
+    assert conf == {"compiler_map": {"Widget": "solc8.35"}}
 
 
 def test_each_pair_is_dropped_independently() -> None:
     conf = {
         "solc": "solc8.30",
-        "compiler_map": {"Vault": "solc8.35"},
+        "compiler_map": {"Widget": "solc8.35"},
         "solc_via_ir": True,
-        "solc_via_ir_map": {"Vault": True},
+        "solc_via_ir_map": {"Widget": True},
         "solc_optimize": "200",
-        "solc_optimize_map": {"Vault": "200"},
+        "solc_optimize_map": {"Widget": "200"},
         "solc_evm_version": "paris",
-        "solc_evm_version_map": {"Vault": "cancun"},
+        "solc_evm_version_map": {"Widget": "cancun"},
     }
     ConfigManager.drop_scalars_superseded_by_maps(conf)
     assert set(conf) == {
@@ -60,9 +60,9 @@ def test_scalars_survive_without_maps() -> None:
 
 def test_unrelated_pair_not_affected() -> None:
     # A via-ir map must not drop the solc scalar and vice versa.
-    conf = {"solc": "solc8.30", "solc_via_ir_map": {"Vault": True}}
+    conf = {"solc": "solc8.30", "solc_via_ir_map": {"Widget": True}}
     ConfigManager.drop_scalars_superseded_by_maps(conf)
-    assert conf == {"solc": "solc8.30", "solc_via_ir_map": {"Vault": True}}
+    assert conf == {"solc": "solc8.30", "solc_via_ir_map": {"Widget": True}}
 
 
 # =============================================================================
@@ -116,36 +116,36 @@ def test_precompute_drops_scalar_solc_when_map_is_built(
     )
     monkeypatch.setattr(
         "certora_autosetup.setup.setup_prover.FoundryContractExtractor",
-        lambda root: _StubExtractor({"src/Vault.sol": [("Vault", "0.8.35")]}),
+        lambda root: _StubExtractor({"src/Widget.sol": [("Widget", "0.8.35")]}),
     )
 
     contracts = [
-        ContractHandle(contract_name="Vault", source_file="src/Vault.sol"),
+        ContractHandle(contract_name="Widget", source_file="src/Widget.sol"),
         ContractHandle(
             contract_name="DummyERC20Impl", source_file="certora/mocks/DummyERC20Impl.sol"
         ),
     ]
     config = setup_prover._precompute_compiler_settings(
-        contracts, {"solc": "solc8.30", "files": ["src/Vault.sol", str(mock_src)]}
+        contracts, {"solc": "solc8.30", "files": ["src/Widget.sol", str(mock_src)]}
     )
 
     assert "solc" not in config
-    # Total over the scene: artifact version for Vault, pragma-resolved
+    # Total over the scene: artifact version for Widget, pragma-resolved
     # (biased to the old default) for the injected mock.
     assert config["compiler_map"] == {
-        "Vault": "solc8.35",
+        "Widget": "solc8.35",
         "DummyERC20Impl": "solc8.30",
     }
 
 
 def test_precompute_keeps_scalar_when_artifacts_agree(setup_prover, monkeypatch) -> None:
     monkeypatch.setattr(
         "certora_autosetup.setup.setup_prover.FoundryContractExtractor",
-        lambda root: _StubExtractor({"src/Vault.sol": [("Vault", "0.8.30")]}),
+        lambda root: _StubExtractor({"src/Widget.sol": [("Widget", "0.8.30")]}),
     )
-    contracts = [ContractHandle(contract_name="Vault", source_file="src/Vault.sol")]
+    contracts = [ContractHandle(contract_name="Widget", source_file="src/Widget.sol")]
     config = setup_prover._precompute_compiler_settings(
-        contracts, {"solc": "solc8.30", "files": ["src/Vault.sol"]}
+        contracts, {"solc": "solc8.30", "files": ["src/Widget.sol"]}
     )
     assert config["solc"] == "solc8.30"
     assert "compiler_map" not in config
@@ -163,11 +163,11 @@ def test_precompute_keeps_scalar_when_artifacts_agree(setup_prover, monkeypatch)
 def test_merge_drops_base_scalar_when_updates_bring_map(monkeypatch) -> None:
     autosetup = Autosetup.__new__(Autosetup)
     autosetup.compilation_config_updates = {
-        "compiler_map": {"Vault": "solc8.35", "Helper": "solc8.30"},
-        "solc_via_ir_map": {"Vault": True, "Helper": False},
+        "compiler_map": {"Widget": "solc8.35", "Helper": "solc8.30"},
+        "solc_via_ir_map": {"Widget": True, "Helper": False},
     }
     autosetup.contract_handles = [
-        ContractHandle(contract_name="Vault", source_file="src/Vault.sol"),
+        ContractHandle(contract_name="Widget", source_file="src/Widget.sol"),
         ContractHandle(contract_name="Helper", source_file="src/Helper.sol"),
     ]
     monkeypatch.setattr(
@@ -181,8 +181,8 @@ def test_merge_drops_base_scalar_when_updates_bring_map(monkeypatch) -> None:
 
     assert "solc" not in config
     assert "solc_via_ir" not in config
-    assert config["compiler_map"] == {"Vault": "solc8.35", "Helper": "solc8.30"}
-    assert config["solc_via_ir_map"] == {"Vault": True, "Helper": False}
+    assert config["compiler_map"] == {"Widget": "solc8.35", "Helper": "solc8.30"}
+    assert config["solc_via_ir_map"] == {"Widget": True, "Helper": False}
 
 
 # =============================================================================
@@ -215,3 +215,57 @@ def test_scalar_to_map_keys_match_certora_cli() -> None:
     result = sp.run([sys.executable, "-c", probe], capture_output=True, text=True)
     assert result.returncode == 0, result.stderr
     assert __import__("json").loads(result.stdout) == conf_keys
+
+
+# =============================================================================
+# ConfigManager: solc_optimize_map stays consistent when files are added/removed
+#
+# certoraRun rejects a conf whose solc_optimize_map is missing an entry for a
+# file ("files are not matched in solc_optimize_map"). When call resolution
+# injects new files (e.g. indexed link-harnesses Sample_1.sol), the map
+# must gain matching entries; when files shrink, stale entries must be trimmed.
+# =============================================================================
+
+
+def _config_manager(tmp_path: Path) -> ConfigManager:
+    return ConfigManager(project_root=tmp_path)
+
+
+def test_update_optimize_map_adds_new_contract_with_default(tmp_path: Path) -> None:
+    mgr = _config_manager(tmp_path)
+    conf = {"solc_optimize_map": {"Sample": "22300"}}
+    added = mgr.update_optimize_map_for_contract(
+        conf, ContractHandle(contract_name="Sample_1", source_file="certora/harnesses/Sample_1.sol")
+    )
+    assert added is True
+    assert conf["solc_optimize_map"]["Sample_1"] == "200"
+
+
+def test_update_optimize_map_prefers_reference_value(tmp_path: Path) -> None:
+    mgr = _config_manager(tmp_path)
+    conf = {"solc_optimize_map": {"Sample": "22300"}}
+    mgr.update_optimize_map_for_contract(
+        conf,
+        ContractHandle(contract_name="Sample_1", source_file="certora/harnesses/Sample_1.sol"),
+        reference_maps={"solc_optimize_map": {"Sample_1": "22300"}},
+    )
+    assert conf["solc_optimize_map"]["Sample_1"] == "22300"
+
+
+def test_update_optimize_map_noop_without_map(tmp_path: Path) -> None:
+    # A scalar solc_optimize already covers every file, so no map to extend.
+    mgr = _config_manager(tmp_path)
+    conf = {"solc_optimize": "200"}
+    assert mgr.update_optimize_map_for_contract(
+        conf, ContractHandle(contract_name="Sample_1", source_file="certora/harnesses/Sample_1.sol")
+    ) is False
+    assert "solc_optimize_map" not in conf
+
+
+def test_update_optimize_map_noop_when_already_present(tmp_path: Path) -> None:
+    mgr = _config_manager(tmp_path)
+    conf = {"solc_optimize_map": {"Sample_1": "22300"}}
+    assert mgr.update_optimize_map_for_contract(
+        conf, ContractHandle(contract_name="Sample_1", source_file="certora/harnesses/Sample_1.sol")
+    ) is False
+    assert conf["solc_optimize_map"] == {"Sample_1": "22300"}