Skip to content

Commit

Permalink
Merge branch 'yoprogramo-master' into bugfix-202401
Browse files Browse the repository at this point in the history
  • Loading branch information
mccwdev committed Dec 1, 2023
2 parents 771b9f1 + c6efbde commit dab9998
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions bitcoinlib/services/bitcoind.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class BitcoindClient(BaseClient):
"""

@staticmethod
def from_config(configfile=None, network='bitcoin', **kwargs):
def from_config(configfile=None, network='bitcoin', *args):
"""
Read settings from bitcoind config file
Expand Down Expand Up @@ -113,9 +113,9 @@ def from_config(configfile=None, network='bitcoin', **kwargs):
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, **kwargs)
return BitcoindClient(network, url, *args)

def __init__(self, network='bitcoin', base_url='', denominator=100000000, **kwargs):
def __init__(self, network='bitcoin', base_url='', denominator=100000000, *args):
"""
Open connection to bitcoin node
Expand All @@ -134,7 +134,7 @@ def __init__(self, network='bitcoin', base_url='', denominator=100000000, **kwar
network = bdc.network
_logger.info("Connect to bitcoind")
self.proxy = AuthServiceProxy(base_url)
super(self.__class__, self).__init__(network, PROVIDERNAME, base_url, denominator, **kwargs)
super(self.__class__, self).__init__(network, PROVIDERNAME, base_url, denominator, *args)

def getbalance(self, addresslist):
balance = 0
Expand Down

0 comments on commit dab9998

Please sign in to comment.