chaind-eth

commit 51eb011b1f556952330fe051e80dccc215b98047
parent 4f20d77156ce14386aa156eafd7785a27a80becc
Author: lash <dev@holbrook.no>
Date:   Wed,  7 Jun 2023 10:17:54 +0100

Upgrade to chainlib 0.4.x

Diffstat:
M
chaind/eth/cache.py
 | 
5
+++++
M
chaind/eth/runnable/send.py
 | 
3
++-
M
requirements.txt
 | 
6
+++---
M
setup.cfg
 | 
6
+++---

4 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/chaind/eth/cache.py b/chaind/eth/cache.py
@@ -1,3 +1,6 @@
+# standard imports
+import logging
+
 # external imports
 from hexathon import strip_0x
 from chainqueue.cache import (
@@ -7,6 +10,7 @@ from chainqueue.cache import (
 from chainlib.eth.tx import unpack
 from chainlib.encode import TxHexNormalizer
 
+logg = logging.getLogger(__name__)
 
 class Normalizer(TxHexNormalizer, NoopNormalizer):
 
@@ -33,6 +37,7 @@ class EthCacheTx(CacheTx):
     def deserialize(self, signed_tx):
         signed_tx_bytes = bytes.fromhex(strip_0x(signed_tx))
         tx = unpack(signed_tx_bytes, self.chain_spec)
+        logg.debug('have tx {}'.format(tx))
         self.hash = eth_normalizer.hash(tx['hash'])
         self.sender = eth_normalizer.address(tx['from'])
         self.recipient = eth_normalizer.address(tx['to'])
diff --git a/chaind/eth/runnable/send.py b/chaind/eth/runnable/send.py
@@ -168,7 +168,8 @@ def main():
             settings.get('NONCE_ORACLE'),
             )
     
-    processor = Processor(token_resolver, config.get('_SOURCE'), use_checksum=not config.get('_UNSAFE'))
+    logg.debug('source {}'.format(config.get('_SOURCE')))
+    processor = Processor(token_resolver, config.get('_SOURCE')[0], use_checksum=not config.get('_UNSAFE'))
     processor.add_processor(CSVProcessor())
 
     sends = None
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
-chaind~=0.3.0
+#chaind~=0.4.0
 hexathon~=0.1.7
-chainlib-eth~=0.3.0
+chainlib-eth~=0.4.24
 pyxdg~=0.27
-funga-eth~=0.6.1
+funga-eth~=0.6.6
diff --git a/setup.cfg b/setup.cfg
@@ -1,10 +1,10 @@
 [metadata]
 name = chaind-eth
-version = 0.3.3
+version = 0.4.0
 description = Queue server for ethereum
 author = Louis Holbrook
 author_email = dev@holbrook.no
-url = https://git.defalsify.org/chaind-eth.git
+url = https://git.defalsify.org/chaind-eth
 keywords =
 	dlt
 	blockchain
@@ -24,7 +24,7 @@ licence_files =
 	LICENSE
 
 [options]
-python_requires = >= 3.7
+python_requires = >= 3.8
 include_package_data = True
 packages =
 	chaind.eth