genlayer 0.18.4 → 0.18.5

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+## 0.18.5 (2025-07-09)
+
 ## 0.18.4 (2025-06-27)
 
 ### Bug Fixes

package/dist/index.js

@@ -17723,7 +17723,7 @@ var require_semver2 = __commonJS({
 import { program } from "commander";
 
 // package.json
-var version = "0.18.4";
+var version = "0.18.5";
 var package_default = {
   name: "genlayer",
   version,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genlayer",
-  "version": "0.18.4",
+  "version": "0.18.5",
   "description": "GenLayer Command Line Tool",
   "main": "src/index.ts",
   "type": "module",

package/templates/default/README.md

@@ -45,12 +45,12 @@ This project includes the boilerplate code for a GenLayer use case implementatio
    The terminal should display a link to access your frontend app (usually at http://localhost:5173/).
    For more information on the code see [GenLayerJS](https://github.com/yeagerai/genlayer-js).
    
-<!-- ### 5. Test contracts
+### 5. Test contracts
 1. Install the Python packages listed in the `requirements.txt` file in a virtual environment.
 2. Make sure your GenLayer Studio is running. Then execute the following command in your terminal:
    ```shell
-   pytest test
-   ``` -->
+   gltest
+   ```
 
 ## ⚽ How the Football Bets Contract Works
 
@@ -73,7 +73,7 @@ The Football Bets contract allows users to create bets for football matches, res
    - Points are awarded for correct bets.
    - Users can check their total points or the points of any player.
 
-<!-- ## 🧪 Tests
+## 🧪 Tests
 
 This project includes integration tests that interact with the contract deployed in the Studio. These tests cover the main functionalities of the Football Bets contract:
 
@@ -84,7 +84,7 @@ This project includes integration tests that interact with the contract deployed
 
 The tests simulate real-world interactions with the contract, ensuring that it behaves correctly under various scenarios. They use the GenLayer Studio to deploy and interact with the contract, providing a comprehensive check of the contract's functionality in a controlled environment.
 
-To run the tests, use the `pytest test` command as mentioned in the "Steps to run this example" section. -->
+To run the tests, use the `gltest` command as mentioned in the "Steps to run this example" section.
 
 
 ## 💬 Community

package/templates/default/contracts/football_bets.py

@@ -5,6 +5,7 @@ from dataclasses import dataclass
 from genlayer import *
 
 
+@allow_storage
 @dataclass
 class Bet:
     id: str
@@ -18,8 +19,7 @@ class Bet:
     real_score: str
 
 
-@gl.contract
-class FootballBets:
+class FootballBets(gl.Contract):
     bets: TreeMap[Address, TreeMap[str, Bet]]
     points: TreeMap[Address, u256]
 
@@ -67,7 +67,7 @@ This result should be perfectly parsable by a JSON parser without errors.
         # if int(match_status["winner"]) > -1:
         #    raise Exception("Game already finished")
 
-        sender_address = gl.message.sender_account
+        sender_address = gl.message.sender_address
 
         bet_id = f"{game_date}_{team1}_{team2}".lower()
         if sender_address in self.bets and bet_id in self.bets[sender_address]:
@@ -88,10 +88,10 @@ This result should be perfectly parsable by a JSON parser without errors.
 
     @gl.public.write
     def resolve_bet(self, bet_id: str) -> None:
-        if self.bets[gl.message.sender_account][bet_id].has_resolved:
+        if self.bets[gl.message.sender_address][bet_id].has_resolved:
             raise Exception("Bet already resolved")
 
-        bet = self.bets[gl.message.sender_account][bet_id]
+        bet = self.bets[gl.message.sender_address][bet_id]
         bet_status = self._check_match(bet.resolution_url, bet.team1, bet.team2)
 
         if int(bet_status["winner"]) < 0:
@@ -102,9 +102,9 @@ This result should be perfectly parsable by a JSON parser without errors.
         bet.real_score = bet_status["score"]
 
         if bet.real_winner == bet.predicted_winner:
-            if gl.message.sender_account not in self.points:
-                self.points[gl.message.sender_account] = 0
-            self.points[gl.message.sender_account] += 1
+            if gl.message.sender_address not in self.points:
+                self.points[gl.message.sender_address] = 0
+            self.points[gl.message.sender_address] += 1
 
     @gl.public.view
     def get_bets(self) -> dict:
@@ -116,4 +116,4 @@ This result should be perfectly parsable by a JSON parser without errors.
 
     @gl.public.view
     def get_player_points(self, player_address: str) -> int:
-        return self.points.get(Address(player_address), 0)
+        return self.points.get(Address(player_address), 0)

package/templates/default/deploy/deployScript.ts

@@ -22,9 +22,14 @@ export default async function main(client: GenLayerClient<any>) {
       retries: 200,
     });
 
-    if (receipt.consensus_data?.leader_receipt?.execution_result !== "SUCCESS") {
+    if (receipt.consensus_data?.leader_receipt[0]?.execution_result !== "SUCCESS") {
       throw new Error(`Deployment failed. Receipt: ${JSON.stringify(receipt)}`);
     }
+
+    console.log("\n Contract deployed successfully.", {
+      "Transaction Hash": deployTransaction,
+      "Contract Address": receipt.data?.contract_address,
+    });
   } catch (error) {
     throw new Error((`Error during deployment:, ${error}`));
   }

package/templates/default/requirements.txt

@@ -1,6 +1,5 @@
 requests==2.32.2
-python-dotenv==1.1.0
-pytest==8.3.5
-pytest-mock==3.14.0
-eth-account==0.13.7
-eth-utils==5.3.0
+python-dotenv==1.0.1
+eth-account==0.13.3
+eth-utils==5.0.0
+genlayer-test==0.1.1

package/templates/default/test/football_bets_get_contract_schema_for_code.py

@@ -45,8 +45,8 @@ test_football_bets_win_unresolved = {
         "has_resolved": False,
         "id": "2024-06-20_spain_italy",
         "predicted_winner": "1",
-        "real_score": None,
-        "real_winner": None,
+        "real_score": '',
+        "real_winner": '',
         "resolution_url": "https://www.bbc.com/sport/football/scores-fixtures/2024-06-20",
         "team1": "Spain",
         "team2": "Italy",
@@ -73,8 +73,8 @@ test_football_bets_draw_unresolved = {
         "has_resolved": False,
         "id": "2024-06-20_denmark_england",
         "predicted_winner": "0",
-        "real_score": None,
-        "real_winner": None,
+        "real_score": '',
+        "real_winner": '',
         "resolution_url": "https://www.bbc.com/sport/football/scores-fixtures/2024-06-20",
         "team1": "Denmark",
         "team2": "England",
@@ -101,8 +101,8 @@ test_football_bets_unsuccess_unresolved = {
         "has_resolved": False,
         "id": "2024-06-20_spain_italy",
         "predicted_winner": "2",
-        "real_score": None,
-        "real_winner": None,
+        "real_score": '',
+        "real_winner": '',
         "resolution_url": "https://www.bbc.com/sport/football/scores-fixtures/2024-06-20",
         "team1": "Spain",
         "team2": "Italy",
@@ -121,4 +121,4 @@ test_football_bets_unsuccess_resolved = {
         "team1": "Spain",
         "team2": "Italy",
     }
-}
+}

package/templates/default/test/test_football_bet.py

@@ -0,0 +1,140 @@
+from gltest import get_contract_factory, default_account
+from gltest.helpers import load_fixture
+from gltest.assertions import tx_execution_succeeded
+from test.football_bets_get_contract_schema_for_code import (
+    test_football_bets_win_resolved,
+    test_football_bets_win_unresolved,
+    test_football_bets_draw_unresolved,
+    test_football_bets_draw_resolved,
+    test_football_bets_unsuccess_unresolved,
+    test_football_bets_unsuccess_resolved,
+)
+
+
+def deploy_contract():
+    factory = get_contract_factory("FootballBets")
+    contract = factory.deploy()
+
+    # Get Initial State
+    contract_all_points_state = contract.get_points(args=[])
+    assert contract_all_points_state == {}
+
+    contract_all_bets_state = contract.get_bets(args=[])
+    assert contract_all_bets_state == {}
+    return contract
+
+
+def test_football_bets_success_win():
+    # Contract Deploy
+
+    contract = load_fixture(deploy_contract)
+
+    # Create Successful Bet
+    create_bet_result = contract.create_bet(args=["2024-06-20", "Spain", "Italy", "1"])
+    assert tx_execution_succeeded(create_bet_result)
+
+    # Get Bets
+    get_bet_result = contract.get_bets(args=[])
+    assert get_bet_result == {
+        default_account.address: test_football_bets_win_unresolved
+    }
+
+    # Resolve Successful Bet
+    resolve_successful_bet_result = contract.resolve_bet(
+        args=["2024-06-20_spain_italy"],
+        wait_interval=10000,  # 10000 ms = 10 seconds
+        wait_retries=15,
+    )
+    assert tx_execution_succeeded(resolve_successful_bet_result)
+
+    # Get Bets
+    get_bet_result = contract.get_bets(args=[])
+    assert get_bet_result == {default_account.address: test_football_bets_win_resolved}
+
+    # Get Points
+    get_points_result = contract.get_points(args=[])
+    assert get_points_result == {default_account.address: 1}
+
+    # Get Player Points
+    get_player_points_result = contract.get_player_points(
+        args=[default_account.address]
+    )
+    assert get_player_points_result == 1
+
+
+def test_football_bets_draw_success():
+    # Contract Deploy
+    contract = load_fixture(deploy_contract)
+
+    # Create Successful Bet
+    create_bet_result = contract.create_bet(
+        args=["2024-06-20", "Denmark", "England", "0"]
+    )
+    assert tx_execution_succeeded(create_bet_result)
+
+    # Get Bets
+    get_bet_result = contract.get_bets(args=[])
+    assert get_bet_result == {
+        default_account.address: test_football_bets_draw_unresolved
+    }
+
+    # Resolve Successful Bet
+    resolve_successful_bet_result = contract.resolve_bet(
+        args=["2024-06-20_denmark_england"],
+        wait_interval=10000,  # 10000 ms = 10 seconds
+        wait_retries=15,
+    )
+    assert tx_execution_succeeded(resolve_successful_bet_result)
+
+    # Get Bets
+    get_bet_result = contract.get_bets(args=[])
+    assert get_bet_result == {default_account.address: test_football_bets_draw_resolved}
+
+    # Get Points
+    get_points_result = contract.get_points(args=[])
+    assert get_points_result == {default_account.address: 1}
+
+    # Get Player Points
+    get_player_points_result = contract.get_player_points(
+        args=[default_account.address]
+    )
+    assert get_player_points_result == 1
+
+
+def test_football_bets_unsuccess():
+    # Contract Deploy
+    contract = load_fixture(deploy_contract)
+
+    # Create Successful Bet
+    create_bet_result = contract.create_bet(args=["2024-06-20", "Spain", "Italy", "2"])
+    assert tx_execution_succeeded(create_bet_result)
+
+    # Get Bets
+    get_bet_result = contract.get_bets(args=[])
+    assert get_bet_result == {
+        default_account.address: test_football_bets_unsuccess_unresolved
+    }
+
+    # Resolve Successful Bet
+    resolve_successful_bet_result = contract.resolve_bet(
+        args=["2024-06-20_spain_italy"],
+        wait_interval=10000,  # 10000 ms = 10 seconds
+        wait_retries=15,
+    )
+    assert tx_execution_succeeded(resolve_successful_bet_result)
+
+    # Get Bets
+    get_bet_result = contract.get_bets(args=[])
+    assert get_bet_result == {
+        default_account.address: test_football_bets_unsuccess_resolved
+    }
+
+    # Get Points
+    get_points_result = contract.get_points(args=[])
+    assert get_points_result == {}
+
+    # Get Player Points
+    get_player_points_result = contract.get_player_points(
+        args=[default_account.address]
+    )
+    assert get_player_points_result == 0

package/templates/default/test/test_football_bet_success_draw.py

@@ -1,108 +0,0 @@
-# tests/e2e/test_wizard_of_coin.py
-
-from tools.accounts import create_new_account
-from tools.request import (
-    deploy_intelligent_contract,
-    send_transaction,
-    call_contract_method,
-    payload,
-    post_request,
-)
-from tools.structure import execute_icontract_function_response_structure
-from tools.response import (
-    assert_dict_struct,
-    assert_dict_exact,
-    has_success_status,
-)
-from test.football_bets_get_contract_schema_for_code import (
-    football_bets_contract_schema,
-    test_football_bets_win_resolved,
-    test_football_bets_win_unresolved,
-)
-
-
-def test_football_bets_success():
-    # Account
-    account_1 = create_new_account()
-    # Validators - not needed for studio.genlayer.com
-    # result = post_request(
-    #     payload("sim_createRandomValidators", 5, 8, 12, ["openai"], ["gpt-4o"])
-    # ).json()
-    # assert has_success_status(result)
-
-    # Contract Schema
-    contract_code = open("contracts/football_bets.py", "r").read()
-    result_schema = post_request(
-        payload("gen_getContractSchemaForCode", contract_code)
-    ).json()
-    assert has_success_status(result_schema)
-    assert_dict_exact(result_schema, football_bets_contract_schema)
-
-    # Contract Deploy
-    contract_address, transaction_response_deploy = deploy_intelligent_contract(
-        account_1,
-        contract_code,
-        "{}",
-    )
-    assert has_success_status(transaction_response_deploy)
-
-    # Get Initial State
-    contract_all_points_state = call_contract_method(
-        contract_address, account_1, "get_points", []
-    )
-    assert contract_all_points_state == {}
-
-    contract_all_bets_state = call_contract_method(
-        contract_address, account_1, "get_bets", []
-    )
-    assert contract_all_bets_state == {}
-
-    # Create Successful Bet
-    create_successful_bet_result = send_transaction(
-        account_1,
-        contract_address,
-        "create_bet",
-        ["2024-06-20", "Denmark", "England", "0"],
-    )
-    assert has_success_status(create_successful_bet_result)
-    assert_dict_struct(
-        create_successful_bet_result,
-        execute_icontract_function_response_structure,
-    )
-
-    # Get Bets
-    get_bet_result = call_contract_method(contract_address, account_1, "get_bets", [])
-    assert get_bet_result == {account_1.address: test_football_bets_win_unresolved}
-
-    # Resolve Successful Bet
-    resolve_successful_bet_result = send_transaction(
-        account_1,
-        contract_address,
-        "resolve_bet",
-        ["2024-06-20_denmark_england"],
-    )
-    assert has_success_status(resolve_successful_bet_result)
-    assert_dict_struct(
-        resolve_successful_bet_result,
-        execute_icontract_function_response_structure,
-    )
-
-    # Get Bets
-    get_bet_result = call_contract_method(contract_address, account_1, "get_bets", [])
-    assert get_bet_result == {account_1.address: test_football_bets_win_resolved}
-
-    # Get Points
-    get_points_result = call_contract_method(
-        contract_address, account_1, "get_points", []
-    )
-    assert get_points_result == {account_1.address: 1}
-
-    # Get Player Points
-    get_player_points_result = call_contract_method(
-        contract_address, account_1, "get_player_points", [account_1.address]
-    )
-    assert get_player_points_result == 1
-
-    # Delete Validators - not needed for studio.genlayer.com
-    # delete_validators_result = post_request(payload("sim_deleteAllValidators")).json()
-    # assert has_success_status(delete_validators_result)

package/templates/default/test/test_football_bet_success_win.py

@@ -1,106 +0,0 @@
-# tests/e2e/test_wizard_of_coin.py
-
-from tools.accounts import create_new_account
-from tools.request import (
-    deploy_intelligent_contract,
-    send_transaction,
-    call_contract_method,
-    payload,
-    post_request,
-)
-from tools.structure import execute_icontract_function_response_structure
-from tools.response import (
-    assert_dict_struct,
-    assert_dict_exact,
-    has_success_status,
-)
-from test.football_bets_get_contract_schema_for_code import (
-    football_bets_contract_schema,
-    test_football_bets_win_unresolved,
-    test_football_bets_win_resolved,
-)
-
-
-def test_football_bets_success():
-    # Account
-    account_1 = create_new_account()
-    # Validators - not needed for studio.genlayer.com
-    # result = post_request(
-    #     payload("sim_createRandomValidators", 5, 8, 12, ["openai"], ["gpt-4o"])
-    # ).json()
-    # assert has_success_status(result)
-
-    # Contract Schema
-    contract_code = open("contracts/football_bet_market.py", "r").read()
-    result_schema = post_request(
-        payload("gen_getContractSchemaForCode", contract_code)
-    ).json()
-    assert has_success_status(result_schema)
-    assert_dict_exact(result_schema, football_bets_contract_schema)
-
-    # Contract Deploy
-    contract_address, transaction_response_deploy = deploy_intelligent_contract(
-        account_1,
-        contract_code,
-        "{}",
-    )
-    assert has_success_status(transaction_response_deploy)
-
-    # Get Initial State
-    contract_all_points_state = call_contract_method(
-        contract_address, account_1, "get_points", []
-    )
-    assert contract_all_points_state == {}
-
-    contract_all_bets_state = call_contract_method(
-        contract_address, account_1, "get_bets", []
-    )
-    assert contract_all_bets_state == {}
-
-    # Create Successful Bet
-    create_successful_bet_result = send_transaction(
-        account_1,
-        contract_address,
-        "create_bet",
-        ["2024-06-20", "Spain", "Italy", "1"],
-    )
-    assert has_success_status(create_successful_bet_result)
-    assert_dict_struct(
-        create_successful_bet_result,
-        execute_icontract_function_response_structure,
-    )
-
-    # Get Bets
-    get_bet_result = call_contract_method(contract_address, account_1, "get_bets", [])
-    print("~ ~ ~ ~ ~ get_bet_result", get_bet_result)
-    assert get_bet_result == {account_1.address: test_football_bets_win_unresolved}
-
-    # Resolve Successful Bet
-    resolve_successful_bet_result = send_transaction(
-        account_1, contract_address, "resolve_bet", ["2024-06-20_spain_italy"]
-    )
-    assert has_success_status(resolve_successful_bet_result)
-    assert_dict_struct(
-        resolve_successful_bet_result,
-        execute_icontract_function_response_structure,
-    )
-
-    # Get Bets
-    get_bet_result = call_contract_method(contract_address, account_1, "get_bets", [])
-    assert get_bet_result == {account_1.address: test_football_bets_win_resolved}
-
-    # Get Points
-    get_points_result = call_contract_method(
-        contract_address, account_1, "get_points", []
-    )
-    assert get_points_result == {account_1.address: 1}
-
-    # Get Player Points
-    get_player_points_result = call_contract_method(
-        contract_address, account_1, "get_player_points", [account_1.address]
-    )
-    assert get_player_points_result == 1
-
-    # Delete Validators - not needed for studio.genlayer.com
-    # delete_validators_result = post_request(payload("sim_deleteAllValidators")).json()
-    # assert has_success_status(delete_validators_result)

package/templates/default/test/test_football_bet_unsuccess.py

@@ -1,107 +0,0 @@
-# tests/e2e/test_wizard_of_coin.py
-
-from tools.accounts import create_new_account
-from tools.request import (
-    deploy_intelligent_contract,
-    send_transaction,
-    call_contract_method,
-    payload,
-    post_request,
-)
-from tools.structure import execute_icontract_function_response_structure
-from tools.response import (
-    assert_dict_struct,
-    assert_dict_exact,
-    has_success_status,
-)
-from test.football_bets_get_contract_schema_for_code import (
-    football_bets_contract_schema,
-    test_football_bets_unsuccess_unresolved,
-    test_football_bets_unsuccess_resolved,
-)
-
-
-def test_football_bets_unsuccess():
-    # Account
-    account_1 = create_new_account()
-    # Validators - not needed for studio.genlayer.com
-    # result = post_request(
-    #     payload("sim_createRandomValidators", 5, 8, 12, ["openai"], ["gpt-4o"])
-    # ).json()
-    # assert has_success_status(result)
-
-    # Contract Schema
-    contract_code = open("contracts/football_bet_market.py", "r").read()
-    result_schema = post_request(
-        payload("gen_getContractSchemaForCode", contract_code)
-    ).json()
-    assert has_success_status(result_schema)
-    assert_dict_exact(result_schema, football_bets_contract_schema)
-
-    # Contract Deploy
-    contract_address, transaction_response_deploy = deploy_intelligent_contract(
-        account_1,
-        contract_code,
-        "{}",
-    )
-    assert has_success_status(transaction_response_deploy)
-
-    # Get Initial State
-    contract_all_points_state = call_contract_method(
-        contract_address, account_1, "get_points", []
-    )
-    assert contract_all_points_state == {}
-
-    contract_all_bets_state = call_contract_method(
-        contract_address, account_1, "get_bets", []
-    )
-    assert contract_all_bets_state == {}
-
-    # Create Successful Bet
-    create_successful_bet_result = send_transaction(
-        account_1,
-        contract_address,
-        "create_bet",
-        ["2024-06-20", "Spain", "Italy", "2"],
-    )
-    assert has_success_status(create_successful_bet_result)
-    assert_dict_struct(
-        create_successful_bet_result,
-        execute_icontract_function_response_structure,
-    )
-
-    # Get Bets
-    get_bet_result = call_contract_method(contract_address, account_1, "get_bets", [])
-    assert get_bet_result == {
-        account_1.address: test_football_bets_unsuccess_unresolved
-    }
-
-    # Resolve Successful Bet
-    resolve_successful_bet_result = send_transaction(
-        account_1, contract_address, "resolve_bet", ["2024-06-20_spain_italy"]
-    )
-    assert has_success_status(resolve_successful_bet_result)
-    assert_dict_struct(
-        resolve_successful_bet_result,
-        execute_icontract_function_response_structure,
-    )
-
-    # Get Bets
-    get_bet_result = call_contract_method(contract_address, account_1, "get_bets", [])
-    assert get_bet_result == {account_1.address: test_football_bets_unsuccess_resolved}
-
-    # Get Points
-    get_points_result = call_contract_method(
-        contract_address, account_1, "get_points", []
-    )
-    assert get_points_result == {}
-
-    # Get Player Points
-    get_player_points_result = call_contract_method(
-        contract_address, account_1, "get_player_points", [account_1.address]
-    )
-    assert get_player_points_result == 0
-
-    # Delete Validators - not needed for studio.genlayer.com
-    # delete_validators_result = post_request(payload("sim_deleteAllValidators")).json()
-    # assert has_success_status(delete_validators_result)