chainlib/eth/settings.py

@@ -16,13 +16,6 @@ def process_settings_rpc(settings, config):
     rpc = chainlib.eth.cli.Rpc(settings.get('WALLET'))
     conn = rpc.connect_by_config(config)
 
-    settings.set('CONN', conn)
-    settings.set('RPC_ID_GENERATOR', rpc.id_generator)
-    settings.set('RPC_SEND', config.true('_RPC_SEND'))
-
-    gas_oracle = rpc.get_gas_oracle()
-    settings.set('GAS_ORACLE', gas_oracle)
-
     try:
         settings.set('SIGNER', rpc.get_signer())
         sender_address = rpc.get_sender_address()
@@ -32,9 +25,16 @@ def process_settings_rpc(settings, config):
     except SignerMissingException:
         pass
 
+    gas_oracle = rpc.get_gas_oracle()
+    settings.set('GAS_ORACLE', gas_oracle)
+
     nonce_oracle = rpc.get_nonce_oracle()
     settings.set('NONCE_ORACLE', nonce_oracle)
 
+    settings.set('CONN', conn)
+    settings.set('RPC_ID_GENERATOR', rpc.id_generator)
+    settings.set('RPC_SEND', config.true('_RPC_SEND'))
+    
     return settings
 
 
@@ -93,9 +93,6 @@ def process_settings_contract(settings, config):
     except KeyError:
         return settings
 
-    if exec_address_in == None:
-        return settings
-
     exec_address = to_checksum_address(exec_address_in)
     if not config.true('_UNSAFE') and exec_address != exec_address_in:
         raise ValueError('invalid checksum address: {}'.format(exec_address_in))

chainlib/eth/tx.py

@@ -410,14 +410,12 @@ class TxFactory:
         txe = EIP155Transaction(tx, tx['nonce'], tx['chainId'])
         txes = txe.serialize()
         gas_price = strip_0x(txes['gasPrice'])
-        gas_price = compact(gas_price)
         gas = strip_0x(txes['gas'])
-        gas = compact(gas)
         return {
             'from': tx['from'],
             'to': txes['to'],
-            'gasPrice': add_0x(gas_price, compact_value=True),
-            'gas': add_0x(gas, compact_value=True),
+            'gasPrice': add_0x(compact(gas_price)),
+            'gas': add_0x(compact(gas)),
             'data': txes['data'],
                 }
 
@@ -749,16 +747,13 @@ input {}
         self.payload,
         )
 
-        status = Status.UNKNOWN.name
-        logg.debug('selfstatus {}'.format(self.status))
-        if self.result != None and self.result.status != Status.PENDING:
+        if self.status != Status.PENDING:
             s += """gas_used {}
 """.format(
         self.result.fee_cost,
-            status = self.result.status.name
         )
 
-        s += 'status ' + status + '\n'
+        s += 'status ' + self.status.name + '\n'
 
         if self.block != None:
             s += """block_number {}