Revert "Merge pull request #1076 from ConsenSys/bugfix/bectoken"

This reverts commit 558dd42390, reversing
changes made to 0107a6212d.

mythril/laser/ethereum/instructions.py

@@ -768,10 +768,18 @@ class Instruction:
             size_sym = True
 
         if size_sym:
-            size = (
-                320
-            )  # This excess stuff will get overwritten as memory is dynamically sized
-
+            state.mem_extend(mstart, 1)
+            state.memory[mstart] = global_state.new_bitvec(
+                "calldata_"
+                + str(environment.active_account.contract_name)
+                + "["
+                + str(dstart)
+                + ": + "
+                + str(size)
+                + "]",
+                8,
+            )
+            return [global_state]
         size = cast(int, size)
         if size > 0:
             try:
@@ -1381,15 +1389,7 @@ class Instruction:
                 return self._sload_helper(global_state, str(index))
 
             storage_keys = global_state.environment.active_account.storage.keys()
-            keys = filter(keccak_function_manager.is_keccak, storage_keys)
-            addr = global_state.get_current_instruction()["address"]
-            keccak_keys = [
-                key
-                for key in keys
-                if global_state.environment.active_account.storage.potential_func(
-                    key, addr
-                )
-            ]
+            keccak_keys = list(filter(keccak_function_manager.is_keccak, storage_keys))
 
             results = []  # type: List[GlobalState]
             constraints = []
@@ -1427,16 +1427,11 @@ class Instruction:
         :param constraints:
         :return:
         """
-        address = global_state.get_current_instruction()["address"]
         try:
-            data = global_state.environment.active_account.storage.get(
-                index, addr=address
-            )
+            data = global_state.environment.active_account.storage[index]
         except KeyError:
             data = global_state.new_bitvec("storage_" + str(index), 256)
-            global_state.environment.active_account.storage.put(
-                key=index, value=data, addr=address
-            )
+            global_state.environment.active_account.storage[index] = data
 
         if constraints is not None:
             global_state.mstate.constraints += constraints
@@ -1480,15 +1475,7 @@ class Instruction:
                 return self._sstore_helper(global_state, str(index), value)
 
             storage_keys = global_state.environment.active_account.storage.keys()
-            keccak_keys = list(filter(keccak_function_manager.is_keccak, storage_keys))
-            addr = global_state.get_current_instruction()["address"]
-            keccak_keys = [
-                key
-                for key in keccak_keys
-                if global_state.environment.active_account.storage.potential_func(
-                    key, addr
-                )
-            ]
+            keccak_keys = filter(keccak_function_manager.is_keccak, storage_keys)
 
             results = []  # type: List[GlobalState]
             new = symbol_factory.Bool(False)
@@ -1541,18 +1528,19 @@ class Instruction:
         :param constraint:
         :return:
         """
+        try:
             global_state.environment.active_account = deepcopy(
                 global_state.environment.active_account
             )
             global_state.accounts[
                 global_state.environment.active_account.address.value
             ] = global_state.environment.active_account
-        address = global_state.get_current_instruction()["address"]
-        global_state.environment.active_account.storage.put(
-            key=index,
-            value=value if not isinstance(value, Expression) else simplify(value),
-            addr=address,
+
+            global_state.environment.active_account.storage[index] = (
+                value if not isinstance(value, Expression) else simplify(value)
             )
+        except KeyError:
+            log.debug("Error writing to storage: Invalid index")
 
         if constraint is not None:
             global_state.mstate.constraints.append(constraint)

mythril/laser/ethereum/state/account.py

@@ -24,12 +24,8 @@ class Storage:
         self.concrete = concrete
         self.dynld = dynamic_loader
         self.address = address
-        self._storage_opcodes = {}  # type: Dict
 
-    def get(self, item: Union[str, int], addr: int) -> Any:
-        if item not in self._storage_opcodes:
-            self._storage_opcodes[item] = set()
-        self._storage_opcodes[item].add(addr)
+    def __getitem__(self, item: Union[str, int]) -> Any:
         try:
             return self._storage[item]
         except KeyError:
@@ -60,17 +56,9 @@ class Storage:
         )
         return self._storage[item]
 
