From 7b7496a374a10c3e67b716094f6e83a14f015c86 Mon Sep 17 00:00:00 2001
From: lash <dev@holbrook.no>
Date: Tue, 10 May 2022 19:02:49 +0000
Subject: [PATCH] Fix get cli tool, src generation bug

---
 chainlib/eth/tx.py | 12 ++++++------
 requirements.txt   |  4 ++--
 setup.cfg          |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/chainlib/eth/tx.py b/chainlib/eth/tx.py
index 9dc8945..0e063cb 100644
--- a/chainlib/eth/tx.py
+++ b/chainlib/eth/tx.py
@@ -523,7 +523,7 @@ class TxResult(BaseTxResult, Src):
     def apply_src(self, v):
         self.contract = None
 
-        super(TxResult, self).apply_src(v)
+        v = super(TxResult, self).apply_src(v)
 
         self.set_hash(v['transaction_hash'])
         try:
@@ -697,8 +697,8 @@ class Tx(BaseTx, Src):
         :returns: Wire format, in hex
         """
         if self.wire == None:
-            b = pack(self.src(), chain_spec)
-            self.wire = add_0x(b.hex())
+            b = pack(self.src, chain_spec)
+            self.set_wire(add_0x(b.hex()))
         return self.wire
 
 
@@ -750,7 +750,7 @@ input {}
         if self.status != Status.PENDING:
             s += """gas_used {}
 """.format(
-        self.gas_used,
+        self.result.fee_cost,
         )
 
         s += 'status ' + self.status.name + '\n'
@@ -762,7 +762,7 @@ tx_index {}
 """.format(
         self.block.number,
         self.block.hash,
-        self.tx_index,
+        self.result.tx_index,
         )
 
 
@@ -775,7 +775,7 @@ tx_index {}
         if self.wire != None:
             s += """src {}
 """.format(
-        self.wire,
+        str(self.wire),
         )
 
         return s
diff --git a/requirements.txt b/requirements.txt
index 0e63fd6..488a91c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,7 +1,7 @@
 funga-eth~=0.6.1
 pysha3==1.0.2
-hexathon~=0.1.6
+hexathon~=0.1.7
 websocket-client==0.57.0
 potaahto~=0.1.1
-chainlib~=0.1.2
+chainlib~=0.2.0
 confini~=0.6.0
diff --git a/setup.cfg b/setup.cfg
index f63669f..a2649e1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,6 @@
 [metadata]
 name = chainlib-eth
-version = 0.2.0
+version = 0.2.1
 description = Ethereum implementation of the chainlib interface
 author = Louis Holbrook
 author_email = dev@holbrook.no