diff --git a/bitcoinlib/services/bitcoind.py b/bitcoinlib/services/bitcoind.py index 2e4eeaf6..f74001c8 100644 --- a/bitcoinlib/services/bitcoind.py +++ b/bitcoinlib/services/bitcoind.py @@ -53,7 +53,7 @@ class BitcoindClient(BaseClient): """ @staticmethod - def from_config(configfile=None, network='bitcoin'): + def from_config(configfile=None, network='bitcoin', **kwargs): """ Read settings from bitcoind config file @@ -113,9 +113,9 @@ def from_config(configfile=None, network='bitcoin'): server = _read_from_config(config, 'rpc', 'externalip', server) url = "http://%s:%s@%s:%s" % (config.get('rpc', 'rpcuser'), config.get('rpc', 'rpcpassword'), server, port) - return BitcoindClient(network, url) + return BitcoindClient(network, url, **kwargs) - def __init__(self, network='bitcoin', base_url='', denominator=100000000, *args): + def __init__(self, network='bitcoin', base_url='', denominator=100000000, **kwargs): """ Open connection to bitcoin node @@ -123,7 +123,7 @@ def __init__(self, network='bitcoin', base_url='', denominator=100000000, *args) :type: str :param base_url: Connection URL in format http(s)://user:password@host:port. :type: str - :param denominator: Denominator for this currency. Should be always 100000000 (satoshis) for bitcoin + :param denominator: Denominator for this currency. Should be always 100000000 (Satoshi's) for bitcoin :type: str """ if isinstance(network, Network): @@ -134,7 +134,7 @@ def __init__(self, network='bitcoin', base_url='', denominator=100000000, *args) network = bdc.network _logger.info("Connect to bitcoind") self.proxy = AuthServiceProxy(base_url) - super(self.__class__, self).__init__(network, PROVIDERNAME, base_url, denominator, *args) + super(self.__class__, self).__init__(network, PROVIDERNAME, base_url, denominator, **kwargs) def getbalance(self, addresslist): balance = 0