kevm-pyk/{solc_to_k, __main__}: resolve sourcemap at load time, also build contract ids

Author: ehildenb

kevm-pyk/src/kevm_pyk/__main__.py

@@ -154,11 +154,15 @@ def exec_foundry_kompile(
     json_paths = _contract_json_paths(foundry_out)
     contracts = [_contract_from_json(json_path) for json_path in json_paths]
 
+    contract_id_map: Dict[int, str] = {}
     for c in contracts:
         srcmap_file = srcmap_dir / f'{c.name}.json'
-        with open(srcmap_file, 'w') as smf:
-            smf.write(json.dumps(c.srcmap))
-            _LOGGER.info(f'Wrote source map: {srcmap_file}')
+        srcmap_file.write_text(json.dumps(c.srcmap))
+        _LOGGER.info(f'Wrote source map: {srcmap_file}')
+        contract_id_map[c.contract_id] = str(c.contract_path)
+    contract_id_map_path = srcmap_dir / 'contract_id_map.json'
+    contract_id_map_path.write_text(json.dumps(contract_id_map))
+    _LOGGER.info(f'Wrote contract id map: {contract_id_map_path}')
 
     foundry = Foundry(definition_dir, profile=profile)
     empty_config = foundry.definition.empty_config(Foundry.Sorts.FOUNDRY_CELL)

kevm-pyk/src/kevm_pyk/solc_to_k.py

@@ -109,7 +109,9 @@ def application(self) -> KInner:
     methods: Tuple[Method, ...]
     test_methods: Tuple[Method, ...]
     fields: FrozenDict
-    srcmap: Optional[Dict[int, str]]
+    srcmap: Optional[Dict[int, Tuple[int, int, int, str, int]]]
+    contract_id: int
+    contract_path: Path
 
     def __init__(self, contract_name: str, contract_json: Dict, foundry: bool = False) -> None:
         def _get_method_abi(_mname: str) -> Dict:
@@ -152,6 +154,8 @@ def _get_method_abi(_mname: str) -> Dict:
             self.fields = FrozenDict(_fields)
 
         self.srcmap = None
+        self.contract_id = contract_json['id']
+        self.contract_path = contract_json['ast']['absolutePath']
         if len(self.bytecode) > 0:
             instr_to_pc = {}
             pc = 0
@@ -166,13 +170,29 @@ def _get_method_abi(_mname: str) -> Dict:
                 pc += 1
                 instr += 1
 
-            instr_srcmap = (
+            instrs_srcmap = (
                 contract_json['evm']['deployedBytecode']['sourceMap']
                 if not foundry
                 else contract_json['deployedBytecode']['sourceMap']
             ).split(';')
 
-            self.srcmap = {instr_to_pc[instr]: src for instr, src in enumerate(instr_srcmap)}
+            s, l, f, j, m = (0, 0, 0, '', 0)
+            _srcmap = {}
+            for i, instr_srcmap in enumerate(instrs_srcmap):
+                fields = instr_srcmap.split(':')
+                if len(fields) > 0 and fields[0] != '':
+                    s = int(fields[0])
+                if len(fields) > 1 and fields[1] != '':
+                    l = int(fields[1])
+                if len(fields) > 2 and fields[2] != '':
+                    f = int(fields[2])
+                if len(fields) > 3 and fields[3] != '':
+                    j = fields[3]
+                if len(fields) > 4 and fields[4] != '':
+                    m = int(fields[4])
+                _srcmap[i] = (s, l, f, j, m)
+
+            self.srcmap = _srcmap
 
     @staticmethod
     def contract_to_module_name(c: str, spec: bool = True) -> str: