Merge pull request #35 from feliam/dev-fixinstrospection1

Fix mem read/write introspection

Author: computerality

pyevmasm/evmasm.py

@@ -270,42 +270,42 @@ def writes_to_stack(self):
     @property
     def writes_to_memory(self):
         """ True if the instruction writes to memory """
-        return self.semantics in ('MSTORE', 'MSTORE8', 'CALLDATACOPY', 'CODECOPY', 'EXTCODECOPY')
+        return self.semantics in {'MSTORE', 'MSTORE8', 'CALLDATACOPY', 'CODECOPY', 'EXTCODECOPY', 'RETURNDATACOPY', 'CALL', 'STATICCALL', 'DELEGATECALL', 'CALLCODE'}
 
     @property
     def reads_from_memory(self):
         """ True if the instruction reads from memory """
-        return self.semantics in ('MLOAD', 'CREATE', 'CALL', 'CALLCODE', 'RETURN', 'DELEGATECALL', 'REVERT')
+        return self.semantics in {'MLOAD', 'CREATE', 'CALL', 'STATICCALL', 'DELEGATECALL', 'CALLCODE', 'RETURN', 'REVERT'}
 
     @property
     def writes_to_storage(self):
         """ True if the instruction writes to the storage """
-        return self.semantics in 'SSTORE'
+        return self.semantics == 'SSTORE'
 
     @property
     def reads_from_storage(self):
         """ True if the instruction reads from the storage """
-        return self.semantics in 'SLOAD'
+        return self.semantics == 'SLOAD'
 
     @property
     def is_terminator(self):
         """ True if the instruction is a basic block terminator """
-        return self.semantics in ('RETURN', 'STOP', 'INVALID', 'JUMP', 'JUMPI', 'SELFDESTRUCT', 'REVERT')
+        return self.semantics in {'RETURN', 'STOP', 'INVALID', 'JUMP', 'JUMPI', 'SELFDESTRUCT', 'REVERT'}
 
     @property
     def is_endtx(self):
         """ True if the instruction is a transaction terminator """
-        return self.semantics in ('RETURN', 'STOP', 'INVALID', 'SELFDESTRUCT', 'REVERT')
+        return self.semantics in {'RETURN', 'STOP', 'INVALID', 'SELFDESTRUCT', 'REVERT'}
 
     @property
     def is_starttx(self):
         """ True if the instruction is a transaction initiator """
-        return self.semantics in ('CREATE', 'CREATE2', 'CALL', 'CALLCODE', 'DELEGATECALL')
+        return self.semantics in {'CREATE', 'CREATE2', 'CALL', 'CALLCODE', 'DELEGATECALL', 'STATICCALL'}
 
     @property
     def is_branch(self):
         """ True if the instruction is a jump """
-        return self.semantics in ('JUMP', 'JUMPI')
+        return self.semantics in {'JUMP', 'JUMPI'}
 
     @property
     def is_environmental(self):
@@ -325,8 +325,8 @@ def uses_block_info(self):
     @property
     def is_arithmetic(self):
         """ True if the instruction is an arithmetic operation """
-        return self.semantics in (
-            'ADD', 'MUL', 'SUB', 'DIV', 'SDIV', 'MOD', 'SMOD', 'ADDMOD', 'MULMOD', 'EXP', 'SIGNEXTEND', 'SHL', 'SHR', 'SAR')
+        return self.semantics in {
+            'ADD', 'MUL', 'SUB', 'DIV', 'SDIV', 'MOD', 'SMOD', 'ADDMOD', 'MULMOD', 'EXP', 'SIGNEXTEND', 'SHL', 'SHR', 'SAR'}
 
 
 def assemble_one(asmcode, pc=0, fork=DEFAULT_FORK):