From b054328612ee863de7c33313be8122ee10a59fe9 Mon Sep 17 00:00:00 2001 From: Eric Kilmer Date: Wed, 1 Jun 2022 14:58:52 -0400 Subject: [PATCH 1/2] Use protobuf version 3 (#2558) Protobuf introduced major version 4.21.0, which contains breaking changes This is a quick fix which pins protobuf to 3.20.1 before we eventually migrate the codebase to proto4 Co-authored-by: kokrui --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 5cbeec53d..af467fcff 100644 --- a/setup.py +++ b/setup.py @@ -68,7 +68,7 @@ def rtd_dependent_deps(): python_requires=">=3.7", install_requires=[ "pyyaml", - "protobuf", + "protobuf~=3.20", # evm dependencies "pysha3", "prettytable", From dc99880021c79d042cd4e1c4c6113d1f47431b33 Mon Sep 17 00:00:00 2001 From: lordidiot <0xlordidiot@gmail.com> Date: Thu, 2 Jun 2022 03:00:57 +0800 Subject: [PATCH 2/2] Fix plugin docs (#2554) * update did_fork_state doc * update did_evm_read/write_memory_callback doc --- docs/plugins.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/plugins.rst b/docs/plugins.rst index acff3528c..fb159cbaf 100644 --- 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)