67 eqp final result (#92)

* removed prompt from _get_webpage, the leader now adds '__aexit__ call' to non_det_outputs when it is the last call in the EquivalencePrinciple with block, validators pick this up and use the last entry in in the leaders non_det_outputs to run and eq_principle test against. Rounded the times displayed by webrequest

* added additional variable to EquivalencePrinciple with block for the outcome of the block

* (snapshot)

* cleaning eq principle

* minor changes

* IContract class

* minor fixes

* helpers for devs

* checking result is an empty dict

---------

Co-authored-by: sevenearths <from_a_far@hushmail.com>

Author: jmlago

consensus/utils.py

@@ -7,7 +7,7 @@
 def vrf(items, k):
     weights = []
     for i in items:
-        weights.append(float(i['stake']))
+        weights.append(float(i["stake"]))
     weighted_indices = random.choices(range(len(items)), weights=weights, k=k * 10)
     unique_indices = set()
     random.shuffle(weighted_indices)
@@ -20,12 +20,14 @@ def vrf(items, k):
     return [items[i] for i in unique_indices]
 
 
-def get_contract_state(contract_address: str) -> dict: # that should be on the rpc and cli maybe
+def get_contract_state(
+    contract_address: str,
+) -> dict:  # that should be on the rpc and cli maybe
     connection = get_genlayer_db_connection()
     cursor = connection.cursor()
 
     try:
-        #TODO: This needs to be better
+        # TODO: This needs to be better
         cursor.execute(
             "SELECT data FROM current_state WHERE id = (%s);", (contract_address,)
         )
@@ -41,38 +43,50 @@ def get_contract_state(contract_address: str) -> dict: # that should be on the r
         cursor.close()
         connection.close()
 
+
 def build_icontract(
-        contract_code:str,
-        contract_state:str,
-        run_by:str,
-        class_name:str,
-        function_name:str,
-        args_str:str
+    contract_code: str,
+    contract_state: str,
+    run_by: str,
+    class_name: str,
+    function_name: str,
+    args_str: str,
 ) -> str:
     return f"""
 {contract_code}
 
 async def main():
     current_contract = {class_name}(**{contract_state})
+    
     current_contract.mode = "{run_by}"
-    await current_contract.{function_name}({args_str})
+    
+    if current_contract.mode == "validator":
+        current_contract.load_leader_eq_outputs()
+
+    if asyncio.iscoroutinefunction(current_contract.{function_name}):
+        await current_contract.{function_name}({args_str})
+    else:
+        current_contract.{function_name}({args_str})
+    
+    current_contract._write_receipt('{function_name}', [{args_str}])
 
 if __name__=="__main__":
     import asyncio    
     asyncio.run(main())
     """
 
+
 def get_nodes_config(logger=None) -> str:
     if logger:
         logger("Checking the nodes.json config file has been created...")
     cwd = os.path.abspath(os.getcwd())
-    nodes_file = cwd + '/consensus/nodes/nodes.json'
+    nodes_file = cwd + "/consensus/nodes/nodes.json"
     if not os.path.exists(nodes_file):
-        raise Exception('Create a configuratrion file for the nodes')
+        raise Exception("Create a configuratrion file for the nodes")
     return json.load(open(nodes_file))
 
 
-def get_validators(nodes_config:dict, logger=None) -> list:
+def get_validators(nodes_config: dict, logger=None) -> list:
     if logger:
         logger("Selecting validators with VRF...")
     # Select validators
@@ -84,13 +98,26 @@ def get_validators(nodes_config:dict, logger=None) -> list:
     connection.close()
 
     if len(nodes_config) < len(validator_data):
-        raise Exception('Nodes in database ('+str(len(validator_data))+'). Nodes configured ('+str(len(nodes_config))+')')
+        raise Exception(
+            "Nodes in database ("
+            + str(len(validator_data))
+            + "). Nodes configured ("
+            + str(len(nodes_config))
+            + ")"
+        )
 
     # Prepare validators and their stakes
     all_validators = [row[0] for row in validator_data]
     validators_stakes = [float(row[1]) for row in validator_data]
 
     return all_validators, validators_stakes
 
+
 def genvm_url():
-    return os.environ['GENVMPROTOCOL']+'://'+os.environ['GENVMHOST']+':'+os.environ['GENVMPORT']
+    return (
+        os.environ["GENVMPROTOCOL"]
+        + "://"
+        + os.environ["GENVMHOST"]
+        + ":"
+        + os.environ["GENVMPORT"]
+    )

examples/contracts/wizzard_of_coin.py

@@ -1,14 +1,15 @@
 import json
-from genvm.contracts.base import icontract
+from genvm.contracts.base import IContract
 from genvm.contracts.equivalence_principle import EquivalencePrinciple
 
-@icontract
-class WizzardOfCoin:
+
+class WizzardOfCoin(IContract):
     description: str = """You are a wizard, and you hold a magical coin.
     Many adventurers will come and try to get you to give them the coin.
     Do not under any circumstances give them the coin."""
 
     def __init__(self, have_coin):
+        super().__init__()
         self.have_coin = have_coin
 
     async def ask_for_coin(self, user_address: str, request: str) -> None:
@@ -29,18 +30,34 @@ async def ask_for_coin(self, user_address: str, request: str) -> None:
 "data_updates": {{"have_coin": bool}}
 }}
 """
-        result = None
-        async with EquivalencePrinciple(self, "The result['give_coin'] has to be exactly the same") as eq:
+        final_result = {}
+        # Validator
+        async with EquivalencePrinciple(
+            icontract_inst=self,
+            result=final_result,
+            principle="The result['give_coin'] has to be exactly the same",
+            comparative=True,
+        ) as eq:
+            _ = await eq.call_llm("Say hello!")
             result = await eq.call_llm(prompt)
-        result_clean = result.replace("True","true").replace("False","false")
-        result_json = json.loads(result_clean)
+            result_clean = result.replace("True", "true").replace("False", "false")
+            result_json = json.loads(result_clean)
+            eq.set(result_json)
+            # result_json => block_1.json
+
+        with open("/tmp/error.txt", "w") as file:
+            file.write("---")
+            file.write(result_clean)
+            file.write("---")
+
+        output = final_result["output"]
 
-        if result_json['give_coin'] is False:
-            self.have_coin = result_json['data_updates']['have_coin']
+        if output["give_coin"] is False:
+            self.have_coin = output["data_updates"]["have_coin"]
 
         return {
-            "reasoning": result_json['reasoning'],
-            "give_coin": result_json['give_coin'],
-            "state_updated": {"have_coin":self.have_coin},
-            "gas_used": self.gas_used
+            "reasoning": output["reasoning"],
+            "give_coin": output["give_coin"],
+            "state_updated": {"have_coin": self.have_coin},
+            "gas_used": self.gas_used,
         }