Merge pull request #13 from sky-ring/milestone-2

Impl: Milestone 2 Features

Author: AminRezaei0x443

README.md

@@ -2,10 +2,10 @@
 
 # Rift
 
-[![PyPI version](https://img.shields.io/badge/rift--framework-0.7.5-informational?style=flat-square&color=FFFF91&labelColor=360825)](https://pypi.org/project/rift-framework/)
-[![Telegram](https://img.shields.io/badge/Telegram-@rift__framework-informational?style=flat-square&color=0088cc&labelColor=360825)](https://t.me/d_builder)
+[![PyPI version](https://img.shields.io/badge/rift--framework-0.9.6-informational?style=flat-square&color=FFFF91&labelColor=360825)](https://pypi.org/project/rift-framework/)
+[![Telegram](https://img.shields.io/badge/Telegram-@skyring__org-informational?style=flat-square&color=0088cc&labelColor=360825)](https://t.me/skyring_org)
 [![Telegram](https://img.shields.io/badge/Docs-docs.skyring.io/rift-informational?style=flat-square&color=6A0F49&labelColor=360825)](https://docs.skyring.io/rift/)
-> _A magical **Python3** -> **FunC** portal_
+> _A magical **Python3** -> **TON** portal_
 
 Rift is smart contract development framework in Python for [TON (The Open Network)](https://ton.org). Its purpose is to make the development, testing, and deployment procedures much easier!
 
@@ -104,9 +104,9 @@ Until then, you may look at standard contracts implementation; they cover the ma
 - [x] Providing standard smart contracts implementation with Rift
 
 ### Milestone 2: deploying, testing, interaction capabilities
-- [ ] Simple interaction interface with TON Blockchain
-- [ ] Simple deploying options of developed contracts
-- [ ] Testing framework for the contracts developed with Rift
+- [x] Simple interaction interface with TON Blockchain
+- [x] Simple deploying options of developed contracts
+- [x] Testing framework for the contracts developed with Rift
 
 ## Contributing
 If you're interested in contributing to Rift, please see [CONTRIBUTING.md](https://github.com/sky-ring/rift/blob/main/CONTRIBUTING.md) for the necessary specifications and procedure.

poetry.lock

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "rift-framework"
-version = "0.7.5"
-description = "A magical Python3 -> FunC portal"
+version = "0.9.6"
+description = "The magical Python -> TON Portal"
 authors = ["Amin Rezaei <AminRezaei0x443@gmail.com>"]
 license = "MIT"
 readme = "README.md"
@@ -16,6 +16,11 @@ click = "~8.1.3"
 libcst = "~0.4.7"
 PyYAML = "~6.0"
 tomlkit = "~0.11.4"
+pytonlib = "~0.0.42"
+appdirs = "~1.4.4"
+colorful = "~0.5.4"
+tqdm = "^4.64.1"
+setuptools = "^65.6.3"
 
 [tool.poetry.group.dev.dependencies]
 black = "^22.6.0"
@@ -25,7 +30,7 @@ flake8 = "^5.0.4"
 rift = "rift.cli.entry:entry"
 
 [build-system]
-requires = ["poetry-core"]
+requires = ["poetry-core", "setuptools", "requests", "tqdm"]
 build-backend = "poetry.core.masonry.api"
 
 [tool.black]

pyproject.toml

@@ -3,4 +3,7 @@ click~=8.1.3
 libcst~=0.4.7
 PyYAML~=6.0
 setuptools~=62.6.0
-tomlkit~=0.11.4
+tomlkit~=0.11.4
+pytonlib~=0.24
+appdirs~=1.4.4
+colorful~=0.5.4

requirements.txt

@@ -11,6 +11,7 @@
 from rift.ast.patchers import (
     AssertPatcher,
     AssignPatcher,
+    BreakPatcher,
     IfPatcher,
     RaisePatcher,
     ReturnPatcher,
@@ -24,6 +25,7 @@ def patch(node):
         UnaryPatcher(),
         AssertPatcher(),
         AssignPatcher(),
+        BreakPatcher(),
         IfPatcher(),
         RaisePatcher(),
         ReturnPatcher(),

rift/ast/ast_patcher.py

@@ -50,6 +50,12 @@ def add_statement(cls, type, *args):
         cls.current_contract.add_statement(s)
         return s.node_id()
 
+    @classmethod
+    def break_(cls):
+        # TODO: Add when FunC supports or we move to TVM Engine
+        # cls.add_statement(Statement.BREAK)
+        raise Exception("FunC doesn't support break keyword!")
+
     @classmethod
     def return_(cls, entity):
         ReferenceTable.mark(entity)

rift/ast/calls.py

@@ -1,5 +1,6 @@
 from rift.ast.patchers.assert_patcher import AssertPatcher
 from rift.ast.patchers.assign_patcher import AssignPatcher
+from rift.ast.patchers.break_patcher import BreakPatcher
 from rift.ast.patchers.if_patcher import IfPatcher
 from rift.ast.patchers.raise_patcher import RaisePatcher
 from rift.ast.patchers.return_patcher import ReturnPatcher

rift/ast/patchers/__init__.py

@@ -143,9 +143,13 @@ def visit_Assign(self, node):
                     value=c_expr,
                 )
             else:
-                a_expr = ast.Expr(
+                a_expr = ast.Assign(
+                    targets=[target],
                     value=c_expr,
                 )
+                # a_expr = ast.Expr(
+                #     value=c_expr,
+                # )
             nodes.append(a_expr)
         for g_node in nodes:
             ast.fix_missing_locations(g_node)

rift/ast/patchers/assign_patcher.py

@@ -0,0 +1,21 @@
+import ast
+from typing import Any
+
+
+class BreakPatcher(ast.NodeTransformer):
+    """Transforms the AST to handle raise exprs."""
+
+    def visit_Break(self, node: ast.Break) -> Any:
+        u_node = ast.Expr(
+            value=ast.Call(
+                func=ast.Attribute(
+                    value=ast.Name(id="helpers", ctx=ast.Load()),
+                    attr="_break",
+                    ctx=ast.Load(),
+                ),
+                args=[],
+                keywords=[],
+            ),
+        )
+        ast.fix_missing_locations(u_node)
+        return u_node

rift/ast/patchers/break_patcher.py

@@ -17,6 +17,8 @@ def __init__(self):
         super().__init__()
         self.parent = None
         self.symbols = BoolDict()
+        # Just a simple patch to not define _ as a variable
+        self.symbols["_"] = True
         self.statements = []
 
     def add_statement(self, statement):