from #594: compute jumpdests using the Python custom_step

Author: anvacaru

src/kontrol/prove.py

@@ -7,7 +7,7 @@
 from subprocess import CalledProcessError
 from typing import TYPE_CHECKING, Any, ContextManager, NamedTuple
 
-from kevm_pyk.kevm import KEVM, KEVMSemantics
+from kevm_pyk.kevm import KEVM, KEVMSemantics, _process_jumpdests
 from kevm_pyk.utils import KDefinition__expand_macros, abstract_cell_vars, run_prover
 from pathos.pools import ProcessPool  # type: ignore
 from pyk.cterm import CTerm, CTermSymbolic
@@ -16,7 +16,7 @@
 from pyk.kcfg import KCFG, KCFGExplore
 from pyk.kore.rpc import KoreClient, TransportType, kore_server
 from pyk.prelude.bytes import bytesToken
-from pyk.prelude.collections import list_empty, map_empty, map_of, set_empty
+from pyk.prelude.collections import list_empty, map_empty, map_of, set_empty, set_of
 from pyk.prelude.k import GENERATED_TOP_CELL
 from pyk.prelude.kbool import FALSE, TRUE, notBool
 from pyk.prelude.kint import intToken
@@ -556,9 +556,9 @@ def _method_to_cfg(
     calldata = None
     callvalue = None
 
-    contract_code = KEVM.bin_runtime(KApply(f'contract_{contract.name_with_path}'))
+    contract_code = bytes.fromhex(contract.deployed_bytecode)
     if isinstance(method, Contract.Constructor):
-        program = KEVM.init_bytecode(KApply(f'contract_{contract.name_with_path}'))
+        program = bytes.fromhex(contract.bytecode)
         callvalue = method.callvalue_cell
 
     elif isinstance(method, Contract.Method):
@@ -569,7 +569,7 @@ def _method_to_cfg(
     init_cterm = _init_cterm(
         empty_config,
         program=program,
-        contract_code=contract_code,
+        contract_code=bytesToken(contract_code),
         use_gas=use_gas,
         deployment_state_entries=deployment_state_entries,
         calldata=calldata,
@@ -609,7 +609,7 @@ def _method_to_cfg(
             )
 
         for final_node in final_states:
-            new_init_cterm = _update_cterm_from_node(init_cterm, final_node, contract.name_with_path, config_type)
+            new_init_cterm = _update_cterm_from_node(init_cterm, final_node, config_type)
             new_node = cfg.create_node(new_init_cterm)
             if graft_setup_proof:
                 cfg.create_edge(final_node.id, new_node.id, depth=1)
@@ -626,7 +626,7 @@ def _method_to_cfg(
 
     final_cterm = _final_cterm(
         empty_config,
-        program=contract_code,
+        program=bytesToken(contract_code),
         failing=method.is_testfail,
         config_type=config_type,
         is_test=method.is_test,
@@ -637,7 +637,7 @@ def _method_to_cfg(
     return cfg, new_node_ids, init_node_id, target_node.id
 
 
-def _update_cterm_from_node(cterm: CTerm, node: KCFG.Node, contract_name: str, config_type: ConfigType) -> CTerm:
+def _update_cterm_from_node(cterm: CTerm, node: KCFG.Node, config_type: ConfigType) -> CTerm:
     new_accounts_cell = node.cterm.cell('ACCOUNTS_CELL')
     number_cell = node.cterm.cell('NUMBER_CELL')
     timestamp_cell = node.cterm.cell('TIMESTAMP_CELL')
@@ -760,7 +760,7 @@ def _init_account(address: int) -> None:
 
 def _init_cterm(
     empty_config: KInner,
-    program: KInner,
+    program: bytes,
     contract_code: KInner,
     use_gas: bool,
     config_type: ConfigType,
@@ -777,13 +777,14 @@ def _init_cterm(
     if not trace_options:
         trace_options = TraceOptions({})
 
+    jumpdests = set_of(_process_jumpdests(bytecode=program, offset=0))
     init_subst = {
         'MODE_CELL': KApply('NORMAL'),
         'USEGAS_CELL': TRUE if use_gas else FALSE,
         'SCHEDULE_CELL': schedule,
         'STATUSCODE_CELL': KVariable('STATUSCODE'),
-        'PROGRAM_CELL': program,
-        'JUMPDESTS_CELL': KEVM.compute_valid_jumpdests(program),
+        'PROGRAM_CELL': bytesToken(program),
+        'JUMPDESTS_CELL': jumpdests,
         'ID_CELL': KVariable(Foundry.symbolic_contract_id(), sort=KSort('Int')),
         'ORIGIN_CELL': KVariable('ORIGIN_ID', sort=KSort('Int')),
         'CALLER_CELL': KVariable('CALLER_ID', sort=KSort('Int')),

src/kontrol/solc_to_k.py

@@ -962,7 +962,7 @@ def method_sentences(self) -> list[KSentence]:
 
     @property
     def sentences(self) -> list[KSentence]:
-        return [self.subsort, self.production, self.macro_bin_runtime, self.macro_init_bytecode] + self.method_sentences
+        return [self.subsort, self.production] + self.method_sentences
 
     @property
     def method_by_name(self) -> dict[str, Contract.Method]: