Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2025-01-18 16:44:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

client: Bug fix, coin_name() is capitalised.

Browse source
This commit is contained in:
tecnovert 2021-02-14 16:53:44 +02:00
parent d6a1ff6030
commit 1953820cd1
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
basicswap/basicswap.py
View file

@ -871,7 +871,7 @@ class BasicSwap(BaseApp):
ci.initialiseWallet(key_view, key_spend) ci.initialiseWallet(key_view, key_spend)
root_address = ci.getAddressFromKeys(key_view, key_spend) root_address = ci.getAddressFromKeys(key_view, key_spend)
key_str = 'main_wallet_addr_' + ci.coin_name() key_str = 'main_wallet_addr_' + ci.coin_name().lower()
self.setStringKV(key_str, root_address) self.setStringKV(key_str, root_address)
return return
@ -879,7 +879,7 @@ class BasicSwap(BaseApp):
root_hash = ci.getAddressHashFromKey(root_key)[::-1] root_hash = ci.getAddressHashFromKey(root_key)[::-1]
ci.initialiseWallet(root_key) ci.initialiseWallet(root_key)
key_str = 'main_wallet_seedid_' + ci.coin_name() key_str = 'main_wallet_seedid_' + ci.coin_name().lower()
self.setStringKV(key_str, root_hash.hex()) self.setStringKV(key_str, root_hash.hex())
def setIntKVInSession(self, str_key, int_val, session): def setIntKVInSession(self, str_key, int_val, session):
@ -1463,7 +1463,7 @@ class BasicSwap(BaseApp):
if c == Coins.PART: if c == Coins.PART:
return True # TODO return True # TODO
if c == Coins.XMR: if c == Coins.XMR:
expect_address = self.getStringKV('main_wallet_addr_' + ci.coin_name()) expect_address = self.getStringKV('main_wallet_addr_' + ci.coin_name().lower())
if expect_address is None: if expect_address is None:
self.log.warning('Can\'t find expected main wallet address for coin {}'.format(ci.coin_name())) self.log.warning('Can\'t find expected main wallet address for coin {}'.format(ci.coin_name()))
return False return False
@ -1473,7 +1473,7 @@ class BasicSwap(BaseApp):
self.log.warning('Wallet for coin {} not derived from swap seed.'.format(ci.coin_name())) self.log.warning('Wallet for coin {} not derived from swap seed.'.format(ci.coin_name()))
return False return False
expect_seedid = self.getStringKV('main_wallet_seedid_' + ci.coin_name()) expect_seedid = self.getStringKV('main_wallet_seedid_' + ci.coin_name().lower())
if expect_seedid is None: if expect_seedid is None:
self.log.warning('Can\'t find expected wallet seed id for coin {}'.format(ci.coin_name())) self.log.warning('Can\'t find expected wallet seed id for coin {}'.format(ci.coin_name()))
return False return False
@ -1526,7 +1526,7 @@ class BasicSwap(BaseApp):
self.log.debug('getCachedStealthAddressForCoin %s', coin_type) self.log.debug('getCachedStealthAddressForCoin %s', coin_type)
ci = self.ci(coin_type) ci = self.ci(coin_type)
key_str = 'stealth_addr_' + ci.coin_name() key_str = 'stealth_addr_' + ci.coin_name().lower()
self.mxDB.acquire() self.mxDB.acquire()
try: try:
session = scoped_session(self.session_factory) session = scoped_session(self.session_factory)
@ -1549,7 +1549,7 @@ class BasicSwap(BaseApp):
def getCachedWalletRestoreHeight(self, ci): def getCachedWalletRestoreHeight(self, ci):
self.log.debug('getCachedWalletRestoreHeight %s', ci.coin_name()) self.log.debug('getCachedWalletRestoreHeight %s', ci.coin_name())
key_str = 'restore_height_' + ci.coin_name() key_str = 'restore_height_' + ci.coin_name().lower()
self.mxDB.acquire() self.mxDB.acquire()
try: try:
session = scoped_session(self.session_factory) session = scoped_session(self.session_factory)
@ -5045,7 +5045,7 @@ class BasicSwap(BaseApp):
rv = { rv = {
'version': self.coin_clients[coin]['core_version'], 'version': self.coin_clients[coin]['core_version'],
'deposit_address': self.getCachedAddressForCoin(coin), 'deposit_address': self.getCachedAddressForCoin(coin),
'name': ci.coin_name().capitalize(), 'name': ci.coin_name(),
'blocks': blockchaininfo['blocks'], 'blocks': blockchaininfo['blocks'],
'balance': format_amount(make_int(walletinfo['balance'], scale), scale), 'balance': format_amount(make_int(walletinfo['balance'], scale), scale),
'unconfirmed': format_amount(make_int(walletinfo.get('unconfirmed_balance'), scale), scale), 'unconfirmed': format_amount(make_int(walletinfo.get('unconfirmed_balance'), scale), scale),

2
doc/install.md
View file

@ -32,7 +32,7 @@ Adjust `--withcoins` and `--withoutcoins` as desired, eg: `--withcoins=monero,bi
**Record the mnemonic from the output of the above command.** **Record the mnemonic from the output of the above command.**
#### Set the timezone: #### Set the timezone (optional):
Edit the `.env` file in the docker directory, set TZ to your local timezone. Edit the `.env` file in the docker directory, set TZ to your local timezone.
Valid options can be listed with: `timedatectl list-timezones` Valid options can be listed with: `timedatectl list-timezones`

4
doc/upgrade.md
View file

@ -11,15 +11,15 @@ Update only the code:
$ export COINDATA_PATH=[PATH_TO] $ export COINDATA_PATH=[PATH_TO]
$ docker-compose up $ docker-compose up
If the dependencies and db format have changed the container must be built with `--no-cache` and the db file moved to a backup. If the dependencies have changed the container must be built with `--no-cache`:
basicswap]$ git pull basicswap]$ git pull
$ cd docker $ cd docker
$ docker-compose build --no-cache $ docker-compose build --no-cache
$ export COINDATA_PATH=[PATH_TO] $ export COINDATA_PATH=[PATH_TO]
$ mv --backup=numbered $COINDATA_PATH/db.sqlite $COINDATA_PATH/db_bkp.sqlite
$ docker-compose up $ docker-compose up
#### Update core versions #### Update core versions
After updating the code and rebuilding the container run: After updating the code and rebuilding the container run: