Merge pull request #74 from skalenetwork/hotfix-consistent-sign-and-send

Hotfix consistent sign and send
skalenetwork · Jan 2, 2020 · bed3f10 · bed3f10
2 parents 1dbcdec + 274824c
commit bed3f10
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/skale/wallets/common.py b/skale/wallets/common.py
@@ -26,7 +26,7 @@ def sign(self, tx):
         pass
 
     @abstractmethod
-    def sign_and_send(self, tx_dict):
+    def sign_and_send(self, tx_dict) -> str:
         pass
 
     @property

diff --git a/skale/wallets/ledger_wallet.py b/skale/wallets/ledger_wallet.py
@@ -135,9 +135,9 @@ def sign(self, tx_dict):
         exchange_result = self.exchange_sign_payload_by_chunks(payload)
         return LedgerWallet.parse_sign_result(tx, exchange_result)
 
-    def sign_and_send(self, tx):
+    def sign_and_send(self, tx) -> str:
         signed_tx = self.sign(tx)
-        return self._web3.eth.sendRawTransaction(signed_tx.rawTransaction)
+        return self._web3.eth.sendRawTransaction(signed_tx.rawTransaction).hex()
 
     @classmethod
     def parse_derive_result(cls, exchange_result):
@@ -164,15 +164,15 @@ def get_address_with_public_key(self):
         return LedgerWallet.parse_derive_result(exchange_result)
 
 
-def hardware_sign_and_send(web3, method, gas_amount, wallet):
+def hardware_sign_and_send(web3, method, gas_amount, wallet) -> str:
     address_from = wallet['address']
     eth_nonce = get_eth_nonce(web3, address_from)
     tx_dict = method.buildTransaction({
         'gas': gas_amount,
         'nonce': eth_nonce
     })
     signed_txn = wallet.sign(tx_dict)
-    tx = web3.eth.sendRawTransaction(signed_txn.rawTransaction)
+    tx = web3.eth.sendRawTransaction(signed_txn.rawTransaction).hex()
     logger.info(
         f'{method.__class__.__name__} - transaction_hash: {web3.toHex(tx)}'
     )

diff --git a/skale/wallets/sgx_wallet.py b/skale/wallets/sgx_wallet.py
@@ -37,9 +37,9 @@ def sign(self, tx_dict):
             tx_dict['nonce'] = get_eth_nonce(self._web3, self._address)
         return self.sgx_client.sign(tx_dict, self.key_name)
 
-    def sign_and_send(self, tx):
+    def sign_and_send(self, tx) -> str:
         signed_tx = self.sgx_client.sign(tx, self.key_name)
-        return self._web3.eth.sendRawTransaction(signed_tx.rawTransaction)
+        return self._web3.eth.sendRawTransaction(signed_tx.rawTransaction).hex()
 
     @property
     def address(self):

diff --git a/skale/wallets/web3_wallet.py b/skale/wallets/web3_wallet.py
@@ -66,9 +66,9 @@ def sign(self, tx_dict):
             private_key=self._private_key
         )
 
-    def sign_and_send(self, tx_dict):
+    def sign_and_send(self, tx_dict) -> str:
         signed_tx = self.sign(tx_dict)
-        return self._web3.eth.sendRawTransaction(signed_tx.rawTransaction)
+        return self._web3.eth.sendRawTransaction(signed_tx.rawTransaction).hex()
 
     @property
     def address(self):