Merge pull request #995 from xwings/dev

fix evm test

Author: xwings

qiling/loader/evm.py

@@ -15,7 +15,7 @@ def __init__(self, ql:Qiling):
         self.ql = ql
 
         if self.ql.code is None:
-            with open(self.ql.filename[0]) as f:
+            with open(self.ql.path) as f:
                 self.ql.code = f.read()
 
     def run(self):

tests/test_evm.py

@@ -20,12 +20,67 @@ def __init__(self) -> None:
         self.visited_hookaddr = False
 
 class EVMTest(unittest.TestCase):
-    def test_underflow(self):
-        ql = Qiling(archtype="evm", verbose=4)
+    def test_underflow_code(self):
+        ql = Qiling(code="0x6060604052341561000f57600080fd5b60405160208061031c833981016040528080519060200190919050508060018190556000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050610299806100836000396000f300606060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806318160ddd1461005c57806370a0823114610085578063a9059cbb146100d2575b600080fd5b341561006757600080fd5b61006f61012c565b6040518082815260200191505060405180910390f35b341561009057600080fd5b6100bc600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610132565b6040518082815260200191505060405180910390f35b34156100dd57600080fd5b610112600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061017a565b604051808215151515815260200191505060405180910390f35b60015481565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b600080826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205403101515156101cb57600080fd5b816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254019250508190555060019050929150505600a165627a7a7230582098f1551a391a3e65b3ce45cfa2b3fa5f91eea9a3e7181a81454e025ea0d7151c0029",archtype="evm", verbose=4)
         testcheck = Checklist()
-        code = '0x6060604052341561000f57600080fd5b60405160208061031c833981016040528080519060200190919050508060018190556000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000208190555050610299806100836000396000f300606060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806318160ddd1461005c57806370a0823114610085578063a9059cbb146100d2575b600080fd5b341561006757600080fd5b61006f61012c565b6040518082815260200191505060405180910390f35b341561009057600080fd5b6100bc600480803573ffffffffffffffffffffffffffffffffffffffff16906020019091905050610132565b6040518082815260200191505060405180910390f35b34156100dd57600080fd5b610112600480803573ffffffffffffffffffffffffffffffffffffffff1690602001909190803590602001909190505061017a565b604051808215151515815260200191505060405180910390f35b60015481565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b600080826000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205403101515156101cb57600080fd5b816000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254019250508190555060019050929150505600a165627a7a7230582098f1551a391a3e65b3ce45cfa2b3fa5f91eea9a3e7181a81454e025ea0d7151c0029'
         argu = ql.arch.evm.abi.convert(['uint256'], [20])
-        code = code + argu
+        code = ql.code + argu
+
+        user1 = ql.arch.evm.create_account(balance=100*10**18)
+        user2 = ql.arch.evm.create_account(balance=100*10**18)
+        c1 = ql.arch.evm.create_account()
+
+        def hookcode_test(ql, *argv):
+            testcheck.visited_hookcode = True
+
+        def hookinsn_test(ql, *argv):
+            testcheck.visited_hookinsn = True
+
+        def hookaddr_test(ql):
+            testcheck.visited_hookaddr = True
+
+        h0 = ql.hook_code(hookcode_test)
+        h1 = ql.hook_address(hookaddr_test, 10)
+
+        # message1: deploy runtime code
+        msg0 = ql.arch.evm.create_message(user1, b'', code=code, contract_address=c1)
+        ql.run(code=msg0)
+
+        ql.hook_del(h0)
+        ql.hook_del(h1)
+        h2 = ql.hook_insn(hookinsn_test, 'PUSH4')
+
+        #  # SMART CONTRACT DEPENDENT - message2: check balance of user1, should be 20
+        def check_balance(sender, destination):
+            call_data = '0x70a08231'+ql.arch.evm.abi.convert(['address'], [sender])
+            msg2 = ql.arch.evm.create_message(sender, destination, call_data)
+            return ql.run(code=msg2)
+        
+        result = check_balance(user1, c1)
+        print('\n\nuser1 balance =', int(result.output.hex()[2:], 16))
+        ql.hook_del(h2)
+
+        # SMART CONTRACT DEPENDENT - message3: transform 21 from user1 to user2
+        call_data = '0xa9059cbb'+ ql.arch.evm.abi.convert(['address'], [user2]) + \
+                                        ql.arch.evm.abi.convert(['uint256'], [21])
+        msg1 = ql.arch.evm.create_message(user1, c1, call_data)    
+        result = ql.run(code=msg1)
+        print('\n\nis success =', int(result.output.hex()[2:], 16))
+
+        # message4: check balance of user1, should be MAX - 1
+        result = check_balance(user1, c1)
+        print('\n\nuser1 balance =', hex(int(result.output.hex()[2:], 16)))
+        
+        self.assertEqual(hex(int(result.output.hex()[2:], 16)), '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff')
+        self.assertTrue(testcheck.visited_hookaddr)
+        self.assertTrue(testcheck.visited_hookcode)
+        self.assertTrue(testcheck.visited_hookinsn)
+
+    def test_underflow_filename(self):
+        ql = Qiling(["rootfs/evm/undeflow.hex"], archtype="evm", verbose=4)
+        testcheck = Checklist()
+        argu = ql.arch.evm.abi.convert(['uint256'], [20])
+        code = ql.code + argu
 
         user1 = ql.arch.evm.create_account(balance=100*10**18)
         user2 = ql.arch.evm.create_account(balance=100*10**18)