Fix the tests to support latest changes

mythril/laser/ethereum/instructions.py

@@ -1384,12 +1384,12 @@ class Instruction:
             key_argument = keccak_function_manager.get_argument(keccak_key)
             index_argument = keccak_function_manager.get_argument(index)
             condition = index_argument == key_argument
-            condition = (
+            condition_z3 = (
                 condition
                 if isinstance(condition, Bool)
                 else symbol_factory.Bool(condition)
             )
-            constraints.append((keccak_key, condition))
+            constraints.append((keccak_key, condition_z3))
 
         for (keccak_key, constraint) in constraints:
             if constraint in state.constraints:

tests/laser/evm_testsuite/evm_test.py

@@ -136,10 +136,10 @@ def test_vmtest(
 
             assert account.nonce == int(details["nonce"], 16)
             assert account.code.bytecode == details["code"][2:]
-
+            print(account.storage._storage, details["storage"])
             for index, value in details["storage"].items():
                 expected = int(value, 16)
-                actual = account.storage[int(index, 16)]
+                actual = account.storage[str(int(index, 16))]
                 if isinstance(actual, Expression):
                     actual = actual.value
                     actual = 1 if actual is True else 0 if actual is False else actual

tests/testdata/outputs_expected/overflow.sol.o.json

@@ -26,6 +26,19 @@
             "sourceMap": null,
             "swc-id": "101",
             "title": "Integer Underflow"
+        },
+        {
+            "address": 725,
+            "contract": "Unknown",
+            "debug": "<DEBUG-DATA>",
+            "description": "The binary addition can overflow.\nThe operands of the addition operation are not sufficiently constrained. The addition could therefore result in an integer overflow. Prevent the overflow by checking inputs or ensure sure that the overflow is caught by an assertion.",
+            "function": "sendeth(address,uint256)",
+            "max_gas_used": 78155,
+            "min_gas_used": 17019,
+            "severity": "High",
+            "sourceMap": null,
+            "swc-id": "101",
+            "title": "Integer Overflow"
         }
     ],
     "success": true

tests/testdata/outputs_expected/overflow.sol.o.jsonv2

@@ -34,6 +34,23 @@
                 "severity": "High",
                 "swcID": "SWC-101",
                 "swcTitle": "Integer Overflow and Underflow"
+            },
+            {
+                "description": {
+                    "head": "The binary addition can overflow.",
+                    "tail": "The operands of the addition operation are not sufficiently constrained. The addition could therefore result in an integer overflow. Prevent the overflow by checking inputs or ensure sure that the overflow is caught by an assertion."
+                },
+                "extra": {
+                    "discoveryTime": "<DISCOVERY-TIME-DATA>"
+                },
+                "locations": [
+                    {
+                        "sourceMap": "725:1:0"
+                    }
+                ],
+                "severity": "High",
+                "swcID": "SWC-101",
+                "swcTitle": "Integer Overflow and Underflow"
             }
         ],
         "meta": {},

tests/testdata/outputs_expected/overflow.sol.o.markdown

@@ -25,3 +25,16 @@ The operands of the subtraction operation are not sufficiently constrained. The
 
 The binary subtraction can underflow.
 The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion.
+
+## Integer Overflow
+- SWC ID: 101
+- Severity: High
+- Contract: Unknown
+- Function name: `sendeth(address,uint256)`
+- PC address: 725
+- Estimated Gas Usage: 17019 - 78155
+
+### Description
+
+The binary addition can overflow.
+The operands of the addition operation are not sufficiently constrained. The addition could therefore result in an integer overflow. Prevent the overflow by checking inputs or ensure sure that the overflow is caught by an assertion.

tests/testdata/outputs_expected/overflow.sol.o.text

@@ -20,3 +20,14 @@ The binary subtraction can underflow.
 The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion.
 --------------------
 
+==== Integer Overflow ====
+SWC ID: 101
+Severity: High
+Contract: Unknown
+Function name: sendeth(address,uint256)
+PC address: 725
+Estimated Gas Usage: 17019 - 78155
+The binary addition can overflow.
+The operands of the addition operation are not sufficiently constrained. The addition could therefore result in an integer overflow. Prevent the overflow by checking inputs or ensure sure that the overflow is caught by an assertion.
+--------------------
+

tests/testdata/outputs_expected/underflow.sol.o.json

@@ -26,6 +26,19 @@
             "sourceMap": null,
             "swc-id": "101",
             "title": "Integer Underflow"
+        },
+        {
+            "address": 725,
+            "contract": "Unknown",
+            "debug": "<DEBUG-DATA>",
+            "description": "The binary addition can overflow.\nThe operands of the addition operation are not sufficiently constrained. The addition could therefore result in an integer overflow. Prevent the overflow by checking inputs or ensure sure that the overflow is caught by an assertion.",
+            "function": "sendeth(address,uint256)",
+            "max_gas_used": 52861,
+            "min_gas_used": 11915,
+            "severity": "High",
+            "sourceMap": null,
+            "swc-id": "101",
+            "title": "Integer Overflow"
         }
     ],
     "success": true

tests/testdata/outputs_expected/underflow.sol.o.jsonv2

@@ -34,6 +34,23 @@
                 "severity": "High",
                 "swcID": "SWC-101",
                 "swcTitle": "Integer Overflow and Underflow"
+            },
+            {
+                "description": {
+                    "head": "The binary addition can overflow.",
+                    "tail": "The operands of the addition operation are not sufficiently constrained. The addition could therefore result in an integer overflow. Prevent the overflow by checking inputs or ensure sure that the overflow is caught by an assertion."
+                },
+                "extra": {
+                    "discoveryTime": "<DISCOVERY-TIME-DATA>"
+                },
+                "locations": [
+                    {
+                        "sourceMap": "725:1:0"
+                    }
+                ],
+                "severity": "High",
+                "swcID": "SWC-101",
+                "swcTitle": "Integer Overflow and Underflow"
             }
         ],
         "meta": {},

tests/testdata/outputs_expected/underflow.sol.o.markdown

@@ -25,3 +25,16 @@ The operands of the subtraction operation are not sufficiently constrained. The
 
 The binary subtraction can underflow.
 The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion.
+
+## Integer Overflow
+- SWC ID: 101
+- Severity: High
+- Contract: Unknown
+- Function name: `sendeth(address,uint256)`
+- PC address: 725
+- Estimated Gas Usage: 11915 - 52861
+
+### Description
+
+The binary addition can overflow.
+The operands of the addition operation are not sufficiently constrained. The addition could therefore result in an integer overflow. Prevent the overflow by checking inputs or ensure sure that the overflow is caught by an assertion.

tests/testdata/outputs_expected/underflow.sol.o.text

@@ -20,3 +20,14 @@ The binary subtraction can underflow.
 The operands of the subtraction operation are not sufficiently constrained. The subtraction could therefore result in an integer underflow. Prevent the underflow by checking inputs or ensure sure that the underflow is caught by an assertion.
 --------------------
 
+==== Integer Overflow ====
+SWC ID: 101
+Severity: High
+Contract: Unknown
+Function name: sendeth(address,uint256)
+PC address: 725
+Estimated Gas Usage: 11915 - 52861
+The binary addition can overflow.
+The operands of the addition operation are not sufficiently constrained. The addition could therefore result in an integer overflow. Prevent the overflow by checking inputs or ensure sure that the overflow is caught by an assertion.
+--------------------
+