-    def put(self, key: Union[int, str], value: Any, addr) -> None:
-        if key not in self._storage_opcodes:
-            self._storage_opcodes[key] = set()
-        self._storage_opcodes[key].add(addr)
+    def __setitem__(self, key: Union[int, str], value: Any) -> None:
         self._storage[key] = value
 
-    def potential_func(self, key, opcode) -> bool:
-        if key not in self._storage_opcodes:
-            return False
-        return opcode in self._storage_opcodes[key]
-
     def keys(self) -> KeysView:
         """
 

tests/laser/evm_testsuite/evm_test.py

@@ -125,7 +125,7 @@ def test_vmtest(
         account.code = Disassembly(details["code"][2:])
         account.nonce = int(details["nonce"], 16)
         for key, value in details["storage"].items():
-            account.storage.put(int(key, 16), int(value, 16), 10)
+            account.storage[int(key, 16)] = int(value, 16)
 
         world_state.put_account(account)
         account.set_balance(int(details["balance"], 16))
@@ -175,7 +175,7 @@ def test_vmtest(
 
             for index, value in details["storage"].items():
                 expected = int(value, 16)
-                actual = account.storage.get(int(index, 16), 0)
+                actual = account.storage[int(index, 16)]
 
                 if isinstance(actual, Expression):
                     actual = actual.value

tests/laser/state/storage_test.py

@@ -12,7 +12,7 @@ def test_concrete_storage_uninitialized_index(initial_storage, key):
     storage._storage = initial_storage
 
     # Act
-    value = storage.get(key, 0)
+    value = storage[key]
 
     # Assert
     assert value == 0
@@ -25,7 +25,7 @@ def test_symbolic_storage_uninitialized_index(initial_storage, key):
     storage._storage = initial_storage
 
     # Act
-    value = storage.get(key, 0)
+    value = storage[key]
 
     # Assert
     assert isinstance(value, Expression)
@@ -36,10 +36,10 @@ def test_storage_set_item():
     storage = Storage()
 
     # Act
-    storage.put(key=1, value=13, addr=10)
+    storage[1] = 13
 
     # Assert
-    assert storage.get(item=1, addr=10) == 13
+    assert storage[1] == 13
 
 
 def test_storage_change_item():
@@ -47,7 +47,7 @@ def test_storage_change_item():
     storage = Storage()
     storage._storage = {1: 12}
     # Act
-    storage.put(key=1, value=14, addr=10)
+    storage[1] = 14
 
     # Assert
-    assert storage.get(item=1, addr=10) == 14
+    assert storage[1] == 14

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

@@ -1,19 +1,5 @@
 {
     "error": null,
-    "issues": [
-        {
-            "address": 498,
-            "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": "sendToken(address,uint256)",
-            "max_gas_used": 52806,
-            "min_gas_used": 11860,
-            "severity": "High",
-            "sourceMap": null,
-            "swc-id": "101",
-            "title": "Integer Overflow"
-        }
-    ],
+    "issues": [],
     "success": true
 }

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

@@ -1,24 +1,6 @@
 [
     {
-        "issues": [
-            {
-                "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": "498:1:0"
-                    }
-                ],
-                "severity": "High",
-                "swcID": "SWC-101",
-                "swcTitle": "Integer Overflow and Underflow"
-            }
-        ],
+        "issues": [],
         "meta": {},
         "sourceFormat": "evm-byzantium-bytecode",
         "sourceList": [

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

@@ -1,14 +1,3 @@
-# Analysis results for test-filename.sol
+# Analysis results for None
 
-## Integer Overflow
-- SWC ID: 101
-- Severity: High
-- Contract: Unknown
-- Function name: `sendToken(address,uint256)`
-- PC address: 498
-- Estimated Gas Usage: 11860 - 52806
-
-### 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.
+The analysis was completed successfully. No issues were detected.

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

@@ -1,11 +1 @@
-==== Integer Overflow ====
-SWC ID: 101
-Severity: High
-Contract: Unknown
-Function name: sendToken(address,uint256)
-PC address: 498
-Estimated Gas Usage: 11860 - 52806
-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.
---------------------
-
+The analysis was completed successfully. No issues were detected.