Dev post migration

.gitignore

@@ -4,4 +4,6 @@ contracting.egg-info
 build
 .github
 .idea
-logs
+logs
+*.so
+.ccls

contracting/client.py

@@ -175,37 +175,49 @@ def __init__(self, signer='sys',
         self.submission_filename = submission_filename
         self.environment = environment
 
-        # Seed the genesis contracts into the instance
-        with open(self.submission_filename) as f:
-            contract = f.read()
+        # Get submission contract from file
+        if submission_filename is not None:
+            # Seed the genesis contracts into the instance
+            with open(self.submission_filename) as f:
+                contract = f.read()
 
-        self.raw_driver.set_contract(name='submission',
-                                     code=contract)
+            self.raw_driver.set_contract(name='submission',
+                                         code=contract)
 
-        self.raw_driver.commit()
+            self.raw_driver.commit()
 
+        # Get submission contract from state
         self.submission_contract = self.get_contract('submission')
 
-    def set_submission_contract(self, filename=None):
+    def set_submission_contract(self, filename=None, commit=True):
+        state_contract = self.get_contract('submission')
+
         if filename is None:
             filename = self.submission_filename
 
-        with open(filename) as f:
-            contract = f.read()
+        if filename is None and state_contract is None:
+            raise AssertionError("No submission contract provided or found in state.")
 
-        self.raw_driver.delete_contract(name='submission')
-        self.raw_driver.set_contract(name='submission',
-                                     code=contract)
+        if filename is not None:
+            with open(filename) as f:
+                contract = f.read()
 
-        self.raw_driver.commit()
+            self.raw_driver.delete_contract(name='submission')
+            self.raw_driver.set_contract(name='submission',
+                                         code=contract)
+            if commit:
+                self.raw_driver.commit()
 
         self.submission_contract = self.get_contract('submission')
 
+
     def flush(self):
         # flushes db and resubmits genesis contracts
         self.raw_driver.flush()
         self.raw_driver.clear_pending_state()
-        self.set_submission_contract()
+
+        if self.submission_filename is not None:
+            self.set_submission_contract()
 
     # Returns abstract contract which has partial methods mapped to each exported function.
     def get_contract(self, name):
@@ -273,6 +285,8 @@ def compile(self, f):
 
     def submit(self, f, name=None, metering=None, owner=None, constructor_args={}, signer=None):
 
+        assert self.submission_contract is not None, "No submission contract set. Try set_submission_contract first."
+
         if isinstance(f, FunctionType):
             f, n = self.closure_to_code_string(f)
             if name is None:

contracting/compilation/linter.py

@@ -47,6 +47,11 @@ def no_nested_imports(self, node):
     def visit_Name(self, node):
         self.not_system_variable(node.id, node.lineno)
 
+        if node.id == 'rt':
+            self._is_success = False
+            str = "Line {}: ".format(node.lineno) + VIOLATION_TRIGGERS[13]
+            self._violations.append(str)
+
         if node.id in ILLEGAL_BUILTINS and node.id != 'float':
             self._is_success = False
             str = "Line {}: ".format(node.lineno) + VIOLATION_TRIGGERS[13]

contracting/config.py

@@ -5,9 +5,11 @@
 
 DELIMITER = ':'
 INDEX_SEPARATOR = '.'
+HDF5_GROUP_SEPARATOR = '/'
 
 DECIMAL_PRECISION = 64
 
+SUBMISSION_CONTRACT_NAME = 'submission'
 PRIVATE_METHOD_PREFIX = '__'
 EXPORT_DECORATOR_STRING = 'export'
 INIT_DECORATOR_STRING = 'construct'
@@ -24,3 +26,5 @@
 WRITE_COST_PER_BYTE = 25
 
 STAMPS_PER_TAU = 20
+
+BLOCK_NUM_DEFAULT = -1