Merge branch 'master' into chess

* master: Fix plugin docs (#2554) Use protobuf version 3 (#2558)
trailofbits · Jun 1, 2022 · e761932 · e761932
2 parents d8afc95 + dc99880
commit e761932
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/docs/plugins.rst b/docs/plugins.rst
@@ -6,7 +6,7 @@ Core
 
 .. py:function:: will_fork_state_callback(self, state, expression, solutions, policy)
 
-.. py:function:: did_fork_state_callback(self, new_state, expression, new_value,policy)
+.. py:function:: did_fork_state_callback(self, new_state, expression, solutions, policy, children)
 
 .. py:function:: will_load_state_callback(self, state_id)
 
@@ -40,9 +40,9 @@ EVM
 
 .. py:function:: did_evm_execute_instruction_callback(self, last_unstruction, last_arguments, result)
 
-.. py:function:: did_evm_read_memory_callback(self, offset, operators)
+.. py:function:: did_evm_read_memory_callback(self, offset, value, size)
 
-.. py:function:: did_evm_write_memory_callback(self, offset, operators)
+.. py:function:: did_evm_write_memory_callback(self, offset, value, size)
 
 .. py:function:: on_symbolic_sha3_callback(self, data, know_sha3)
 

diff --git a/setup.py b/setup.py
@@ -69,7 +69,7 @@ def rtd_dependent_deps():
     python_requires=">=3.7",
     install_requires=[
         "pyyaml",
-        "protobuf",
+        "protobuf~=3.20",
         # evm dependencies
         "pysha3",
         "prettytable",