chainlib-eth

commit 3e46184d62a92fe8c683459cf836ccc40556af4d
parent e9786cd20a7976be836fa031c7e7218815ad42f7
Author: lash <dev@holbrook.no>
Date:   Sun, 16 Jun 2024 21:06:02 +0100

Use dialect filter for receipt, reinstate payload inputs

Diffstat:
M
CHANGELOG
 | 
9
+++++++++
M
chainlib/eth/tx.py
 | 
10
++++++----
M
requirements.txt
 | 
2
+-
M
setup.cfg
 | 
2
+-
M
test_requirements.txt
 | 
1
+

5 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,12 @@
+- 0.6.3
+	* Accept both "input" and "data" as parameter key for payload in base tx source
+- 0.6.2
+	* Revert input / data field hack in base dialect filter
+- 0.6.1
+	* Accept int or hex for fee limit and cost
+- 0.6.0
+	* Handle missing block author field
+	* Work around pysha break in python 3.11
 - 0.5.2
 	* Fix crash in tx load when no dialect filter
 - 0.5.1
diff --git a/chainlib/eth/tx.py b/chainlib/eth/tx.py
@@ -597,9 +597,7 @@ class Tx(BaseTx, Src):
         super(Tx, self).__init__(src, block=block, result=result, strict=strict, dialect_filter=dialect_filter)
 
         if result == None and rcpt != None:
-            self.apply_receipt(rcpt)
-            if dialect_filter != None:
-                dialect_filter.apply_result(rcpt)
+            self.apply_receipt(rcpt, dialect_filter=dialect_filter)
 
 
     #def apply_src(self, src, dialect_filter=None):
@@ -644,8 +642,12 @@ class Tx(BaseTx, Src):
         if to != None:
             to = to_checksum(strip_0x(to))
         self.inputs = [to]
+    
+        try:
+            self.payload = self.normal(self.src['input'], SrcItem.PAYLOAD)
+        except KeyError:
+            self.payload = self.normal(self.src['data'], SrcItem.PAYLOAD)
 
-        self.payload = self.normal(self.src['input'], SrcItem.PAYLOAD)
 
         try:
             self.set_wire(self.src['raw'])
diff --git a/requirements.txt b/requirements.txt
@@ -2,5 +2,5 @@ funga-eth~=0.8.0
 safe-pysha3==1.0.4
 hexathon~=0.1.7
 websocket-client==0.57.0
-potaahto~=0.1.1
+potaahto~=0.1.2
 chainlib~=0.5.2
diff --git a/setup.cfg b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = chainlib-eth
-version = 0.6.2
+version = 0.6.3
 description = Ethereum implementation of the chainlib interface
 author = Louis Holbrook
 author_email = dev@holbrook.no
diff --git a/test_requirements.txt b/test_requirements.txt
@@ -2,3 +2,4 @@ eth_tester==0.10.0b4
 py-evm==0.10.0b4
 rlp==3.0.0
 coverage==5.5
+#setuptools==70.0.0