Merge pull request #386 from DavidKnott/improve-external-contract-calls

External contract calls cannot be used internally

tests/parser/features/test_external_contract_calls.py

@@ -199,6 +199,59 @@ def __init__(arg1: address):
     print('Successfully executed a multiple external contract calls')
 
 
+def test_invalid_external_contract_call_to_the_same_contract(assert_tx_failed):
+    contract_1 = """
+def bar() -> num:
+    return 1
+    """
+
+    contract_2 = """
+class Bar():
+    def bar() -> num: pass
+
+def bar() -> num:
+    return 1
+
+def _stmt(x: address):
+    Bar(x).bar()
+
+def _expr(x: address) -> num:
+    return Bar(x).bar()
+    """
+
+    t.s = t.Chain()
+    c1 = get_contract(contract_1)
+    c2 = get_contract(contract_2)
+
+    c2._stmt(c1.address)
+    c2._expr(c1.address)
+    assert_tx_failed(t, lambda: c2._stmt(c2.address))
+    assert_tx_failed(t, lambda: c2._expr(c2.address))
+
+
+def test_invalid_nonexistent_contract_call(assert_tx_failed):
+    contract_1 = """
+def bar() -> num:
+    return 1
+    """
+
+    contract_2 = """
+class Bar():
+    def bar() -> num: pass
+
+def foo(x: address) -> num:
+    return Bar(x).bar()
+    """
+
+    c1 = get_contract(contract_1)
+    c2 = get_contract(contract_2)
+    t.s = s
+
+    assert c2.foo(c1.address) == 1
+    assert_tx_failed(t, lambda: c2.foo(t.a1))
+    assert_tx_failed(t, lambda: c2.foo(t.a7))
+
+
 def test_invalid_contract_reference_declaration(assert_tx_failed):
     contract = """
 class Bar():

viper/parser/parser.py

@@ -460,7 +460,10 @@ def external_contract_call_stmt(stmt, context):
     sig = context.sigs[contract_name][method_name]
     contract_address = parse_expr(stmt.func.value.args[0], context)
     inargs, inargsize = pack_arguments(sig, [parse_expr(arg, context) for arg in stmt.args], context)
-    o = LLLnode.from_list(['assert', ['call', ['gas'], ['mload', contract_address], 0, inargs, inargsize, 0, 0]],
+    o = LLLnode.from_list(['seq',
+                            ['assert', ['extcodesize', ['mload', contract_address]]],
+                            ['assert', ['ne', 'address', ['mload', contract_address]]],
+                            ['assert', ['call', ['gas'], ['mload', contract_address], 0, inargs, inargsize, 0, 0]]],
                                     typ=None, location='memory', pos=getpos(stmt))
     return o
 
@@ -484,6 +487,8 @@ def external_contract_call_expr(expr, context):
     else:
         raise TypeMismatchException("Invalid output type: %r" % sig.output_type, expr)
     o = LLLnode.from_list(['seq',
+                            ['assert', ['extcodesize', ['mload', contract_address]]],
+                            ['assert', ['ne', 'address', ['mload', contract_address]]],
                             ['assert', ['call', ['gas'], ['mload', contract_address], 0,
                             inargs, inargsize,
                             output_placeholder, get_size_of_type(sig.output_type) * 32]],