From cb45619ee672f975c2cc058d87f4e6b80ef5b45f Mon Sep 17 00:00:00 2001
From: Veselin Penev <penev.veselin@gmail.com>
Date: Wed, 17 Apr 2024 00:18:35 +0200
Subject: [PATCH] introducing storage conrtacts on blockchain (#192)

---
 CHANGELOG.txt                                 |  19 +
 bitdust/automats/automat.py                   |   5 +-
 bitdust/blockchain/bismuth_miner.py           |  14 +-
 bitdust/blockchain/bismuth_node.py            |   1 +
 bitdust/blockchain/bismuth_wallet.py          |  15 +-
 bitdust/blockchain/blockchain_explorer.py     | 430 ++++++++++++++++++
 bitdust/broadcast/service_broadcasting.py     | 214 +++++++++
 bitdust/coins/service_accountant.py           | 118 +++++
 bitdust/coins/service_contract_chain.py       |  91 ++++
 bitdust/coins/service_miner.py                |  76 ++++
 bitdust/contacts/contactsdb.py                |  10 +-
 bitdust/customer/fire_hire.py                 |  80 ++--
 bitdust/customer/list_files_orator.py         |   2 +-
 bitdust/customer/payment.py                   | 120 ++++-
 bitdust/customer/supplier_connector.py        |  63 +--
 bitdust/interface/api.py                      |  94 ++--
 bitdust/interface/cmd_line_json.py            |  15 +
 bitdust/interface/cmd_line_json_templates.py  |   4 +-
 bitdust/interface/web_html_template.py        | 212 +++++++++
 bitdust/lib/utime.py                          |   6 +
 bitdust/main/config.py                        |  15 +-
 bitdust/main/config_defaults.py               |  14 +-
 bitdust/main/config_details.py                |  17 -
 bitdust/main/config_types.py                  |  12 +-
 bitdust/main/initializer.py                   |   8 +-
 bitdust/p2p/p2p_service.py                    |   2 -
 bitdust/services/driver.py                    |  26 ++
 .../services/service_blockchain_explorer.py   |  59 +++
 .../services/service_customer_contracts.py    |   4 +-
 bitdust/services/service_my_ip_port.py        |   2 +-
 bitdust/services/service_personal_messages.py |   4 +-
 bitdust/storage/accounting.py                 |   8 +-
 bitdust/storage/index_synchronizer.py         |   2 +-
 bitdust/supplier/customer_space.py            |   2 +-
 bitdust/supplier/storage_contract.py          |  15 +-
 bitdust/system/bpio.py                        |   2 +-
 bitdust/userid/id_server.py                   | 214 +++++++--
 bitdust/userid/id_url.py                      |   6 +-
 bitdust_forks/Bismuth/apihandler.py           |   2 +-
 bitdust_forks/Bismuth/dbhandler.py            |   2 +-
 bitdust_forks/Bismuth/worker.py               |   6 +-
 requirements-testing.txt                      |   1 +
 tests/test_id_url.py                          |  30 +-
 43 files changed, 1770 insertions(+), 272 deletions(-)
 create mode 100644 bitdust/blockchain/blockchain_explorer.py
 create mode 100644 bitdust/broadcast/service_broadcasting.py
 create mode 100644 bitdust/coins/service_accountant.py
 create mode 100644 bitdust/coins/service_contract_chain.py
 create mode 100644 bitdust/coins/service_miner.py
 create mode 100644 bitdust/interface/web_html_template.py
 create mode 100644 bitdust/services/service_blockchain_explorer.py

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 09b5d04..74a05f5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,6 +1,25 @@
 Change Log
 ==========
 
+2024-04-14 Veselin Penev [penev.veselin@gmail.com](mailto:penev.veselin@gmail.com)
+
+* added HMTL WEB template
+* updated id_server.py
+* built new service_blockchain_explorer()
+* updated bitdust/customer/payment.py
+* Bump cryptography from 39.0.0 to 41.0.6
+* disabled and removed few un-used services
+* updated api.services_list()
+* updated api.suppliers_list()
+* introducing storage contracts
+* bug fix in bitdust/storage/accounting.py
+* bug fixes in bitdust/supplier/storage_contract.py
+* bug fix in supplier_connector()
+* IDURL fix in contacts/contactsdb.py
+* small fix in main/config.py
+
+
+
 2023-11-12 Veselin Penev [penev.veselin@gmail.com](mailto:penev.veselin@gmail.com)
 
 * bug fix in bitdust/system/deploy.py related to python3.11
diff --git a/bitdust/automats/automat.py b/bitdust/automats/automat.py
index b08bd05..606548d 100644
--- a/bitdust/automats/automat.py
+++ b/bitdust/automats/automat.py
@@ -765,10 +765,7 @@ def addStateChangedCallback(self, cb, oldstate=None, newstate=None, callback_id=
         if key not in self._state_callbacks:
             self._state_callbacks[key] = []
         if cb not in self._state_callbacks[key]:
-            self._state_callbacks[key].append((
-                callback_id,
-                cb,
-            ))
+            self._state_callbacks[key].append((callback_id, cb))
         return True
 
     def removeStateChangedCallback(self, cb=None, callback_id=None):
diff --git a/bitdust/blockchain/bismuth_miner.py b/bitdust/blockchain/bismuth_miner.py
index 7288e1d..fbbd854 100644
--- a/bitdust/blockchain/bismuth_miner.py
+++ b/bitdust/blockchain/bismuth_miner.py
@@ -5,7 +5,6 @@
 import socks
 import hashlib
 import random
-import traceback
 
 #------------------------------------------------------------------------------
 
@@ -95,11 +94,8 @@ def check_start_mining():
     global _OwnCoinsLastTime
     global _WantMoreCoins
     global _MiningIsOn
-    try:
-        cur_balance = bismuth_wallet.my_balance()
-    except:
-        traceback.print_exc()
-        cur_balance = 'N/A'
+
+    cur_balance = bismuth_wallet.my_balance()
 
     lg.info('my wallet address is %s and current balance is %s' % (bismuth_wallet.my_wallet_address(), cur_balance))
     if _Debug:
@@ -108,11 +104,7 @@ def check_start_mining():
     if cur_balance == 'N/A':
         reactor.callLater(10, check_start_mining)  # @UndefinedVariable
         return
-    try:
-        cur_balance = float(cur_balance)
-    except:
-        reactor.callLater(10, check_start_mining)  # @UndefinedVariable
-        return
+
     if _WantMoreCoins and (not _OwnCoinsLastTime or (time.time() - _OwnCoinsLastTime > 60)):
         _OwnCoinsLastTime = time.time()
         _WantMoreCoins = False
diff --git a/bitdust/blockchain/bismuth_node.py b/bitdust/blockchain/bismuth_node.py
index 6561e57..6beaafc 100644
--- a/bitdust/blockchain/bismuth_node.py
+++ b/bitdust/blockchain/bismuth_node.py
@@ -521,6 +521,7 @@ def check_db_for_bootstrap(node):
 
 
 class CustomLogHandler(logging.Handler):
+
     def emit(self, record):
         try:
             if _Debug:
diff --git a/bitdust/blockchain/bismuth_wallet.py b/bitdust/blockchain/bismuth_wallet.py
index 35eeb0b..8e13cdf 100644
--- a/bitdust/blockchain/bismuth_wallet.py
+++ b/bitdust/blockchain/bismuth_wallet.py
@@ -3,8 +3,8 @@
 
 #------------------------------------------------------------------------------
 
-from twisted.internet import reactor
-from twisted.internet.defer import Deferred
+from twisted.internet import reactor  # @UnresolvedImport
+from twisted.internet.defer import Deferred  # @UnresolvedImport
 
 #------------------------------------------------------------------------------
 
@@ -125,17 +125,24 @@ def my_wallet_address():
 
 
 def my_balance():
-    return client().balance()
+    try:
+        _balance = float(client().balance())
+    except:
+        lg.exc()
+        return 'N/A'
+    return _balance
 
 
 def latest_transactions(num, offset, for_display, mempool_included):
     return client().latest_transactions(num, offset, for_display, mempool_included)
 
 
-def send_transaction(recipient, amount, operation='', data=''):
+def send_transaction(recipient, amount, operation='', data='', raise_errors=False):
     error_reply = []
     ret = client().send(recipient=recipient, amount=amount, operation=operation, data=data, error_reply=error_reply)
     if not ret:
+        if raise_errors:
+            raise Exception(error_reply)
         return error_reply
     return ret
 
diff --git a/bitdust/blockchain/blockchain_explorer.py b/bitdust/blockchain/blockchain_explorer.py
new file mode 100644
index 0000000..03b845b
--- /dev/null
+++ b/bitdust/blockchain/blockchain_explorer.py
@@ -0,0 +1,430 @@
+"""
+Apache2 config
+
+<VirtualHost *:80>
+        ServerName blockchain.bitdust.io
+        ServerAlias www.blockchain.bitdust.io
+        Redirect / https://blockchain.bitdust.io/
+        RewriteEngine on
+        RewriteCond %{SERVER_NAME} =blockchain.bitdust.io [OR]
+        RewriteCond %{SERVER_NAME} =www.blockchain.bitdust.io
+        RewriteRule ^ https://%{SERVER_NAME}%{REQUEST_URI} [END,NE,R=permanent]
+</VirtualHost>
+
+<VirtualHost *:443>
+        ServerName blockchain.bitdust.io
+        ServerAlias www.blockchain.bitdust.io
+        ServerAdmin bitdust.io@gmail.com
+        DocumentRoot /var/www
+        SSLEngine on
+        RewriteEngine on
+        RewriteRule ^/([a-zA-Z0-9]*)$ http://localhost:19080/$1 [P,L]
+        SSLCertificateFile /ssl/domain.cert.pem
+        SSLCertificateKeyFile /ssl/private.key.pem
+</VirtualHost>
+"""
+
+import sys
+import time
+import sqlite3
+import base64
+
+#------------------------------------------------------------------------------
+
+if __name__ == '__main__':
+    import os.path as _p
+    sys.path.insert(0, _p.abspath(_p.join(_p.dirname(_p.abspath(sys.argv[0])), '..')))
+    src_dir_path = _p.dirname(_p.dirname(_p.dirname(_p.abspath(sys.argv[0]))))
+    sys.path.insert(0, src_dir_path)
+    sys.path.insert(0, _p.join(src_dir_path, 'bitdust_forks', 'Bismuth'))
+
+#------------------------------------------------------------------------------
+
+from twisted.internet import reactor
+from twisted.web import server, resource
+
+#------------------------------------------------------------------------------
+
+from bitdust.logs import lg
+
+from bitdust.lib import strng
+
+from bitdust.main import settings
+from bitdust.main import config
+
+from bitdust.interface import web_html_template
+
+from bitdust.blockchain import bismuth_node
+
+#------------------------------------------------------------------------------
+
+_Debug = False
+_DebugLevel = 10
+
+#------------------------------------------------------------------------------
+
+_DataDirPath = None
+_ExplorerHost = None
+_ExplorerPort = None
+_WebListener = None
+
+#------------------------------------------------------------------------------
+
+
+def init():
+    global _DataDirPath
+    global _ExplorerHost
+    global _ExplorerPort
+    global _WebListener
+
+    _DataDirPath = settings.ServiceDir('bismuth_blockchain')
+    _ExplorerHost = config.conf().getString('services/blockchain-explorer/host', '127.0.0.1')
+    _ExplorerPort = config.conf().getInt('services/blockchain-explorer/web-port', 19080)
+
+    root = BlockchainRootPage()
+    root.putChild(b'', BlockchainMainPage())
+    try:
+        _WebListener = reactor.listenTCP(_ExplorerPort, server.Site(root))  # @UndefinedVariable
+        if _Debug:
+            lg.out(_DebugLevel, '            have started web server at port %d   hostname=%s' % (_ExplorerPort, strng.to_text(_ExplorerHost)))
+    except:
+        if _Debug:
+            lg.err('exception while trying to listen port ' + str(self.web_port))
+        lg.exc()
+    if _Debug:
+        lg.args(_DebugLevel, data_dir_path=_DataDirPath)
+    return True
+
+
+def shutdown():
+    global _WebListener
+    if _Debug:
+        lg.dbg(_DebugLevel, '')
+    if _WebListener:
+        _WebListener.stopListening()
+        if _Debug:
+            lg.out(_DebugLevel, '            stopped web listener')
+    _WebListener = None
+    return True
+
+
+#------------------------------------------------------------------------------
+
+
+def execute(cursor, query, param):
+    while True:
+        try:
+            cursor.execute(query, param)
+            break
+        except Exception as e:
+            print('Database query: {} {}'.format(cursor, query))
+            print('Database retry reason: {}'.format(e))
+            time.sleep(0.2)
+    return cursor
+
+
+#------------------------------------------------------------------------------
+
+
+class BlockchainMainPage(resource.Resource):
+
+    def render_GET(self, request):
+        global _ExplorerHost
+
+        page_size = 500
+
+        page_num = request.args.get(b'page', [])
+        if page_num:
+            try:
+                page_num = int(strng.to_text(page_num[0]))
+            except:
+                lg.exc()
+                page_num = 0
+        else:
+            page_num = 0
+
+        page_max = page_num + 1
+
+        src = ''
+
+        conn = sqlite3.connect(bismuth_node.nod().ledger_path, timeout=60.0)
+        c = conn.cursor()
+        execute(c, 'SELECT * FROM transactions ORDER BY block_height DESC, timestamp DESC LIMIT ? OFFSET ?;', (
+            page_size,
+            page_size*page_num,
+        ))
+        _all = c.fetchall()
+        c.close()
+        conn.close()
+        conn = None
+        c = None
+
+        if len(_all) < page_size:
+            page_max = page_num
+
+        view = []
+        b = -1
+        x_old = 'init'
+
+        for x in _all:
+            if x[0] != x_old:
+                color_cell = '#F8F8F8'
+                if b >= 0:
+                    view.append('<tr><td>&nbsp;</td></tr>')  #block separator
+            else:
+                color_cell = 'white'
+
+            view.append('<tr bgcolor ={}>'.format(color_cell))
+
+            if x[0] != x_old:
+                b = b + 1
+
+            txid_formatted = strng.to_text(base64.b64encode(strng.to_bin(x[5]), altchars=b'-_'))
+            view.append('<td><a href="/{}">{}</a></td>'.format(
+                txid_formatted,
+                txid_formatted[:8],
+            ))  #TXID
+
+            view.append('<td>{}'.format(time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(float(x[1])))))
+            view.append('<td>{}</td>'.format(x[2][:8]))  #from
+            view.append('<td>{}</td>'.format(x[3][:8]))  #to
+            view.append('<td>{0:g}</td>'.format(float(x[4])))  #amount
+
+            if x_old != x[0]:
+                view.append('<td>{}</td>'.format(x[7][:8]))  #block hash
+            else:
+                view.append('<td>&nbsp;</td>')  #block hash
+
+            view.append('<td>{0:g}</td>'.format(float(x[8])))  #fee
+            view.append('<td>{0:g}</td>'.format(float(x[9])))  #reward
+
+            view.append('<td>{}{}</td>'.format(x[10][:16], '&hellip;' if len(x[10]) > 16 else ''))  #operation
+            view.append('<td>{}{}</td>'.format(x[11][:24], '&hellip;' if len(x[11]) > 24 else ''))  #openfield
+
+            if x_old != x[0]:
+                view.append('<td>{}</td>'.format(x[0]))  #block height
+            else:
+                view.append('<td>{}</td>'.format(x[0]))  #block height
+
+            view.append('</tr>')
+
+            x_old = x[0]
+
+        src += '<div id="ui-blockchain-explorer" class="section bg-light">'
+        src += '<div class="container">\n'
+        src += '<div class="ui-card">\n'
+        src += '<div class="card-body">\n'
+
+        src += '<div class="row justify-content-center">\n'
+        src += '<h1 align=center>BitDust blockchain explorer</h1>\n'
+        src += '</div>\n'
+
+        src += '<div class="row justify-content-center">\n'
+        src += '<ul class="pagination pagination-sm">\n'
+        src += '<li class="page-item">\n'
+        src += '<a class="page-link" href="/?page={}">\n'.format(max(0, page_num - 1))
+        src += '<span aria-hidden="true">&laquo;</span>\n'
+        src += '</a>\n'
+        src += '</li>\n'
+        src += '<li class="page-item">\n'
+        src += '<a class="page-link" href="/?page={}">\n'.format(min(page_max, page_num + 1))
+        src += '<span aria-hidden="true">&raquo;</span>\n'
+        src += '</a>\n'
+        src += '</li>\n'
+        src += '</ul>\n'
+        src += '</div>\n'
+
+        src += '<div class="row justify-content-center">\n'
+
+        src += '<style type="text/css">#blockchain-table td {padding: 0px 5px; font-size: 0.8em; font-family: monospace, monospace; }</style>'
+
+        src += '<div class="table-responsive">\n'
+        src += '<table id="blockchain-table" class="table table-bordered table-hover">\n'
+
+        src += '<tr bgcolor=white>\n'
+        src += '<td><b>TXID</b></td>\n'
+        src += '<td><b>Timestamp</b></td>\n'
+        src += '<td><b>From</b></td>\n'
+        src += '<td><b>To</b></td>\n'
+        src += '<td><b>Amount</b></td>\n'
+        src += '<td><b>Hash</b></td>\n'
+        src += '<td><b>Fee</b></td>\n'
+        src += '<td><b>Reward</b></td>\n'
+        src += '<td><b>Operation</b></td>\n'
+        src += '<td><b>Openfield</b></td>\n'
+        src += '<td><b>Block</b></td>\n'
+        src += '</tr>\n'
+
+        src += ''.join(view)
+
+        src += '</table>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+
+        src += '<br>\n'
+        src += '<div class="row justify-content-center">\n'
+        src += '<ul class="pagination pagination-sm">\n'
+        src += '<li class="page-item">\n'
+        src += '<a class="page-link" href="/?page={}">\n'.format(max(0, page_num - 1))
+        src += '<span aria-hidden="true">&laquo;</span>\n'
+        src += '</a>\n'
+        src += '</li>\n'
+        src += '<li class="page-item">\n'
+        src += '<a class="page-link" href="/?page={}">\n'.format(min(page_max, page_num + 1))
+        src += '<span aria-hidden="true">&raquo;</span>\n'
+        src += '</a>\n'
+        src += '</li>\n'
+        src += '</ul>\n'
+        src += '</div>\n'
+
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+
+        html_src = web_html_template.WEB_ROOT_TEMPLATE % dict(
+            title='BitDust blockchain explorer',
+            site_url='https://bitdust.io',
+            basepath='https://%s/' % _ExplorerHost,
+            wikipath='https://bitdust.io/wiki/',
+            idserverspath='https://identities.bitdust.io/',
+            blockchainpath='https://blockchain.bitdust.io/',
+            div_main_class='main blockchain',
+            div_main_body=src,
+            google_analytics='',
+            pre_footer=web_html_template.pre_footer % dict(basepath='https://%s/' % _ExplorerHost),
+        )
+        return strng.to_bin(html_src)
+
+
+#------------------------------------------------------------------------------
+
+
+class BlockchainTransactionPage(resource.Resource):
+
+    def __init__(self, tx_id):
+        resource.Resource.__init__(self)
+        self.tx_id = tx_id
+
+    def render_GET(self, request):
+        src = ''
+        src += '<div id="ui-blockchain-transaction" class="section bg-light">'
+        src += '<div class="container">\n'
+        src += '<div class="ui-card">\n'
+        src += '<div class="card-body">\n'
+
+        try:
+            _t = strng.to_text(base64.b64decode(self.tx_id, altchars='-_'))
+        except:
+            src += '<p align=center>invalid transaction ID</p>\n'
+            src += '</div>\n'
+            src += '</div>\n'
+            src += '</div>\n'
+            src += '</div>\n'
+            html_src = web_html_template.WEB_ROOT_TEMPLATE % dict(
+                title='BitDust blockchain explorer',
+                site_url='https://bitdust.io',
+                basepath='https://%s/' % _ExplorerHost,
+                wikipath='https://bitdust.io/wiki/',
+                idserverspath='https://identities.bitdust.io/',
+                blockchainpath='https://blockchain.bitdust.io/',
+                div_main_class='main blockchain-transaction',
+                div_main_body=src,
+                google_analytics='',
+                pre_footer=web_html_template.pre_footer % dict(basepath='https://%s/' % _ExplorerHost),
+            )
+            return strng.to_bin(html_src)
+
+        try:
+            conn = sqlite3.connect(bismuth_node.nod().ledger_path, timeout=60.0)
+            c = conn.cursor()
+            execute(c, 'SELECT * FROM transactions WHERE substr(signature,1,4)=substr(?1,1,4) and signature like ?1;', (_t + '%', ))
+            raw = c.fetchone()
+            c.close()
+            conn.close()
+            conn = None
+            c = None
+        except:
+            src += '<p align=center>reading failed</p>\n'
+            src += '</div>\n'
+            src += '</div>\n'
+            src += '</div>\n'
+            src += '</div>\n'
+            html_src = web_html_template.WEB_ROOT_TEMPLATE % dict(
+                title='BitDust blockchain explorer',
+                site_url='https://bitdust.io',
+                basepath='https://%s/' % _ExplorerHost,
+                wikipath='https://bitdust.io/wiki/',
+                idserverspath='https://identities.bitdust.io/',
+                blockchainpath='https://blockchain.bitdust.io/',
+                div_main_class='main blockchain-transaction',
+                div_main_body=src,
+                google_analytics='',
+                pre_footer=web_html_template.pre_footer % dict(basepath='https://%s/' % _ExplorerHost),
+            )
+            return strng.to_bin(html_src)
+
+        src += '<div>block: <b>{}</b></div><br>\n'.format(raw[0])
+        src += '<div>block hash: <b><code>{}</code></b></div><br>\n'.format(raw[7])
+        src += '<div>timestamp: <b>{}</b></div><br>\n'.format(time.strftime('%Y/%m/%d %H:%M:%S', time.gmtime(float(raw[1]))))
+        src += '<div>sender: <b><code>{}</code></b></div><br>\n'.format(raw[2])
+        src += '<div>recipient: <b><code>{}</code></b></div><br>\n'.format(raw[3])
+        src += '<div>amount: <b>{0:g}</b></div><br>\n'.format(raw[4])
+        src += '<div>fee: <b>{0:g}</b></div><br>\n'.format(raw[8])
+        src += '<div>reward: <b>{0:g}</b></div><br>\n'.format(raw[9])
+        src += '<div>operation: <b>{}</b></div><br>\n'.format(raw[10])
+        src += '<div style="margin: 0 auto; overflow-wrap: break-word; word-wrap: break-word;">openfield: <b><code>{}</code></b></div><br>\n'.format(raw[11])
+        src += '<div style="margin: 0 auto; overflow-wrap: break-word; word-wrap: break-word;">signature:\n<b><code>{}</code></b></div><br>\n'.format(self.tx_id)
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+
+        html_src = web_html_template.WEB_ROOT_TEMPLATE % dict(
+            title='BitDust blockchain explorer',
+            site_url='https://bitdust.io',
+            basepath='https://%s/' % _ExplorerHost,
+            wikipath='https://bitdust.io/wiki/',
+            idserverspath='https://identities.bitdust.io/',
+            blockchainpath='https://blockchain.bitdust.io/',
+            div_main_class='main blockchain-transaction',
+            div_main_body=src,
+            google_analytics='',
+            pre_footer=web_html_template.pre_footer % dict(basepath='https://%s/' % _ExplorerHost),
+        )
+        return strng.to_bin(html_src)
+
+
+#------------------------------------------------------------------------------
+
+
+class BlockchainRootPage(resource.Resource):
+
+    def getChild(self, path, request):
+        if not path:
+            return self
+        try:
+            path = strng.to_text(path)
+        except:
+            return resource.NoResource('Not found')
+        if path:
+            return BlockchainTransactionPage(path)
+        return resource.NoResource('Not found')
+
+
+#------------------------------------------------------------------------------
+
+
+def main():
+    bismuth_node.init()
+    settings.init()
+    reactor.addSystemEventTrigger('before', 'shutdown', shutdown)  # @UndefinedVariable
+    reactor.callWhenRunning(init)  # @UndefinedVariable
+    reactor.run()  # @UndefinedVariable
+    settings.shutdown()
+
+
+#------------------------------------------------------------------------------
+
+if __name__ == '__main__':
+    main()
diff --git a/bitdust/broadcast/service_broadcasting.py b/bitdust/broadcast/service_broadcasting.py
new file mode 100644
index 0000000..69239a9
--- /dev/null
+++ b/bitdust/broadcast/service_broadcasting.py
@@ -0,0 +1,214 @@
+#!/usr/bin/python
+# service_broadcasting.py
+#
+# Copyright (C) 2008 Veselin Penev, https://bitdust.io
+#
+# This file (service_broadcasting.py) is part of BitDust Software.
+#
+# BitDust is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BitDust Software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with BitDust Software.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Please contact us if you have any questions at bitdust.io@gmail.com
+#
+#
+#
+#
+"""
+..
+
+module:: service_broadcasting
+"""
+
+from __future__ import absolute_import
+from bitdust.services.local_service import LocalService
+
+
+def create_service():
+    return BroadcastingService()
+
+
+class BroadcastingService(LocalService):
+
+    service_name = 'service_broadcasting'
+    config_path = 'services/broadcasting/enabled'
+
+    scope = []  # set to [idurl1,idurl2,...] to receive only messages broadcasted from certain nodes
+
+    # TODO: need to be able dynamically add/remove scope after start of the service
+    # for now let's just listen for all broadcast messages (global scope)
+
+    def dependent_on(self):
+        return [
+            'service_p2p_hookups',
+            'service_nodes_lookup',
+        ]
+
+    def installed(self):
+        # TODO: to be continue...
+        return False
+
+    def start(self):
+        from twisted.internet.defer import Deferred
+        from broadcast import broadcasters_finder
+        from broadcast import broadcaster_node
+        from broadcast import broadcast_listener
+        from broadcast import broadcast_service
+        from bitdust.main.config import conf
+        from bitdust.main import settings
+        self.starting_deferred = Deferred()
+        broadcasters_finder.A('init')
+        if settings.enableBroadcastRouting():
+            broadcaster_node.A('init', broadcast_service.on_incoming_broadcast_message)
+            broadcaster_node.A().addStateChangedCallback(self._on_broadcaster_node_switched)
+        else:
+            broadcast_listener.A('init', broadcast_service.on_incoming_broadcast_message)
+            broadcast_listener.A().addStateChangedCallback(self._on_broadcast_listener_switched)
+            broadcast_listener.A('connect', self.scope)
+        conf().addConfigNotifier('services/broadcasting/routing-enabled', self._on_broadcast_routing_enabled_disabled)
+        return self.starting_deferred
+
+    def stop(self):
+        from broadcast import broadcaster_node
+        from broadcast import broadcasters_finder
+        from broadcast import broadcast_listener
+        from bitdust.main.config import conf
+        broadcasters_finder.A('shutdown')
+        if broadcaster_node.A() is not None:
+            broadcaster_node.A().removeStateChangedCallback(self._on_broadcaster_node_switched)
+            broadcaster_node.A('shutdown')
+        if broadcast_listener.A() is not None:
+            broadcast_listener.A().removeStateChangedCallback(self._on_broadcast_listener_switched)
+            broadcast_listener.A('shutdown')
+        conf().removeConfigNotifier('services/broadcasting/routing-enabled')
+        return True
+
+    def request(self, json_payload, newpacket, info):
+        from bitdust.logs import lg
+        from bitdust.p2p import p2p_service
+        from bitdust.main import settings
+        # words = newpacket.Payload.split(' ')
+        try:
+            mode = json_payload['action']
+        except:
+            lg.exc()
+            return p2p_service.SendFail(newpacket, 'invalid payload')
+        if mode != 'route' and mode != 'listen':
+            lg.out(8, 'service_broadcasting.request DENIED, wrong mode provided : %s' % mode)
+            return p2p_service.SendFail(newpacket, 'invalid request')
+        if not settings.enableBroadcastRouting():
+            lg.out(8, 'service_broadcasting.request DENIED, broadcast routing disabled')
+            return p2p_service.SendFail(newpacket, 'broadcast routing disabled')
+        from broadcast import broadcaster_node
+        if not broadcaster_node.A():
+            lg.out(8, 'service_broadcasting.request DENIED, broadcast routing disabled')
+            return p2p_service.SendFail(newpacket, 'broadcast routing disabled')
+        if broadcaster_node.A().state not in [
+            'BROADCASTING',
+            'OFFLINE',
+            'BROADCASTERS?',
+        ]:
+            lg.out(8, 'service_broadcasting.request DENIED, current state is : %s' % broadcaster_node.A().state)
+            return p2p_service.SendFail(newpacket, 'currently not broadcasting')
+        if mode == 'route':
+            broadcaster_node.A('new-broadcaster-connected', newpacket.OwnerID)
+            lg.out(8, 'service_broadcasting.request ACCEPTED, mode: %s' % mode)
+            return p2p_service.SendAck(newpacket, 'accepted')
+        if mode == 'listen':
+            # TODO: fix!!!
+            # broadcaster_node.A().add_listener(newpacket.OwnerID, ' '.join(words[2:]))
+            lg.out(8, 'service_broadcasting.request ACCEPTED, mode: %s' % mode)
+            return p2p_service.SendAck(newpacket, 'accepted')
+        return p2p_service.SendAck(newpacket, 'bad request')
+
+    def health_check(self):
+        from broadcast import broadcaster_node
+        return broadcaster_node.A().state in [
+            'BROADCASTING',
+        ]
+
+    def _on_broadcast_routing_enabled_disabled(self, path, value, oldvalue, result):
+        from bitdust.logs import lg
+        from broadcast import broadcaster_node
+        from broadcast import broadcast_listener
+        from broadcast import broadcast_service
+        lg.out(2, 'service_broadcasting._on_broadcast_routing_enabled_disabled : %s->%s : %s' % (oldvalue, value, path))
+        if not value:
+            if broadcaster_node.A() is not None:
+                broadcaster_node.A().removeStateChangedCallback(self._on_broadcaster_node_switched)
+                broadcaster_node.A('shutdown')
+            broadcast_listener.A('init', broadcast_service.on_incoming_broadcast_message)
+            broadcast_listener.A().addStateChangedCallback(self._on_broadcast_listener_switched)
+            broadcast_listener.A('connect', self.scope)
+        else:
+            if broadcast_listener.A() is not None:
+                broadcast_listener.A().removeStateChangedCallback(self._on_broadcast_listener_switched)
+                broadcast_listener.A('shutdown')
+            broadcaster_node.A('init', broadcast_service.on_incoming_broadcast_message)
+            broadcaster_node.A().addStateChangedCallback(self._on_broadcaster_node_switched)
+
+    def _on_broadcast_listener_switched(self, oldstate, newstate, evt, *args, **kwargs):
+        from bitdust.logs import lg
+        from twisted.internet import reactor  # @UnresolvedImport
+        from broadcast import broadcast_listener
+        if self.starting_deferred:
+            if newstate in [
+                'LISTENING',
+                'OFFLINE',
+            ]:
+                self.starting_deferred.callback(newstate)
+                self.starting_deferred = None
+        if newstate == 'OFFLINE':
+            reactor.callLater(60, broadcast_listener.A, 'connect', self.scope)  # @UndefinedVariable
+            lg.out(8, 'service_broadcasting._on_broadcast_listener_switched will try to connect again after 1 minute')
+
+    def _on_broadcaster_node_switched(self, oldstate, newstate, evt, *args, **kwargs):
+        from bitdust.logs import lg
+        from twisted.internet import reactor  # @UnresolvedImport
+        from broadcast import broadcaster_node
+        if self.starting_deferred:
+            if newstate in [
+                'BROADCASTING',
+            ] and newstate != oldstate:
+                self.starting_deferred.callback(newstate)
+                self.starting_deferred = None
+            elif newstate in [
+                'OFFLINE',
+            ] and newstate != oldstate:
+                self.starting_deferred.errback(Exception(newstate))
+                self.starting_deferred = None
+
+
+#         if newstate == 'OFFLINE' and oldstate != 'AT_STARTUP':
+#             reactor.callLater(60, broadcaster_node.A, 'reconnect')  # @UndefinedVariable
+#             lg.out(8, 'service_broadcasting._on_broadcaster_node_switched will try to reconnect again after 1 minute')
+
+#     def cancel(self, json_payload, request, info):
+#         from bitdust.logs import lg
+#         from bitdust.p2p import p2p_service
+#         words = request.Payload.split(' ')
+#         try:
+#             mode = words[1][:20]
+#         except:
+#             lg.exc()
+#             return p2p_service.SendFail(request, 'wrong mode provided')
+#         if mode == 'route' and False: # and not settings.getBroadcastRoutingEnabled():
+#             # TODO check if this is enabled in settings
+#             # so broadcaster_node should be existing already
+#             lg.out(8, "service_broadcasting.request DENIED, broadcast routing disabled")
+#             return p2p_service.SendFail(request, 'broadcast routing disabled')
+#         from broadcast import broadcaster_node
+#         if broadcaster_node.A().state not in ['BROADCASTING', ]:
+#             lg.out(8, "service_broadcasting.request DENIED, current state is : %s" % broadcaster_node.A().state)
+#             return p2p_service.SendFail(request, 'currently not broadcasting')
+#         broadcaster_node.A('broadcaster-disconnected', request)
+#         return p2p_service.SendAck(request, 'accepted')
diff --git a/bitdust/coins/service_accountant.py b/bitdust/coins/service_accountant.py
new file mode 100644
index 0000000..b41d0b7
--- /dev/null
+++ b/bitdust/coins/service_accountant.py
@@ -0,0 +1,118 @@
+#!/usr/bin/python
+# service_coins_accountant.py
+#
+# Copyright (C) 2008 Veselin Penev, https://bitdust.io
+#
+# This file (service_accountant.py) is part of BitDust Software.
+#
+# BitDust is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BitDust Software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with BitDust Software.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Please contact us if you have any questions at bitdust.io@gmail.com
+#
+#
+#
+#
+"""
+..
+
+module:: service_coins_accountant
+"""
+
+from __future__ import absolute_import
+from bitdust.services.local_service import LocalService
+
+
+def create_service():
+    return AccountantService()
+
+
+class AccountantService(LocalService):
+
+    service_name = 'service_accountant'
+    config_path = 'services/accountant/enabled'
+
+    def dependent_on(self):
+        return [
+            # 'service_broadcasting',
+            # 'service_blockchain',
+        ]
+
+    def installed(self):
+        # TODO: to be continue...
+        return False
+
+    def start(self):
+        from coins import coins_db
+        from coins import accountant_node
+        from coins import accountants_finder
+        coins_db.init()
+        accountants_finder.A('init')
+        accountant_node.A('init')
+        accountant_node.A('start')
+        accountant_node.A().addStateChangedCallback(self._on_accountant_node_switched)
+        return True
+
+    def stop(self):
+        from coins import coins_db
+        from coins import accountant_node
+        accountant_node.A().removeStateChangedCallback(self._on_accountant_node_switched)
+        accountant_node.A('stop')
+        accountant_node.A('shutdown')
+        coins_db.shutdown()
+        return True
+
+    def request(self, json_payload, newpacket, info):
+        from bitdust.logs import lg
+        from bitdust.p2p import p2p_service
+        # words = newpacket.Payload.split(' ')
+        try:
+            # mode = words[1][:10]
+            mode = json_payload['action']
+        except:
+            lg.exc()
+            return p2p_service.SendFail(newpacket, 'invalid payload')
+        if mode != 'join' and mode != 'write' and mode != 'read':
+            lg.out(8, 'service_accountant.request DENIED, wrong mode provided : %s' % mode)
+            return p2p_service.SendFail(newpacket, 'invalid request')
+        from coins import accountant_node
+        if not accountant_node.A():
+            lg.out(8, 'service_accountant.request DENIED, accountant_node() state machine not exist')
+            return p2p_service.SendFail(newpacket, 'accountant_node service not started')
+        # if accountant_node.A().state not in ['ACCOUNTANTS?', "READY", "VALID_COIN?", "WRITE_COIN!", ]:
+        #     lg.out(8, "service_accountant.request DENIED, accountant_node() state is : %s" % accountant_node.A().state)
+        # return p2p_service.SendFail(request, "accountant_node service
+        # currently unavailable")
+        if mode == 'join':
+            accountant_node.A('accountant-connected', newpacket.OwnerID)
+            #             if accountant_node.A().state == 'OFFLINE':
+            #                 accountant_node.A('start')
+            return p2p_service.SendAck(newpacket, 'accepted')
+        return p2p_service.SendFail(newpacket, 'bad request')
+
+    def health_check(self):
+        from coins import accountant_node
+        return accountant_node.A().state in [
+            'READY',
+            'READ_COINS',
+            'VALID_COIN?',
+            'WRITE_COIN!',
+        ]
+
+    def _on_accountant_node_switched(self, oldstate, newstate, evt, *args, **kwargs):
+        from bitdust.logs import lg
+        from twisted.internet import reactor  # @UnresolvedImport
+        from coins import accountant_node
+        if newstate == 'OFFLINE' and oldstate != 'AT_STARTUP':
+            reactor.callLater(10*60, accountant_node.A, 'start')  # @UndefinedVariable
+            lg.out(8, 'service_broadcasting._on_accountant_node_switched will try to reconnect again after 10 minutes')
diff --git a/bitdust/coins/service_contract_chain.py b/bitdust/coins/service_contract_chain.py
new file mode 100644
index 0000000..b9c282b
--- /dev/null
+++ b/bitdust/coins/service_contract_chain.py
@@ -0,0 +1,91 @@
+#!/usr/bin/python
+# service_contract_chain.py
+#
+# Copyright (C) 2008 Veselin Penev, https://bitdust.io
+#
+# This file (service_contract_chain.py) is part of BitDust Software.
+#
+# BitDust is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BitDust Software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with BitDust Software.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Please contact us if you have any questions at bitdust.io@gmail.com
+#
+#
+#
+#
+"""
+..
+
+module:: service_contract_chain
+"""
+
+from __future__ import absolute_import
+from bitdust.services.local_service import LocalService
+
+
+def create_service():
+    return ContractChainService()
+
+
+class ContractChainService(LocalService):
+
+    service_name = 'service_contract_chain'
+    config_path = 'services/contract-chain/enabled'
+
+    def dependent_on(self):
+        return [
+            'service_nodes_lookup',
+        ]
+
+    def installed(self):
+        # TODO: to be continue...
+        return False
+
+    def start(self):
+        from twisted.internet.defer import Deferred
+        from coins import contract_chain_consumer
+        self.starting_deferred = Deferred()
+        contract_chain_consumer.A('init')
+        contract_chain_consumer.A().addStateChangedCallback(self._on_contract_chain_state_changed)
+        contract_chain_consumer.A('start')
+        return self.starting_deferred
+
+    def stop(self):
+        from coins import contract_chain_consumer
+        contract_chain_consumer.A().removeStateChangedCallback(self._on_contract_chain_state_changed)
+        contract_chain_consumer.A('stop')
+        contract_chain_consumer.A('shutdown')
+        return True
+
+    def health_check(self):
+        from coins import contract_chain_consumer
+        return contract_chain_consumer.A().state in [
+            'CONNECTED',
+        ]
+
+    def _on_contract_chain_state_changed(self, oldstate, newstate, event_string, *args, **kwargs):
+        if self.starting_deferred:
+            if newstate in [
+                'CONNECTED',
+            ] and oldstate not in [
+                'AT_STARTUP',
+            ]:
+                self.starting_deferred.callback(True)
+                self.starting_deferred = None
+            elif newstate in [
+                'DISCONNECTED',
+            ] and oldstate not in [
+                'AT_STARTUP',
+            ]:
+                self.starting_deferred.errback(Exception(newstate))
+                self.starting_deferred = None
diff --git a/bitdust/coins/service_miner.py b/bitdust/coins/service_miner.py
new file mode 100644
index 0000000..d22a6c5
--- /dev/null
+++ b/bitdust/coins/service_miner.py
@@ -0,0 +1,76 @@
+#!/usr/bin/python
+# service_miner.py
+#
+# Copyright (C) 2008 Veselin Penev, https://bitdust.io
+#
+# This file (service_miner.py) is part of BitDust Software.
+#
+# BitDust is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BitDust Software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with BitDust Software.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Please contact us if you have any questions at bitdust.io@gmail.com
+#
+#
+#
+#
+"""
+..
+
+module:: service_miner
+"""
+
+from __future__ import absolute_import
+from bitdust.services.local_service import LocalService
+
+
+def create_service():
+    return MinerService()
+
+
+class MinerService(LocalService):
+
+    service_name = 'service_miner'
+    config_path = 'services/miner/enabled'
+
+    def dependent_on(self):
+        return [
+            'service_nodes_lookup',
+            # 'service_blockchain',
+        ]
+
+    def installed(self):
+        # TODO: to be continue...
+        return False
+
+    def start(self):
+        from coins import coins_miner
+        coins_miner.A('init')
+        coins_miner.A('start')
+        return True
+
+    def stop(self):
+        from coins import coins_miner
+        coins_miner.A('stop')
+        coins_miner.A('shutdown')
+        return True
+
+    def request(self, json_payload, newpacket, info):
+        # TODO: work in progress
+        # TODO: we can add some limit for number of connections here
+        from bitdust.p2p import p2p_service
+        return p2p_service.SendAck(newpacket, 'accepted')
+
+    def cancel(self, json_payload, request, info):
+        # TODO: work in progress
+        from bitdust.p2p import p2p_service
+        return p2p_service.SendAck(request, 'accepted')
diff --git a/bitdust/contacts/contactsdb.py b/bitdust/contacts/contactsdb.py
index 54f4ac8..82721fd 100644
--- a/bitdust/contacts/contactsdb.py
+++ b/bitdust/contacts/contactsdb.py
@@ -169,7 +169,10 @@ def set_suppliers(idlist, customer_idurl=None):
     if customer_idurl not in _SuppliersList:
         _SuppliersList[customer_idurl] = []
         lg.info('created new suppliers list in memory for customer %r' % customer_idurl)
-    _SuppliersList[customer_idurl] = id_url.fields_list(idlist)
+    try:
+        _SuppliersList[customer_idurl] = id_url.fields_list(idlist)
+    except:
+        pass
     if _Debug:
         lg.args(_DebugLevel, suppliers=_SuppliersList[customer_idurl], customer_idurl=customer_idurl)
 
@@ -308,7 +311,10 @@ def set_customers(idlist):
     Set customers list.
     """
     global _CustomersList
-    _CustomersList = id_url.fields_list(idlist)
+    try:
+        _CustomersList = id_url.fields_list(idlist)
+    except:
+        pass
 
 
 def update_customers(idslist):
diff --git a/bitdust/customer/fire_hire.py b/bitdust/customer/fire_hire.py
index de26bad..89962f1 100644
--- a/bitdust/customer/fire_hire.py
+++ b/bitdust/customer/fire_hire.py
@@ -93,7 +93,7 @@
     * :red:`search-failed`
     * :red:`supplier-connected`
     * :red:`supplier-state-changed`
-    * :red:`timer-15sec`
+    * :red:`timer-25sec`
 """
 
 #------------------------------------------------------------------------------
@@ -104,7 +104,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 8
+_DebugLevel = 14
 
 #------------------------------------------------------------------------------
 
@@ -126,6 +126,7 @@
 from bitdust.lib import misc
 from bitdust.lib import diskspace
 from bitdust.lib import strng
+from bitdust.lib import utime
 
 from bitdust.main import config
 from bitdust.main import settings
@@ -230,7 +231,7 @@ class FireHire(automat.Automat):
     fast = False
 
     timers = {
-        'timer-15sec': (25.0, ['FIRE_MANY', 'SUPPLIERS?']),
+        'timer-25sec': (25.0, ['FIRE_MANY', 'SUPPLIERS?']),
     }
 
     def init(self):
@@ -271,12 +272,12 @@ def A(self, event, *args, **kwargs):
                 self.NeedRestart = False
         #---READY---
         elif self.state == 'READY':
-            if (event == 'restart' or (event == 'instant' and self.NeedRestart)) and self.isConfigChanged(*args, **kwargs) and self.isExistSomeSuppliers(*args, **kwargs):
+            if (event == 'restart' or (event == 'instant' and self.NeedRestart)) and (self.isConfigChanged(*args, **kwargs) or self.isContractExpiring(*args, **kwargs)) and self.isExistSomeSuppliers(*args, **kwargs):
                 self.state = 'SUPPLIERS?'
                 self.NeedRestart = False
                 self.doSaveConfig(*args, **kwargs)
                 self.doConnectSuppliers(*args, **kwargs)
-            elif (event == 'restart' or (event == 'instant' and self.NeedRestart)) and not (self.isConfigChanged(*args, **kwargs) and self.isExistSomeSuppliers(*args, **kwargs)):
+            elif (event == 'restart' or (event == 'instant' and self.NeedRestart)) and not ((self.isConfigChanged(*args, **kwargs) or self.isContractExpiring(*args, **kwargs)) and self.isExistSomeSuppliers(*args, **kwargs)):
                 self.state = 'DECISION?'
                 self.NeedRestart = False
                 self.doDecideToDismiss(*args, **kwargs)
@@ -322,12 +323,7 @@ def A(self, event, *args, **kwargs):
                 self.doScheduleNextRestart(*args, **kwargs)
         #---FIRE_MANY---
         elif self.state == 'FIRE_MANY':
-            if event == 'timer-15sec':
-                self.state = 'READY'
-                self.doCloseConnectors(*args, **kwargs)
-                self.doClearDismissList(*args, **kwargs)
-                self.doNotifySuppliersChanged(*args, **kwargs)
-            elif event == 'supplier-state-changed' and not self.isAllDismissed(*args, **kwargs):
+            if event == 'supplier-state-changed' and not self.isAllDismissed(*args, **kwargs):
                 self.doCloseConnector(*args, **kwargs)
             elif event == 'restart':
                 self.NeedRestart = True
@@ -336,11 +332,16 @@ def A(self, event, *args, **kwargs):
                 self.doCloseConnector(*args, **kwargs)
                 self.doClearDismissList(*args, **kwargs)
                 self.doNotifySuppliersChanged(*args, **kwargs)
+            elif event == 'timer-25sec':
+                self.state = 'READY'
+                self.doCloseConnectors(*args, **kwargs)
+                self.doClearDismissList(*args, **kwargs)
+                self.doNotifySuppliersChanged(*args, **kwargs)
         #---SUPPLIERS?---
         elif self.state == 'SUPPLIERS?':
             if event == 'restart':
                 self.NeedRestart = True
-            elif (event == 'supplier-state-changed' and self.isAllReady(*args, **kwargs)) or event == 'timer-15sec':
+            elif (event == 'supplier-state-changed' and self.isAllReady(*args, **kwargs)) or event == 'timer-25sec':
                 self.state = 'DECISION?'
                 self.doDecideToDismiss(*args, **kwargs)
         return None
@@ -421,10 +422,15 @@ def isConfigChanged(self, *args, **kwargs):
         """
         Condition method.
         """
-        if None in self.configs:
-            return True
-        curconfigs = (settings.getSuppliersNumberDesired(), diskspace.GetBytesFromString(settings.getNeededString()))
-        return self.configs[0] != curconfigs[0] or self.configs[1] != curconfigs[1]
+        return self._is_config_changed()
+
+    def isContractExpiring(self, *args, **kwargs):
+        """
+        Condition method.
+        """
+        if not driver.is_on('service_customer_contracts'):
+            return False
+        return len(self._get_suppliers_with_expired_contracts()) > 0
 
     def isExistSomeSuppliers(self, *args, **kwargs):
         """
@@ -450,11 +456,18 @@ def doConnectSuppliers(self, *args, **kwargs):
         from bitdust.p2p import online_status
         self.connect_list = []
         my_current_family = contactsdb.suppliers()
+        if self._is_config_changed():
+            target_suppliers = list(my_current_family)
+        else:
+            # only select suppliers with expired contracts
+            target_suppliers = self._get_suppliers_with_expired_contracts()
         for pos, supplier_idurl in enumerate(my_current_family):
             if not supplier_idurl:
                 continue
             if self.configs[0] and pos >= self.configs[0]:
                 continue
+            if not id_url.is_in(supplier_idurl, target_suppliers):
+                continue
             sc = supplier_connector.by_idurl(supplier_idurl)
             if sc is None:
                 sc = supplier_connector.create(
@@ -550,10 +563,7 @@ def doDecideToDismiss(self, *args, **kwargs):
                 potentialy_fired.add(supplier_idurl)
             elif sc.state == 'CONNECTED':
                 connected_suppliers.add(supplier_idurl)
-            elif sc.state in [
-                'DISCONNECTED',
-                'REFUSE',
-            ]:
+            elif sc.state in ['DISCONNECTED', 'REFUSE']:
                 disconnected_suppliers.add(supplier_idurl)
 #             elif sc.state in ['QUEUE?', 'REQUEST', ]:
 #                 requested_suppliers.add(supplier_idurl)
@@ -602,12 +612,9 @@ def doDecideToDismiss(self, *args, **kwargs):
         # only replace suppliers one by one at the moment
         result = list(potentialy_fired)
         lg.info('will replace supplier %s' % result[0])
-        self.automat(
-            'made-decision',
-            [
-                result[0],
-            ],
-        )
+        self.automat('made-decision', [
+            result[0],
+        ])
 
     def doRememberSuppliers(self, *args, **kwargs):
         """
@@ -861,6 +868,27 @@ def doNotifyFinished(self, *args, **kwargs):
             from bitdust.storage import backup_monitor
             backup_monitor.A('fire-hire-finished')
 
+    def _is_config_changed(self):
+        if None in self.configs:
+            return True
+        curconfigs = (settings.getSuppliersNumberDesired(), diskspace.GetBytesFromString(settings.getNeededString()))
+        return self.configs[0] != curconfigs[0] or self.configs[1] != curconfigs[1]
+
+    def _get_suppliers_with_expired_contracts(self):
+        from bitdust.customer import supplier_connector
+        now = utime.utcnow_to_sec1970()
+        ret = []
+        for supplier_idurl in contactsdb.suppliers():
+            if supplier_idurl:
+                sc = supplier_connector.by_idurl(supplier_idurl)
+                if sc:
+                    if sc.state == 'CONNECTED':
+                        if sc.storage_contract:
+                            if now > utime.unpack_time(sc.storage_contract['complete_after']):
+                                lg.warn('storage contract with %s is expired' % supplier_idurl)
+                                ret.append(supplier_idurl)
+        return ret
+
     def _scheduled_restart(self):
         self.restart_task = None
         self.automat('restart')
diff --git a/bitdust/customer/list_files_orator.py b/bitdust/customer/list_files_orator.py
index 214e709..e22202d 100644
--- a/bitdust/customer/list_files_orator.py
+++ b/bitdust/customer/list_files_orator.py
@@ -55,7 +55,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 8
+_DebugLevel = 14
 
 #------------------------------------------------------------------------------
 
diff --git a/bitdust/customer/payment.py b/bitdust/customer/payment.py
index 59cf95e..3007f34 100644
--- a/bitdust/customer/payment.py
+++ b/bitdust/customer/payment.py
@@ -31,21 +31,87 @@
 
 #------------------------------------------------------------------------------
 
+import os
+
+#------------------------------------------------------------------------------
+
 from bitdust.logs import lg
 
 from bitdust.lib import utime
+from bitdust.lib import strng
+from bitdust.lib import jsn
+
+from bitdust.system import bpio
+from bitdust.system import local_fs
+
+from bitdust.main import settings
+
+from bitdust.crypt import key
+
+from bitdust.blockchain import bismuth_wallet
+
+from bitdust.userid import id_url
+
+#------------------------------------------------------------------------------
+
+
+def get_supplier_contracts_dir(supplier_idurl):
+    supplier_idurl = id_url.field(supplier_idurl)
+    supplier_contracts_prefix = '{}_{}'.format(
+        supplier_idurl.username,
+        strng.to_text(key.HashSHA(supplier_idurl.to_public_key(), hexdigest=True)),
+    )
+    return os.path.join(settings.ServiceDir('service_customer_contracts'), supplier_contracts_prefix)
+
+
+def save_storage_contract(supplier_idurl, json_data):
+    supplier_contracts_dir = get_supplier_contracts_dir(supplier_idurl)
+    if not os.path.isdir(supplier_contracts_dir):
+        bpio._dirs_make(supplier_contracts_dir)
+    contract_path = os.path.join(supplier_contracts_dir, str(utime.unpack_time(json_data['started'])))
+    json_data['supplier'] = supplier_idurl
+    local_fs.WriteTextFile(contract_path, jsn.dumps(json_data))
+    return contract_path
+
+
+def list_storage_contracts(supplier_idurl):
+    supplier_contracts_dir = get_supplier_contracts_dir(supplier_idurl)
+    if not os.path.isdir(supplier_contracts_dir):
+        return []
+    l = []
+    for contract_filename in os.listdir(supplier_contracts_dir):
+        contract_path = os.path.join(supplier_contracts_dir, contract_filename)
+        json_data = jsn.loads_text(local_fs.ReadTextFile(contract_path))
+        l.append(json_data)
+    return l
+
 
-from bitdust.contacts import contactsdb
+def list_contracted_suppliers():
+    supplier_idurls = []
+    for supplier_contracts_prefix in os.listdir(settings.ServiceDir('service_customer_contracts')):
+        supplier_contracts_dir = os.path.join(settings.ServiceDir('service_customer_contracts'), supplier_contracts_prefix)
+        for contract_filename in os.listdir(supplier_contracts_dir):
+            contract_path = os.path.join(supplier_contracts_dir, contract_filename)
+            json_data = jsn.loads_text(local_fs.ReadTextFile(contract_path))
+            supplier_idurl = json_data.get('supplier', None)
+            if supplier_idurl:
+                if not id_url.is_in(supplier_idurl, supplier_idurls):
+                    supplier_idurls.append(supplier_idurl)
+                break
+    return supplier_idurls
 
-from bitdust.customer import supplier_connector
 
 #------------------------------------------------------------------------------
 
 
 def pay_for_storage():
+    cur_balance = bismuth_wallet.my_balance()
+    if cur_balance == 'N/A':
+        lg.err('my current balance is not available, payments are not possible at the moment')
+        return False
     now = utime.utcnow_to_sec1970()
-    for supplier_idurl in contactsdb.suppliers():
-        supplier_contracts = supplier_connector.list_storage_contracts(supplier_idurl)
+    for supplier_idurl in list_contracted_suppliers():
+        supplier_contracts = list_storage_contracts(supplier_idurl)
         unpaid_contracts = []
         for json_data in supplier_contracts:
             if json_data.get('paid'):
@@ -53,12 +119,52 @@ def pay_for_storage():
             if now < utime.unpack_time(json_data['complete_after']):
                 continue
             unpaid_contracts.append(json_data)
+        sum_to_pay = 0
+        pay_before_earliest = None
+        pay_before_latest = None
+        supplier_wallet_address = None
+        started = None
+        complete_after = None
         if unpaid_contracts:
             unpaid_contracts.sort(key=lambda i: utime.unpack_time(i['started']))
+            started = unpaid_contracts[0]['started']
+            complete_after = unpaid_contracts[-1]['complete_after']
             pay_before_earliest = utime.unpack_time(unpaid_contracts[0]['pay_before'])
             pay_before_latest = utime.unpack_time(unpaid_contracts[-1]['pay_before'])
-            sum_to_pay = 0
+            supplier_wallet_address = unpaid_contracts[-1]['wallet_address']
             for unpaid_contract in unpaid_contracts:
                 sum_to_pay += unpaid_contract['value']
-            if _Debug:
-                lg.args(_DebugLevel, to_pay=sum_to_pay, pay_before_earliest=utime.pack_time(pay_before_earliest), pay_before_latest=utime.pack_time(pay_before_latest))
+        if _Debug:
+            lg.args(
+                _DebugLevel,
+                s=supplier_idurl,
+                unpaid=len(unpaid_contracts),
+                debt=sum_to_pay,
+                pay_earliest=utime.pack_time(pay_before_earliest),
+                pay_latest=utime.pack_time(pay_before_latest),
+                started=started,
+                complete_after=complete_after,
+            )
+        if sum_to_pay:
+            if now > pay_before_earliest:
+                if sum_to_pay >= cur_balance:
+                    lg.warn('my current balance %r is not enough to pay %r to %r' % (cur_balance, sum_to_pay, supplier_idurl))
+                    continue
+                try:
+                    ret = bismuth_wallet.send_transaction(
+                        recipient=supplier_wallet_address,
+                        amount=sum_to_pay,
+                        operation='storage',
+                        data='{} {}'.format(started, complete_after),
+                        raise_errors=True,
+                    )
+                except:
+                    lg.exc()
+                    return False
+                if _Debug:
+                    lg.args(_DebugLevel, recipient=supplier_wallet_address, ret=ret)
+                cur_balance = bismuth_wallet.my_balance()
+                if cur_balance == 'N/A':
+                    lg.err('my current balance is not available, payments are not possible at the moment')
+                    return False
+    return True
diff --git a/bitdust/customer/supplier_connector.py b/bitdust/customer/supplier_connector.py
index eb2cfa4..9d477e9 100644
--- a/bitdust/customer/supplier_connector.py
+++ b/bitdust/customer/supplier_connector.py
@@ -52,7 +52,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 16
+_DebugLevel = 12
 
 #------------------------------------------------------------------------------
 
@@ -68,7 +68,6 @@
 from bitdust.automats import automat
 
 from bitdust.system import bpio
-from bitdust.system import local_fs
 
 from bitdust.main import settings
 from bitdust.main import events
@@ -76,11 +75,8 @@
 from bitdust.lib import strng
 from bitdust.lib import nameurl
 from bitdust.lib import diskspace
-from bitdust.lib import utime
 from bitdust.lib import jsn
 
-from bitdust.crypt import key
-
 from bitdust.contacts import contactsdb
 
 from bitdust.services import driver
@@ -167,39 +163,6 @@ def total_connectors():
 #------------------------------------------------------------------------------
 
 
-def get_supplier_contracts_dir(supplier_idurl):
-    supplier_idurl = id_url.field(supplier_idurl)
-    supplier_contracts_prefix = '{}_{}'.format(
-        supplier_idurl.username,
-        strng.to_text(key.HashSHA(supplier_idurl.to_public_key(), hexdigest=True)),
-    )
-    return os.path.join(settings.ServiceDir('service_customer_contracts'), supplier_contracts_prefix)
-
-
-def save_storage_contract(supplier_idurl, json_data):
-    supplier_contracts_dir = get_supplier_contracts_dir(supplier_idurl)
-    if not os.path.isdir(supplier_contracts_dir):
-        bpio._dirs_make(supplier_contracts_dir)
-    contract_path = os.path.join(supplier_contracts_dir, str(utime.unpack_time(json_data['started'])))
-    local_fs.WriteTextFile(contract_path, jsn.dumps(json_data))
-    return contract_path
-
-
-def list_storage_contracts(supplier_idurl):
-    supplier_contracts_dir = get_supplier_contracts_dir(supplier_idurl)
-    if not os.path.isdir(supplier_contracts_dir):
-        return []
-    l = []
-    for contract_filename in os.listdir(supplier_contracts_dir):
-        contract_path = os.path.join(supplier_contracts_dir, contract_filename)
-        json_data = jsn.loads_text(local_fs.ReadTextFile(contract_path))
-        l.append(json_data)
-    return l
-
-
-#------------------------------------------------------------------------------
-
-
 class SupplierConnector(automat.Automat):
     """
     This class implements all the functionality of the ``supplier_connector()``
@@ -229,13 +192,15 @@ def __init__(self, supplier_idurl, customer_idurl, needed_bytes, key_id=None, qu
         self.request_queue_packet_id = None
         self.latest_supplier_ack = None
         self.callbacks = {}
+        self.storage_contract = None
         try:
             st = bpio.ReadTextFile(settings.SupplierServiceFilename(
-                idurl=self.supplier_idurl,
+                supplier_idurl=self.supplier_idurl,
                 customer_idurl=self.customer_idurl,
             )).strip()
         except:
-            st = 'DISCONNECTED'
+            lg.exc()
+        st = st or 'DISCONNECTED'
         automat.Automat.__init__(
             self,
             name,
@@ -275,7 +240,7 @@ def state_changed(self, oldstate, newstate, event, *args, **kwargs):
                     lg.exc()
                     return
             bpio.WriteTextFile(
-                settings.SupplierServiceFilename(self.supplier_idurl, customer_idurl=self.customer_idurl),
+                settings.SupplierServiceFilename(supplier_idurl=self.supplier_idurl, customer_idurl=self.customer_idurl),
                 newstate,
             )
         if newstate == 'CONNECTED':
@@ -296,15 +261,15 @@ def state_changed(self, oldstate, newstate, event, *args, **kwargs):
     def set_callback(self, name, cb):
         if name not in self.callbacks:
             self.callbacks[name] = []
+        if cb in self.callbacks[name]:
+            lg.warn('callback %r is already registered in %r with name %s' % (cb, self, name))
         self.callbacks[name].append(cb)
 
     def remove_callback(self, name, cb=None):
         if name in self.callbacks:
             if cb:
-                if cb in self.callbacks[name]:
+                while cb in self.callbacks[name]:
                     self.callbacks[name].remove(cb)
-                else:
-                    lg.warn('callback %r not registered in %r with name %s' % (cb, self, name))
             else:
                 self.callbacks.pop(name)
         else:
@@ -657,14 +622,16 @@ def _supplier_service_acked(self, response, info):
             except:
                 lg.exc()
             if _Debug:
-                lg.args(_DebugLevel, response=response, info=info)
+                lg.args(_DebugLevel, response=response, info=info, contract=the_contract)
+            self.storage_contract = the_contract
             if the_contract:
                 if not accounting.verify_storage_contract(the_contract):
                     lg.err('received storage contract from %r is not valid' % self.supplier_idurl)
                     self.latest_supplier_ack = None
                     self.automat('fail', None)
                     return
-                save_storage_contract(self.supplier_idurl, the_contract)
+                from bitdust.customer import payment
+                payment.save_storage_contract(self.supplier_idurl, the_contract)
         self.automat('ack', response)
 
     def _supplier_service_failed(self, response, info):
@@ -707,8 +674,8 @@ def _do_request_supplier_service(self, ecc_map, family_position, family_snapshot
         service_info = {
             'customer_id': self.customer_id,
             'needed_bytes': self.needed_bytes,
-            'minimum_duration_hours': 6,
-            'maximum_duration_hours': 24*30,
+            # 'minimum_duration_hours': 6,
+            # 'maximum_duration_hours': 24*30,
         }
         # TODO: re-think again about the customer key, do we really need it?
         # my_customer_key_id = my_id.getGlobalID(key_alias='customer')
diff --git a/bitdust/interface/api.py b/bitdust/interface/api.py
index 6455606..01951e1 100644
--- a/bitdust/interface/api.py
+++ b/bitdust/interface/api.py
@@ -1049,12 +1049,10 @@ def config_get(key, include_info=False):
         return ERROR('empty key')
     if _Debug:
         lg.out(_DebugLevel, 'api.config_get [%s]' % key)
-    if not config.conf().exist(key):
+    if not config.conf().registered(key):
         return ERROR('option %s does not exist' % key)
     if not config.conf().hasChilds(key):
-        return RESULT([
-            config.conf().toJson(key, include_info=include_info),
-        ])
+        return RESULT([config.conf().toJson(key, include_info=include_info)])
     known_childs = sorted(config.conf().listEntries(key))
     if key.startswith('services/') and key.count('/') == 1:
         svc_enabled_key = key + '/enabled'
@@ -1085,6 +1083,8 @@ def config_set(key, value):
     """
     key = strng.to_text(key)
     v = {}
+    if not config.conf().registered(key):
+        return ERROR('option %s does not exist' % key)
     if config.conf().exist(key):
         v['old_value'] = config.conf().getValueOfType(key)
     typ_label = config.conf().getTypeLabel(key)
@@ -3715,7 +3715,7 @@ def friends_list():
     result = []
     for idurl, alias in contactsdb.correspondents():
         glob_id = global_id.ParseIDURL(idurl)
-        contact_status = 'offline'
+        # contact_status = 'offline'
         contact_state = 'OFFLINE'
         friend = {
             'idurl': idurl,
@@ -3723,7 +3723,7 @@ def friends_list():
             'idhost': glob_id['idhost'],
             'username': glob_id['user'],
             'alias': alias,
-            'contact_status': contact_status,
+            # 'contact_status': contact_status,
             'contact_state': contact_state,
         }
         if driver.is_on('service_identity_propagate'):
@@ -3731,7 +3731,7 @@ def friends_list():
             state_machine_inst = online_status.getInstance(idurl, autocreate=False)
             if state_machine_inst:
                 friend.update(state_machine_inst.to_json())
-                friend['contact_status'] = online_status.stateToLabel(state_machine_inst.state)
+                # friend['contact_status'] = online_status.stateToLabel(state_machine_inst.state)
                 friend['contact_state'] = state_machine_inst.state
         result.append(friend)
     return RESULT(result)
@@ -3921,7 +3921,7 @@ def user_status(user_id):
     # if not state_machine_inst:
     #     return ERROR('error fetching user status')
     return OK({
-        'contact_status': online_status.getStatusLabel(idurl),
+        # 'contact_status': online_status.getStatusLabel(idurl),
         'contact_state': online_status.getCurrentState(idurl),
         'idurl': idurl,
         'global_id': global_id.UrlToGlobalID(idurl),
@@ -3961,7 +3961,7 @@ def user_status_check(user_id, timeout=None):
                 idurl=idurl,
                 global_id=global_id.UrlToGlobalID(idurl),
                 contact_state=peer_status.state,
-                contact_status=online_status.stateToLabel(peer_status.state),
+                # contact_status=online_status.stateToLabel(peer_status.state),
             ),
             api_method='user_status_check',
         ))
@@ -4454,7 +4454,7 @@ def suppliers_list(customer_id=None, verbose=False):
     from bitdust.userid import my_id
     from bitdust.userid import id_url
     from bitdust.userid import global_id
-    from bitdust.storage import backup_matrix
+    # from bitdust.storage import backup_matrix
     customer_idurl = strng.to_bin(customer_id)
     if not customer_idurl:
         customer_idurl = my_id.getIDURL().to_bin()
@@ -4474,35 +4474,40 @@ def suppliers_list(customer_id=None, verbose=False):
                 'global_id': '',
                 'supplier_state': None,
                 'connected': None,
-                'contact_status': 'offline',
+                # 'contact_status': 'offline',
                 'contact_state': 'OFFLINE',
             }
             results.append(r)
             continue
+        sc = None
+        if supplier_connector.is_supplier(supplier_idurl, customer_idurl):
+            sc = supplier_connector.by_idurl(supplier_idurl, customer_idurl)
         r = {
             'position': pos,
             'idurl': supplier_idurl,
             'global_id': global_id.UrlToGlobalID(supplier_idurl),
-            'supplier_state': None if not supplier_connector.is_supplier(supplier_idurl, customer_idurl) else supplier_connector.by_idurl(supplier_idurl, customer_idurl).state,
+            'supplier_state': None if not sc else sc.state,
             'connected': misc.readSupplierData(supplier_idurl, 'connected', customer_idurl),
-            'contact_status': 'offline',
+            # 'contact_status': 'offline',
             'contact_state': 'OFFLINE',
         }
         if online_status.isKnown(supplier_idurl):
-            r['contact_status'] = online_status.getStatusLabel(supplier_idurl)
+            # r['contact_status'] = online_status.getStatusLabel(supplier_idurl)
             r['contact_state'] = online_status.getCurrentState(supplier_idurl)
         # if contact_status.isKnown(supplier_idurl):
         #     cur_state = contact_status.getInstance(supplier_idurl).state
         #     r['contact_status'] = contact_status.stateToLabel(cur_state)
         #     r['contact_state'] = cur_state
         if verbose:
-            _files, _total, _report = backup_matrix.GetSupplierStats(pos, customer_idurl=customer_idurl)
-            r['listfiles'] = misc.readSupplierData(supplier_idurl, 'listfiles', customer_idurl)
-            r['fragments'] = {
-                'items': _files,
-                'files': _total,
-                'details': _report,
-            }
+            # TODO: create separate api method for that: api.supplier_list_files()
+            # _files, _total, _report = backup_matrix.GetSupplierStats(pos, customer_idurl=customer_idurl)
+            # r['listfiles'] = misc.readSupplierData(supplier_idurl, 'listfiles', customer_idurl).split('\n')
+            # r['fragments'] = {
+            #     'items': _files,
+            #     'files': _total,
+            #     'details': _report,
+            # }
+            r['contract'] = None if not sc else sc.storage_contract
         results.append(r)
     return RESULT(results)
 
@@ -4642,6 +4647,10 @@ def customers_list(verbose=False):
     if driver.is_on('service_customer_support'):
         service_customer_support_on = True
         from bitdust.supplier import customer_assistant
+    service_supplier_contracts_on = False
+    if driver.is_on('service_supplier_contracts'):
+        service_supplier_contracts_on = True
+        from bitdust.supplier import storage_contract
     from bitdust.contacts import contactsdb
     from bitdust.p2p import online_status
     from bitdust.userid import global_id
@@ -4652,9 +4661,9 @@ def customers_list(verbose=False):
                 'position': pos,
                 'global_id': '',
                 'idurl': '',
-                'contact_status': 'offline',
+                # 'contact_status': 'offline',
                 'contact_state': 'OFFLINE',
-                'customer_assistant_state': 'OFFLINE',
+                # 'customer_assistant_state': 'OFFLINE',
             }
             results.append(r)
             continue
@@ -4662,17 +4671,20 @@ def customers_list(verbose=False):
             'position': pos,
             'global_id': global_id.UrlToGlobalID(customer_idurl),
             'idurl': customer_idurl,
-            'contact_status': 'offline',
+            # 'contact_status': 'offline',
             'contact_state': 'OFFLINE',
-            'customer_assistant_state': 'OFFLINE',
+            # 'customer_assistant_state': 'OFFLINE',
         }
         if online_status.isKnown(customer_idurl):
-            r['contact_status'] = online_status.getStatusLabel(customer_idurl)
+            # r['contact_status'] = online_status.getStatusLabel(customer_idurl)
             r['contact_state'] = online_status.getCurrentState(customer_idurl)
-        if service_customer_support_on:
-            assistant = customer_assistant.by_idurl(customer_idurl)
-            if assistant:
-                r['customer_assistant_state'] = assistant.state
+        if verbose:
+            if service_customer_support_on:
+                assistant = customer_assistant.by_idurl(customer_idurl)
+                if assistant:
+                    r['customer_assistant_state'] = assistant.state
+            if service_supplier_contracts_on:
+                r['contract'] = storage_contract.get_current_customer_contract(customer_idurl)
         results.append(r)
     return RESULT(results)
 
@@ -4817,7 +4829,7 @@ def space_local():
 #------------------------------------------------------------------------------
 
 
-def services_list(with_configs=False):
+def services_list(with_configs=False, as_tree=False):
     """
     Returns detailed info about all currently running network services.
 
@@ -4832,13 +4844,19 @@ def services_list(with_configs=False):
         websocket.send('{"command": "api_call", "method": "services_list", "kwargs": {"with_configs": 1} }');
     """
     result = []
-    for _, svc in sorted(list(driver.services().items()), key=lambda i: i[0]):
+    if as_tree:
+        ordered = sorted(list(driver.services().items()), key=lambda i: driver.root_distance(i[0]))
+    else:
+        ordered = sorted(list(driver.services().items()), key=lambda i: i[0])
+    for svc_name, svc in ordered:
         svc_info = svc.to_json()
         if with_configs:
             svc_configs = []
             for child in config.conf().listEntries(svc.config_path.replace('/enabled', '')):
                 svc_configs.append(config.conf().toJson(child, include_info=False))
             svc_info['configs'] = svc_configs
+        if as_tree:
+            svc_info['root_distance'] = driver.root_distance(svc_name)
         result.append(svc_info)
     if _Debug:
         lg.out(_DebugLevel, 'api.services_list responded with %d items' % len(result))
@@ -5828,11 +5846,7 @@ def blockchain_info():
         }
     if driver.is_on('service_bismuth_wallet'):
         from bitdust.blockchain import bismuth_wallet
-        try:
-            cur_balance = bismuth_wallet.my_balance()
-        except:
-            lg.exc()
-            cur_balance = 'N/A'
+        cur_balance = bismuth_wallet.my_balance()
         ret['wallet'] = {
             'balance': cur_balance,
             'address': bismuth_wallet.my_wallet_address(),
@@ -5860,11 +5874,7 @@ def blockchain_wallet_balance():
     if not driver.is_on('service_bismuth_wallet'):
         return ERROR('service_bismuth_wallet() is not started')
     from bitdust.blockchain import bismuth_wallet
-    try:
-        cur_balance = bismuth_wallet.my_balance()
-    except:
-        lg.exc()
-        cur_balance = 'N/A'
+    cur_balance = bismuth_wallet.my_balance()
     return OK({
         'balance': cur_balance,
         'address': bismuth_wallet.my_wallet_address(),
diff --git a/bitdust/interface/cmd_line_json.py b/bitdust/interface/cmd_line_json.py
index 05870f7..b14d8c9 100644
--- a/bitdust/interface/cmd_line_json.py
+++ b/bitdust/interface/cmd_line_json.py
@@ -768,6 +768,7 @@ def cmd_api(opts, args, overDict, executablePath):
                 'jsn',
                 'json',
                 'gc',
+                'config',
             ]:
                 continue
             method = getattr(api, item, None)
@@ -1127,6 +1128,20 @@ def _services_update(result):
         tpl = jsontemplate.Template(templ.TPL_SERVICES)
         return call_websocket_method_transform_template_and_stop('services_list', tpl, _services_update)
 
+    if len(args) == 2 and args[1] in ['tree', 'tr']:
+
+        def _services_update(result):
+            for i in range(len(result['result'])):
+                r = result['result'][i]
+                r['enabled_label'] = 'ENABLED' if r['enabled'] else 'DISABLED'
+                r['depends'] = ', '.join(r['depends']) if r['depends'] else 'no dependencies'
+                r['offset'] = '| '*r['root_distance']
+                result['result'][i] = r
+            return result
+
+        tpl = jsontemplate.Template(templ.TPL_SERVICES_TREE)
+        return call_websocket_method_transform_template_and_stop('services_list', tpl, _services_update, as_tree=True)
+
     if len(args) >= 3 and args[1] in ['start', 'enable', 'on']:
         tpl = jsontemplate.Template(templ.TPL_RAW)
         return call_websocket_method_template_and_stop('service_start', tpl, service_name=args[2])
diff --git a/bitdust/interface/cmd_line_json_templates.py b/bitdust/interface/cmd_line_json_templates.py
index 1516d32..890cff2 100644
--- a/bitdust/interface/cmd_line_json_templates.py
+++ b/bitdust/interface/cmd_line_json_templates.py
@@ -135,7 +135,9 @@ def ls(tpl, tag='result'):
 
 #------------------------------------------------------------------------------
 
-TPL_SERVICES = tpl_4_items.format(tpl_status, tpl_execution, ls('{index}: {name}({state}) {enabled_label}, {num_depends} depends\n'), tpl_errors)
+TPL_SERVICES = tpl_4_items.format(tpl_status, tpl_execution, ls('{index}: {name}({state}) {enabled_label}, with {num_depends} dependencies\n'), tpl_errors)
+
+TPL_SERVICES_TREE = tpl_4_items.format(tpl_status, tpl_execution, ls('{offset}{name}({state}) {enabled_label} [{depends}]\n'), tpl_errors)
 
 TPL_SERVICE_INFO = tpl_4_items.format(
     tpl_status,
diff --git a/bitdust/interface/web_html_template.py b/bitdust/interface/web_html_template.py
new file mode 100644
index 0000000..a1f6074
--- /dev/null
+++ b/bitdust/interface/web_html_template.py
@@ -0,0 +1,212 @@
+WEB_ROOT_TEMPLATE = """<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="msapplication-TileColor" content="#da532c">
+    <meta name="theme-color" content="#ffffff">
+    <meta property="og:image:width" content="2400">
+    <meta property="og:image:height" content="1257">
+    <meta property="og:title" content="%(title)s">
+    <meta property="og:description"
+          content="Distributed secure anonymous on-line storage, where only the owner has access and absolute control over its data.">
+    <meta property="og:url" content="%(site_url)s">
+    <meta property="og:image" content="%(basepath)sassets/img/og/og-image.jpg">
+
+    <title data-content="pageTitle">%(title)s</title>
+
+    <link rel="manifest" href="%(basepath)ssite.webmanifest"/>
+
+    <link rel="apple-touch-icon" sizes="180x180" href="%(basepath)slogos/logo-pictogram-color.png"/>
+    <link rel="icon" type="image/png" sizes="32x32" href="%(basepath)slogos/logo-pictogram-color.png"/>
+    <link rel="icon" type="image/png" sizes="16x16" href="%(basepath)slogos/logo-pictogram-color.png"/>
+    <link rel="mask-icon" href="%(basepath)slogos/logo-pictogram-color.svg" color="#5bbad5"/>
+
+    <link href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:600,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:600" rel="stylesheet">
+    <link rel="stylesheet" href="%(basepath)sassets/css/applify.min.css" type="text/css"/>
+    <link rel="stylesheet" href="%(basepath)sassets/css/tables.css" type="text/css"/>
+    <link rel="stylesheet" href="%(basepath)scss/automat.css" type="text/css"/>
+
+</head>
+
+<body data-fade_in="on-load">
+
+<nav class="navbar navbar-fixed-top navbar-dark bg-indigo">
+    <div class="container">
+
+        <!-- Navbar Logo -->
+        <a class="ui-variable-logo navbar-brand" href="%(site_url)s/" title="BitDust">
+            <!-- Default Logo -->
+            <img class="logo-default" src="%(basepath)sassets/img/logo/bitdust-logo-white.svg" alt="BitDust">
+            <!-- Transparent Logo -->
+            <img class="logo-transparent" src="%(basepath)sassets/img/logo/bitdust-logo-white.svg" alt="BitDust">
+        </a><!-- .navbar-brand -->
+
+        <!-- Navbar Navigation -->
+        <div class="ui-navigation navbar-center">
+            <ul class="nav navbar-nav">
+                <!-- Nav Item -->
+                <li>
+                    <a href="%(site_url)s/index.html#product">Product</a>
+                </li>
+                <!-- Nav Item -->
+                <li>
+                    <a href="%(site_url)s/index.html#problem">Problem</a>
+                </li>
+                <!-- Nav Item -->
+                <li>
+                    <a href="%(site_url)s/index.html#solution">Solution</a>
+                </li>
+                <!-- Nav Item -->
+                <li>
+                    <a href="%(site_url)s/index.html#ecosystem">Ecosystem</a>
+                </li>
+                <!-- Nav Item -->
+                <li>
+                    <a href="%(site_url)s/index.html#roadmap">Roadmap</a>
+                </li>
+                <!-- Nav Item -->
+                <li>
+                    <a href="%(site_url)s/index.html#team">Team</a>
+                </li>
+                <!-- Nav Item -->
+                <li class="active">
+                    <a href="%(wikipath)s">Wiki</a>
+                </li>
+
+                <!-- Nav Item -->
+                <li class="dropdown active">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                        Network
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li class="dropdown-item">
+                            <a href="%(idserverspath)s" style="color:#8089ff;">ID servers</a>
+                        </li>
+                        <li class="dropdown-item">
+                            <a href="%(blockchainpath)s" style="color:#8089ff;">Blockchain</a>
+                        </li>
+                    </ul>
+                </li>
+
+            </ul><!--.navbar-nav -->
+        </div><!--.ui-navigation -->
+
+        <!-- Navbar Button -->
+        <a href="%(site_url)s/index.html#product"
+           class="btn btn-sm ui-gradient-peach pull-right">
+            Get Started
+        </a>
+
+
+    </div><!-- .container -->
+</nav> <!-- nav -->
+
+
+<!-- Main -->
+<div class="%(div_main_class)s" role="main">
+
+%(div_main_body)s
+
+<!-- Footer -->
+<footer class="ui-footer bg-gray">
+
+    %(pre_footer)s
+
+    <!-- Footer Copyright -->
+    <div class="footer-copyright bg-dark-gray">
+        <div class="container">
+            <div class="row">
+                <!-- Copyright -->
+                <div class="col-sm-6 center-on-sm">
+                    <p>
+                        &copy; 2019 <a href="%(site_url)s" target="_blank" title="BitDust">BitDust</a>
+                    </p>
+                </div>
+                <!-- Social Icons -->
+                <div class="col-sm-6 text-right">
+                    <ul class="footer-nav">
+                        <li>
+                            <a href="%(wikipath)s">
+                                Wiki
+                            </a>
+                        </li>
+                        <li>
+                            <a href="https://github.com/bitdust-io/">
+                                Github
+                            </a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div><!-- .container -->
+    </div><!-- .footer-copyright -->
+
+</footer><!-- .ui-footer -->
+
+</div>
+<!-- Main -->
+
+
+<!-- Scripts -->
+<script src="%(basepath)sassets/js/libs/jquery/jquery-3.2.1.min.js"></script>
+<script src="%(basepath)sassets/js/libs/bootstrap.js"></script>
+<script src="%(basepath)sassets/js/libs/owl.carousel/owl.carousel.min.js"></script>
+<script src="%(basepath)sassets/js/libs/slider-pro/jquery.sliderPro.min.js"></script>
+<script src="%(basepath)sassets/js/libs/form-validator/form-validator.min.js"></script>
+<script src="%(basepath)sassets/js/applify/ui-map.js"></script>
+<script src="%(basepath)sassets/js/applify/build/applify.js"></script>
+%(google_analytics)s
+<!-- Scripts -->
+
+</body>
+</html>"""
+
+div_main_class = 'main wiki'
+
+div_main_body = ''
+
+GOOGLE_ANALITICS = """
+<!-- Global site tag (gtag.js) - Google Analytics -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=%(google_analytics_code)s"></script>
+<script>
+    window.dataLayer = window.dataLayer || [];
+
+    function gtag() {
+        dataLayer.push(arguments);
+    }
+
+    gtag('js', new Date());
+
+    gtag('config', '%(google_analytics_code)s');
+</script>
+"""
+
+google_analytics = GOOGLE_ANALITICS % dict(google_analytics_code='', )
+
+pre_footer = """
+<div class="container pt-6 pb-6">
+    <div class="row">
+        <div class="col-sm-8 footer-about footer-col center-on-sm">
+            <img src="%(basepath)sassets/img/logo/bitdust-logo-white.svg" alt="BitDust" />
+            <p class="mt-1">
+                We are currently with a small team primarily focusing on the development and supporting the BitDust community.
+                Join us via Telegram or send a email.
+            </p>
+        </div>
+
+        <div class="col-md-4 col-sm-6 footer-col center-on-sm">
+            <div>
+                <a class="btn ui-gradient-purple btn-circle shadow-md" href="https://t.me/bitdust" target="_blank">
+                    <span class="fa fa-telegram"></span>
+                </a>
+                <a class="btn ui-gradient-blue btn-circle shadow-md" href="https://github.com/bitdust-io/" target="_blank">
+                    <span class="fa fa-github"></span>
+                </a>
+            </div>
+        </div>
+    </div><!-- .row -->
+</div><!-- .container -->
+"""
diff --git a/bitdust/lib/utime.py b/bitdust/lib/utime.py
index 8fd6bb9..c5e0567 100644
--- a/bitdust/lib/utime.py
+++ b/bitdust/lib/utime.py
@@ -77,6 +77,8 @@ def sec1970_to_datetime_utc(seconds=-1):
     """
     Converts seconds since 1970 year to datetime object in UTC form.
     """
+    if seconds is None:
+        return None
     if seconds == -1:
         seconds = utcnow_to_sec1970()
     return datetime.datetime.utcfromtimestamp(seconds)
@@ -114,6 +116,8 @@ def pack_time(seconds=-1, timespec='seconds'):
     """
     Converts seconds since 1970 year to ISO formatted string.
     """
+    if seconds is None:
+        return None
     return sec1970_to_datetime_utc(seconds).isoformat(timespec=timespec)
 
 
@@ -121,4 +125,6 @@ def unpack_time(text):
     """
     Converts ISO formatted string to seconds since 1970 year.
     """
+    if text is None:
+        return None
     return datetime_to_sec1970(_fromisoformat(text))
diff --git a/bitdust/main/config.py b/bitdust/main/config.py
index a60fa2d..16c6612 100644
--- a/bitdust/main/config.py
+++ b/bitdust/main/config.py
@@ -104,6 +104,9 @@ def getConfigDir(self):
     def exist(self, entryPath):
         return self._get(entryPath) is not None
 
+    def registered(self, entryPath):
+        return self._exists(entryPath)
+
     def remove(self, entryPath):
         elemList = self._parseEntryPath(entryPath)
         fpath = os.path.join(self.configDir, *elemList)
@@ -285,6 +288,15 @@ def _parseEntryPath(self, entryPath):
         self._validateElemList(elemList)
         return elemList
 
+    def _exists(self, entryPath):
+        elemList = self._parseEntryPath(entryPath)
+        fpath = os.path.join(self.configDir, *elemList)
+        if os.path.isdir(fpath):
+            return True
+        elif os.path.isfile(fpath):
+            return True
+        return False
+
     def _get(self, entryPath):
         elemList = self._parseEntryPath(entryPath)
         fpath = os.path.join(self.configDir, *elemList)
@@ -406,9 +418,6 @@ def __init__(self, configDir):
             self._types = {}
             self._labels = {}
 
-    def types(self):
-        return
-
     def listKnownTypes(self):
         return list(self._types.keys())
 
diff --git a/bitdust/main/config_defaults.py b/bitdust/main/config_defaults.py
index 8852eb6..3202f90 100644
--- a/bitdust/main/config_defaults.py
+++ b/bitdust/main/config_defaults.py
@@ -85,16 +85,6 @@ def reset(conf_obj):
     conf_obj.setDefaultValue('services/backups/keep-local-copies-enabled', 'true')
     conf_obj.setDefaultValue('services/backups/wait-suppliers-enabled', 'true')
 
-    # conf_obj.setDefaultValue('services/blockchain/enabled', 'false')
-    # conf_obj.setDefaultValue('services/blockchain/host', '127.0.0.1')
-    # conf_obj.setDefaultValue('services/blockchain/port', 9100)
-    # conf_obj.setDefaultValue('services/blockchain/seeds', '')
-    # conf_obj.setDefaultValue('services/blockchain/explorer/enabled', 'true')
-    # conf_obj.setDefaultValue('services/blockchain/explorer/port', 9180)
-    # conf_obj.setDefaultValue('services/blockchain/wallet/enabled', 'true')
-    # conf_obj.setDefaultValue('services/blockchain/wallet/port', 9280)
-    # conf_obj.setDefaultValue('services/blockchain/miner/enabled', 'false')
-
     conf_obj.setDefaultValue('services/blockchain-id/enabled', 'false')
 
     conf_obj.setDefaultValue('services/blockchain-authority/enabled', 'false')
@@ -102,6 +92,10 @@ def reset(conf_obj):
     conf_obj.setDefaultValue('services/blockchain-authority/requests-reading-offset', 0)
     conf_obj.setDefaultValue('services/blockchain-authority/requests-reading-limit', 50)
 
+    conf_obj.setDefaultValue('services/blockchain-explorer/enabled', 'false')
+    conf_obj.setDefaultValue('services/blockchain-explorer/host', '127.0.0.1')
+    conf_obj.setDefaultValue('services/blockchain-explorer/web-port', 19080)
+
     conf_obj.setDefaultValue('services/bismuth-blockchain/enabled', 'false')
 
     conf_obj.setDefaultValue('services/bismuth-node/enabled', 'false')
diff --git a/bitdust/main/config_details.py b/bitdust/main/config_details.py
index 43bffe3..bf95183 100644
--- a/bitdust/main/config_details.py
+++ b/bitdust/main/config_details.py
@@ -120,23 +120,6 @@ def raw():
 Enable this option to wait for 24 hours after any file upload and perform an extra check of all suppliers before cleaning up the local copy.
 This is a compromise solution that does not sacrifice reliability but also decrease local storage consumption.
 
-{services/blockchain/enabled} enable blockchain
-The service is under development.
-
-{services/blockchain/host}
-
-{services/blockchain/port}
-
-{services/blockchain/explorer/enabled}
-
-{services/blockchain/explorer/port}
-
-{services/blockchain/wallet/enabled}
-
-{services/blockchain/wallet/port}
-
-{services/blockchain/miner/enabled}
-
 {services/broadcasting/enabled} send & receive encrypted broadcast messages
 The service is under development.
 
diff --git a/bitdust/main/config_types.py b/bitdust/main/config_types.py
index e737104..82a5d04 100644
--- a/bitdust/main/config_types.py
+++ b/bitdust/main/config_types.py
@@ -105,19 +105,14 @@ def defaults():
         'services/backups/max-block-size': TYPE_DISK_SPACE,
         'services/backups/max-copies': TYPE_POSITIVE_INTEGER,
         'services/backups/wait-suppliers-enabled': TYPE_BOOLEAN,
-        # 'services/blockchain/enabled': TYPE_BOOLEAN,
-        # 'services/blockchain/host': TYPE_STRING,
-        # 'services/blockchain/port': TYPE_PORT_NUMBER,
-        # 'services/blockchain/explorer/enabled': TYPE_BOOLEAN,
-        # 'services/blockchain/explorer/port': TYPE_PORT_NUMBER,
-        # 'services/blockchain/wallet/enabled': TYPE_BOOLEAN,
-        # 'services/blockchain/wallet/port': TYPE_PORT_NUMBER,
-        # 'services/blockchain/miner/enabled': TYPE_BOOLEAN,
         'services/blockchain-id/enabled': TYPE_BOOLEAN,
         'services/blockchain-authority/enabled': TYPE_BOOLEAN,
         'services/blockchain-authority/registration-bonus-coins': TYPE_POSITIVE_INTEGER,
         'services/blockchain-authority/requests-reading-offset': TYPE_POSITIVE_INTEGER,
         'services/blockchain-authority/requests-reading-limit': TYPE_NON_ZERO_POSITIVE_INTEGER,
+        'services/blockchain-explorer/enabled': TYPE_BOOLEAN,
+        'services/blockchain-explorer/host': TYPE_STRING,
+        'services/blockchain-explorer/web-port': TYPE_PORT_NUMBER,
         'services/bismuth-blockchain/enabled': TYPE_BOOLEAN,
         'services/bismuth-node/enabled': TYPE_BOOLEAN,
         'services/bismuth-node/host': TYPE_STRING,
@@ -172,7 +167,6 @@ def defaults():
         'services/identity-propagate/max-servers': TYPE_NON_ZERO_POSITIVE_INTEGER,
         'services/identity-propagate/automatic-rotate-enabled': TYPE_BOOLEAN,
         'services/identity-propagate/health-check-interval-seconds': TYPE_POSITIVE_INTEGER,
-        'services/identity-server/enabled': TYPE_BOOLEAN,
         'services/ip-port-responder/enabled': TYPE_BOOLEAN,
         'services/keys-registry/enabled': TYPE_BOOLEAN,
         'services/keys-storage/enabled': TYPE_BOOLEAN,
diff --git a/bitdust/main/initializer.py b/bitdust/main/initializer.py
index e1716ea..510e07a 100644
--- a/bitdust/main/initializer.py
+++ b/bitdust/main/initializer.py
@@ -228,7 +228,13 @@ def A(event=None, *args, **kwargs):
     """
     global _Initializer
     if _Initializer is None:
-        _Initializer = Initializer('initializer', 'AT_STARTUP', 2, True)
+        _Initializer = Initializer(
+            name='initializer',
+            state='AT_STARTUP',
+            debug_level=_DebugLevel,
+            log_events=_Debug,
+            log_transitions=_Debug,
+        )
     if event is not None:
         if kwargs.get('use_reactor', True):
             _Initializer.automat(event, *args, **kwargs)
diff --git a/bitdust/p2p/p2p_service.py b/bitdust/p2p/p2p_service.py
index 768f00e..efba8ab 100644
--- a/bitdust/p2p/p2p_service.py
+++ b/bitdust/p2p/p2p_service.py
@@ -51,8 +51,6 @@
 
 #------------------------------------------------------------------------------
 
-#------------------------------------------------------------------------------
-
 from bitdust.logs import lg
 
 from bitdust.contacts import contactsdb
diff --git a/bitdust/services/driver.py b/bitdust/services/driver.py
index 5f5fbd1..b83c128 100644
--- a/bitdust/services/driver.py
+++ b/bitdust/services/driver.py
@@ -70,6 +70,7 @@
 
 _Services = {}
 _BootUpOrder = []
+_RootDistanceDict = {}
 _EnabledServices = set()
 _DisabledServices = set()
 _StartingDeferred = None
@@ -98,6 +99,11 @@ def boot_up_order():
     return _BootUpOrder
 
 
+def root_distance(service_name):
+    global _RootDistanceDict
+    return _RootDistanceDict.get(service_name, 0)
+
+
 def is_on(name):
     svc = services().get(name, None)
     if svc is None:
@@ -281,6 +287,7 @@ def shutdown():
 
 def build_order():
     global _BootUpOrder
+    global _RootDistanceDict
     order = list(enabled_services())
     progress = True
     fail = False
@@ -313,9 +320,28 @@ def build_order():
                 progress = True
                 break
     _BootUpOrder = order
+    for service_name in services().keys():
+        _RootDistanceDict[service_name] = find_root_distance(service_name)
     return order
 
 
+def find_root_distance(service_name):
+    svc = services().get(service_name)
+    if not svc:
+        return 0
+    if not svc.dependent_on():
+        return 0
+    max_root_distance = 0
+    for depend_name in svc.dependent_on():
+        depend_service = services().get(depend_name, None)
+        if not depend_service:
+            raise ServiceNotFound(depend_name)
+        depend_service_root_distance = find_root_distance(depend_name)
+        if depend_service_root_distance > max_root_distance:
+            max_root_distance = depend_service_root_distance
+    return max_root_distance + 1
+
+
 def start(services_list=[]):
     global _StartingDeferred
     global _StopingDeferred
diff --git a/bitdust/services/service_blockchain_explorer.py b/bitdust/services/service_blockchain_explorer.py
new file mode 100644
index 0000000..d4bad3a
--- /dev/null
+++ b/bitdust/services/service_blockchain_explorer.py
@@ -0,0 +1,59 @@
+#!/usr/bin/python
+# service_blockchain_explorer.py
+#
+# Copyright (C) 2008 Veselin Penev, https://bitdust.io
+#
+# This file (service_blockchain_explorer.py) is part of BitDust Software.
+#
+# BitDust is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# BitDust Software is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with BitDust Software.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Please contact us if you have any questions at bitdust.io@gmail.com
+#
+#
+#
+#
+"""
+..
+
+module:: service_blockchain_explorer
+"""
+
+from __future__ import absolute_import
+from bitdust.services.local_service import LocalService
+
+
+def create_service():
+    return BlockchainExplorerService()
+
+
+class BlockchainExplorerService(LocalService):
+
+    service_name = 'service_blockchain_explorer'
+    config_path = 'services/blockchain-explorer/enabled'
+
+    def dependent_on(self):
+        return [
+            'service_bismuth_node',
+        ]
+
+    def installed(self):
+        return True
+
+    def start(self):
+        from bitdust.blockchain import blockchain_explorer
+        return blockchain_explorer.init()
+
+    def stop(self):
+        from bitdust.blockchain import blockchain_explorer
+        return blockchain_explorer.shutdown()
diff --git a/bitdust/services/service_customer_contracts.py b/bitdust/services/service_customer_contracts.py
index 634fdae..8ecdc73 100644
--- a/bitdust/services/service_customer_contracts.py
+++ b/bitdust/services/service_customer_contracts.py
@@ -49,9 +49,9 @@ def dependent_on(self):
         ]
 
     def start(self):
-        from twisted.internet import task
+        from twisted.internet import task  # @UnresolvedImport
         self.payment_loop = task.LoopingCall(self.on_payment_task)
-        self.payment_loop.start(60*60)
+        self.payment_loop.start(60*60, now=True)
         return True
 
     def stop(self):
diff --git a/bitdust/services/service_my_ip_port.py b/bitdust/services/service_my_ip_port.py
index 404f6ca..383c0df 100644
--- a/bitdust/services/service_my_ip_port.py
+++ b/bitdust/services/service_my_ip_port.py
@@ -86,7 +86,7 @@ def _do_stun(self):
 
     def _on_stun_result(self, stun_result, nat_type, my_ip, details):
         from bitdust.logs import lg
-        from twisted.internet import reactor
+        from twisted.internet import reactor  # @UnresolvedImport
         if stun_result != 'stun-success' or not my_ip or my_ip == '127.0.0.1':
             lg.warn('stun my external IP failed, retry after 10 seconds')
             reactor.callLater(10, self._do_stun)  # @UndefinedVariable
diff --git a/bitdust/services/service_personal_messages.py b/bitdust/services/service_personal_messages.py
index 2f7d392..b426d3c 100644
--- a/bitdust/services/service_personal_messages.py
+++ b/bitdust/services/service_personal_messages.py
@@ -55,7 +55,7 @@ def installed(self):
 
     def start(self):
         from twisted.internet import reactor  # @UnresolvedImport
-        from twisted.internet.defer import Deferred
+        from twisted.internet.defer import Deferred  # @UnresolvedImport
         from bitdust.logs import lg
         from bitdust.main import settings
         from bitdust.access import groups
@@ -89,7 +89,7 @@ def start(self):
         return self.starting_deferred
 
     def stop(self):
-        from bitdust.interface import api
+        # from bitdust.interface import api
         # api.group_leave(self.personal_group_key_id, erase_key=False)
         return True
 
diff --git a/bitdust/storage/accounting.py b/bitdust/storage/accounting.py
index 8c03d26..49a9e45 100644
--- a/bitdust/storage/accounting.py
+++ b/bitdust/storage/accounting.py
@@ -337,11 +337,13 @@ def verify_storage_contract(json_data):
         int(json_data['value'])
         int(json_data['allocated_bytes'])
         int(json_data['duration_hours'])
-        int(json_data['my_position'])
-        str(json_data['ecc_map'])
+        if json_data.get('ecc_position') is not None:
+            int(json_data['ecc_position'])
+        if json_data.get('ecc_map'):
+            str(json_data['ecc_map'])
         float(json_data['raise_factor'])
     except:
-        lg.exc()
+        lg.exc(repr(json_data))
         return False
     try:
         gbh = float(json_data['duration_hours'])*(json_data['allocated_bytes']/(1024.0*1024.0*1024.0))
diff --git a/bitdust/storage/index_synchronizer.py b/bitdust/storage/index_synchronizer.py
index 926a08f..d92df25 100644
--- a/bitdust/storage/index_synchronizer.py
+++ b/bitdust/storage/index_synchronizer.py
@@ -86,7 +86,7 @@
 #------------------------------------------------------------------------------
 
 _Debug = False
-_DebugLevel = 16
+_DebugLevel = 14
 
 #------------------------------------------------------------------------------
 
diff --git a/bitdust/supplier/customer_space.py b/bitdust/supplier/customer_space.py
index f30b652..ee593ab 100644
--- a/bitdust/supplier/customer_space.py
+++ b/bitdust/supplier/customer_space.py
@@ -944,7 +944,7 @@ def on_service_supplier_request(json_payload, newpacket, info):
         try:
             current_contract = storage_contract.prepare_customer_contract(customer_idurl, details={
                 'allocated_bytes': bytes_for_customer,
-                'my_position': family_position,
+                'ecc_position': family_position,
                 'ecc_map': ecc_map,
             })
         except:
diff --git a/bitdust/supplier/storage_contract.py b/bitdust/supplier/storage_contract.py
index e9362a6..0fdee9e 100644
--- a/bitdust/supplier/storage_contract.py
+++ b/bitdust/supplier/storage_contract.py
@@ -88,6 +88,9 @@ def get_current_customer_contract(customer_idurl):
     if not accounting.verify_storage_contract(json_data):
         lg.err('current storage contract with %r is not valid' % customer_idurl)
         return None
+    if 'my_position' in json_data:
+        # TODO: remove later...
+        json_data['ecc_position'] = json_data.pop('my_position')
     return json_data
 
 
@@ -122,6 +125,9 @@ def list_customer_contracts(customer_idurl):
             if not accounting.verify_storage_contract(current_contract):
                 current_contract = None
                 lg.err('current storage contract is invalid')
+            if 'my_position' in current_contract:
+                # TODO: remove later...
+                current_contract['ecc_position'] = current_contract.pop('my_position')
             continue
         try:
             started_time = int(fname.split('.')[0])
@@ -134,6 +140,9 @@ def list_customer_contracts(customer_idurl):
         if not accounting.verify_storage_contract(json_data):
             lg.err('invalid storage contract found: %r' % fname)
             continue
+        if 'my_position' in json_data:
+            # TODO: remove later...
+            json_data['ecc_position'] = json_data.pop('my_position')
         json_data['filename'] = fname
         customer_contracts[started_time] = json_data
         if started_time > latest_contract_started_time:
@@ -318,7 +327,7 @@ def start_current_customer_contract(customer_idurl, details, started_time, compl
         'value': float(duration_hours)*(details['allocated_bytes']/(1024.0*1024.0*1024.0)),
         'allocated_bytes': details['allocated_bytes'],
         'duration_hours': duration_hours,
-        'my_position': details['my_position'],
+        'ecc_position': details['ecc_position'],
         'ecc_map': details['ecc_map'],
         'raise_factor': raise_factor,
         'wallet_address': bismuth_wallet.my_wallet_address(),
@@ -387,8 +396,8 @@ def change_current_customer_contract(customer_idurl, details):
         }
     if details.get('ecc_map'):
         current_contract['ecc_map'] = details['ecc_map']
-    if details.get('my_position') is not None:
-        current_contract['my_position'] = details['my_position']
+    if details.get('ecc_position') is not None:
+        current_contract['ecc_position'] = details['ecc_position']
     if details['allocated_bytes'] != current_contract['allocated_bytes']:
         current_value = current_contract['value']
         new_duration_hours = int(current_value/(details['allocated_bytes']/(1024.0*1024.0*1024.0)))
diff --git a/bitdust/system/bpio.py b/bitdust/system/bpio.py
index 1ef37b4..c1a901e 100644
--- a/bitdust/system/bpio.py
+++ b/bitdust/system/bpio.py
@@ -831,7 +831,7 @@ def pathIsDir(localpath):
     if Linux():
         try:
             import stat
-            st = os.path.stat(localpath)
+            st = os.path.stat(localpath)  # @UndefinedVariable
             return stat.S_ISDIR(st.st_mode)
         except:
             return False
diff --git a/bitdust/userid/id_server.py b/bitdust/userid/id_server.py
index a78e7d5..ad996df 100644
--- a/bitdust/userid/id_server.py
+++ b/bitdust/userid/id_server.py
@@ -37,6 +37,14 @@
 #------------------------------------------------------------------------------
 
 from __future__ import absolute_import
+
+#------------------------------------------------------------------------------
+
+_Debug = False
+_DebugLevel = 14
+
+#------------------------------------------------------------------------------
+
 from io import BytesIO
 
 #------------------------------------------------------------------------------
@@ -56,6 +64,7 @@
 if __name__ == '__main__':
     import os.path as _p
     sys.path.insert(0, _p.abspath(_p.join(_p.dirname(_p.abspath(sys.argv[0])), '..')))
+    sys.path.insert(0, _p.abspath(_p.join(_p.dirname(_p.abspath(sys.argv[0])), '..', '..')))
 
 #------------------------------------------------------------------------------
 
@@ -71,6 +80,8 @@
 from bitdust.lib import misc
 from bitdust.lib import net_misc
 
+from bitdust.interface import web_html_template
+
 from bitdust.main import settings
 
 from bitdust.userid import identity
@@ -93,9 +104,9 @@ def A(event=None, *args, **kwargs):
         _IdServer = IdServer(
             name='id_server',
             state='AT_STARTUP',
-            debug_level=2,
-            log_events=True,
-            log_transitions=True,
+            debug_level=_DebugLevel,
+            log_events=_Debug,
+            log_transitions=_Debug,
         )
     if event is None:
         return _IdServer
@@ -103,10 +114,12 @@ def A(event=None, *args, **kwargs):
 
 
 class IdServer(automat.Automat):
+
     """
     This class implements all the functionality of the ``id_server()`` state
     machine.
     """
+
     def init(self):
         """
         Method to initialize additional variables and flags at creation of the
@@ -176,41 +189,50 @@ def doSetUp(self, *args, **kwargs):
             self.hostname = strng.to_bin(misc.readExternalIP())
         if self.hostname == '':
             self.hostname = net_misc.getLocalIp()
-        lg.out(4, 'id_server.doSetUp hostname=%s' % strng.to_text(self.hostname))
+        if _Debug:
+            lg.out(_DebugLevel, 'id_server.doSetUp hostname=%s' % strng.to_text(self.hostname))
         if not os.path.isdir(settings.IdentityServerDir()):
             os.makedirs(settings.IdentityServerDir())
-            lg.out(4, '            created a folder %s' % settings.IdentityServerDir())
+            if _Debug:
+                lg.out(_DebugLevel, '            created a folder %s' % settings.IdentityServerDir())
         root = WebRoot()
         root.putChild(b'', WebMainPage())
         try:
             self.tcp_listener = reactor.listenTCP(self.tcp_port, IdServerFactory())  # @UndefinedVariable
-            lg.out(4, '            identity server listen on TCP port %d started' % (self.tcp_port))
+            if _Debug:
+                lg.out(_DebugLevel, '            identity server listen on TCP port %d started' % (self.tcp_port))
         except:
-            lg.out(4, 'id_server.set_up ERROR exception trying to listen on port ' + str(self.tcp_port))
+            if _Debug:
+                lg.out(_DebugLevel, 'id_server.set_up ERROR exception trying to listen on port ' + str(self.tcp_port))
             lg.exc()
         try:
             self.web_listener = reactor.listenTCP(self.web_port, server.Site(root))  # @UndefinedVariable
-            lg.out(4, '            have started web server at port %d   hostname=%s' % (self.web_port, strng.to_text(self.hostname)))
+            if _Debug:
+                lg.out(_DebugLevel, '            have started web server at port %d   hostname=%s' % (self.web_port, strng.to_text(self.hostname)))
         except:
-            lg.out(4, 'id_server.set_up ERROR exception trying to listen on port ' + str(self.web_port))
+            if _Debug:
+                lg.out(_DebugLevel, 'id_server.set_up ERROR exception trying to listen on port ' + str(self.web_port))
             lg.exc()
 
     def doSetDown(self, *args, **kwargs):
         """
         Action method.
         """
-        lg.out(4, 'id_server.doSetDown')
+        if _Debug:
+            lg.out(_DebugLevel, 'id_server.doSetDown')
         shutlist = []
         if self.web_listener:
             d = self.web_listener.stopListening()
             if d:
                 shutlist.append(d)
-            lg.out(4, '            stopped web listener')
+            if _Debug:
+                lg.out(_DebugLevel, '            stopped web listener')
         if self.tcp_listener:
             d = self.tcp_listener.stopListening()
             if d:
                 shutlist.append(d)
-            lg.out(4, '            stopped TCP listener')
+            if _Debug:
+                lg.out(_DebugLevel, '            stopped TCP listener')
         self.web_listener = None
         self.tcp_listener = None
         DeferredList(shutlist).addBoth(lambda x: self.automat('server-down'))
@@ -234,7 +256,8 @@ def doDestroyMe(self, *args, **kwargs):
     def _save_identity(self, inputfilename):
         """
         """
-        lg.out(6, 'id_server._save_identity ' + inputfilename)
+        if _Debug:
+            lg.out(_DebugLevel, 'id_server._save_identity ' + inputfilename)
         if os.path.getsize(inputfilename) > 50000:
             lg.warn('input file too big - ignoring')
             tmpfile.erase('idsrv', inputfilename, 'input file too big')
@@ -265,7 +288,8 @@ def _save_identity(self, inputfilename):
         for idurl_bin in newidentity.getSources(as_originals=True):
             protocol, host, port, filename = nameurl.UrlParse(idurl_bin)
             if strng.to_text(host) == strng.to_text(self.hostname):
-                lg.out(4, 'id_server._save_identity found match for us')
+                if _Debug:
+                    lg.out(_DebugLevel, 'id_server._save_identity found match for us')
                 matchid = idurl_bin
                 break
         if not matchid:
@@ -291,7 +315,8 @@ def _save_identity(self, inputfilename):
         oldxml = ''
         # need to make sure id was not already used by different key - which would mean someone is trying to steal identity
         if os.path.exists(localfilename):
-            lg.out(6, 'id_server._save_identity was already an identity with this name ' + localfilename)
+            if _Debug:
+                lg.out(_DebugLevel, 'id_server._save_identity was already an identity with this name ' + localfilename)
             oldxml = bpio.ReadTextFile(localfilename)
             oldidentity = identity.identity(xmlsrc=oldxml)
             if oldidentity.publickey != newidentity.publickey:
@@ -299,7 +324,8 @@ def _save_identity(self, inputfilename):
                 return
         if newxml != oldxml:
             if not os.path.exists(localfilename):
-                lg.out(6, 'id_server._save_identity will save NEW Identity: ' + filename)
+                if _Debug:
+                    lg.out(_DebugLevel, 'id_server._save_identity will save NEW Identity: ' + filename)
             bpio.WriteTextFile(localfilename, newxml)
 
 
@@ -307,6 +333,7 @@ def _save_identity(self, inputfilename):
 
 
 class IdServerProtocol(basic.Int32StringReceiver):
+
     def __init__(self):
         self.fpath = None  # string with path/filename
         self.fin = None  # integer file descriptor like os.open() returns
@@ -377,6 +404,7 @@ def connectionLost(self, reason):
 
 
 class IdServerFactory(ServerFactory):
+
     def buildProtocol(self, addr):
         p = IdServerProtocol()
         p.factory = self
@@ -387,6 +415,7 @@ def buildProtocol(self, addr):
 
 
 class WebMainPage(resource.Resource):
+
     def render_POST(self, request):
         inp = BytesIO(request.content.read())
         fin, fpath = tmpfile.make('idsrv', extension='.xml')
@@ -398,23 +427,18 @@ def render_POST(self, request):
         return ''
 
     def render_GET(self, request):
-        src = '''<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-<title>Identities on %(hostname)s</title>
-<style>
-body{margin: 0 auto; padding: 0;}
-#content {margin: 0 auto; padding: 0; text-align: justify; line-height: 1.7;
-min-height: 500px; width: 960px; font-size: 18px; text-decoration: none;
-font-family: "Tw Cen MT", "Century Gothic", Futura, Arial, sans-serif;}
-</style>
-</head>
-<body>
-<div id="content">
-<h1 align=center>Identities on %(hostname)s</h1>
-''' % {
-            'hostname': strng.to_text(A().hostname),
-        }
+        src = ''
+
+        src += '<div id="ui-id-servers" class="section bg-light">\n'
+        src += '<div class="container">\n'
+        src += '<div class="ui-card">\n'
+        src += '<div class="card-body">\n'
+
+        src += '<div class="row justify-content-center">\n'
+        src += '<h1 align=center>Identities on %s</h1>' % strng.to_text(A().hostname)
+        src += '</div><br>\n'
+
+        src += '<div class="row">\n'
         src += '<table cellspacing=0 width=100% border=0><tr valign=top>\n'
         src += '<td width=152px nowrap>\n'
         HTDOCS_DIR = settings.IdentityServerDir()
@@ -440,8 +464,9 @@ def render_GET(self, request):
             url = '/' + filename
             name = filename[:-4]
             src += '<p><a href="%s"><nobr>%s</nobr></a></p>\n' % (strng.to_text(url), strng.to_text(name))
-        src += '</td>\n</tr>\n</table>\n</td>\n</tr>\n<tr><td align=left>'
+        src += '</td>\n</tr>\n</table>\n'
         src += '<br><br><p>Total identities on "%s": %d</p><br><br>\n' % (strng.to_text(A().hostname), len(files))
+        del files
         src += '<p>Other known identity servers:\n'
         for idhost in sorted(known_servers.by_host().keys()):
             idport = known_servers.by_host()[idhost][0]
@@ -450,15 +475,32 @@ def render_GET(self, request):
             src += '<a href="http://%s/"><nobr>%s</nobr></a>&nbsp;&nbsp;\n' % (strng.to_text(idhost), strng.to_text(idhost))
         src += '</p>'
         src += '<!--CLIENT_HOST=%s:%s-->\n' % (request.client.host, request.client.port)
-        src += '</body>\n</html>'
-        del files
-        return strng.to_bin(src)
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+
+        html_src = web_html_template.WEB_ROOT_TEMPLATE % dict(
+            title='Identities on %s' % strng.to_text(A().hostname),
+            site_url='https://bitdust.io',
+            basepath='https://identities.bitdust.io/',
+            wikipath='https://bitdust.io/wiki/',
+            idserverspath='https://identities.bitdust.io/',
+            blockchainpath='https://blockchain.bitdust.io/',
+            div_main_class='main idservers',
+            div_main_body=src,
+            google_analytics='',
+            pre_footer='',
+        )
+        return strng.to_bin(html_src)
 
 
 #------------------------------------------------------------------------------
 
 
 class WebRoot(resource.Resource):
+
     def getChild(self, path, request):
         if not path:
             return self
@@ -481,27 +523,103 @@ def getChild(self, path, request):
 #------------------------------------------------------------------------------
 
 
+class KnownIDServersWebRoot(resource.Resource):
+
+    def getChild(self, path, request):
+        if not path:
+            return self
+        return resource.NoResource('Not found')
+
+
+class KnownIDServersWebMainPage(resource.Resource):
+
+    def render_GET(self, request):
+        src = ''
+        src += '<div id="ui-blockchain-explorer" class="section bg-light">\n'
+        src += '<div class="container">\n'
+        src += '<div class="ui-card">\n'
+        src += '<div class="card-body">\n'
+
+        src += '<div class="row justify-content-center">\n'
+        src += '<h1 align=center>BitDust identity servers</h1>\n'
+        src += '</div><br>\n'
+
+        src += '<div class="row">\n'
+        for idhost in sorted(known_servers.by_host().keys()):
+            idport = known_servers.by_host()[idhost][0]
+            if idport != 80:
+                idhost += ':%d' % idport
+            src += '<div class="col-4">\n'
+            src += '<div class="ui-card ui-action-card ui-accordion shadow-sm" data-target="http://%s/">\n' % strng.to_text(idhost)
+            src += '<div class="card-body">\n'
+            src += '<h5 align=center><a class="card-link" href="http://%s/">%s</a></h5>\n' % (strng.to_text(idhost), strng.to_text(idhost))
+            src += '</div>\n'
+            src += '</div>\n'
+            src += '</div>\n'
+        src += '</div>\n'
+
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+        src += '</div>\n'
+
+        html_src = web_html_template.WEB_ROOT_TEMPLATE % dict(
+            title='BitDust identity servers',
+            site_url='https://bitdust.io',
+            basepath='https://identities.bitdust.io/',
+            wikipath='https://bitdust.io/wiki/',
+            idserverspath='https://identities.bitdust.io/',
+            blockchainpath='https://blockchain.bitdust.io/',
+            div_main_class='main idservers',
+            div_main_body=src,
+            google_analytics='',
+            pre_footer=web_html_template.pre_footer % dict(basepath='https://identities.bitdust.io/'),
+        )
+        return strng.to_bin(html_src)
+
+
+def render_known_id_servers(web_port):
+    root = KnownIDServersWebRoot()
+    root.putChild(b'', KnownIDServersWebMainPage())
+    reactor.listenTCP(web_port, server.Site(root))  # @UndefinedVariable
+
+
+#------------------------------------------------------------------------------
+
+
 def main():
     bpio.init()
     settings.init()
+    lg.set_debug_level(_DebugLevel)
+
+    serve_known_id_servers = False
     if len(sys.argv) > 1:
-        web_port = int(sys.argv[1])
+        if sys.argv[1].strip() == 'known_id_servers':
+            serve_known_id_servers = True
+            web_port = settings.getIdServerWebPort()
+        else:
+            web_port = int(sys.argv[1])
     else:
         web_port = settings.getIdServerWebPort()
     if len(sys.argv) > 2:
         tcp_port = int(sys.argv[2])
     else:
         tcp_port = settings.getIdServerTCPPort()
-    lg.set_debug_level(20)
-    lg.out(2, 'starting ID server ...')
-    reactor.addSystemEventTrigger(  # @UndefinedVariable
-        'before',
-        'shutdown',
-        A().automat,
-        'shutdown',
-    )
-    reactor.callWhenRunning(A, 'init', (web_port, tcp_port))  # @UndefinedVariable
-    reactor.callLater(0, A, 'start')  # @UndefinedVariable
+
+    if serve_known_id_servers:
+        web_port = int(sys.argv[2])
+        lg.out(2, 'serving known ID servers web_port=%d' % web_port)
+        reactor.callWhenRunning(render_known_id_servers, web_port)  # @UndefinedVariable
+
+    else:
+        lg.out(2, 'starting ID server web_port=%d tcp_port=%d' % (
+            web_port,
+            tcp_port,
+        ))
+        reactor.addSystemEventTrigger('before', 'shutdown', A().automat, 'shutdown')  # @UndefinedVariable
+        reactor.callWhenRunning(A, 'init', (web_port, tcp_port))  # @UndefinedVariable
+        reactor.callLater(0, A, 'start')  # @UndefinedVariable
+
     reactor.run()  # @UndefinedVariable
     settings.shutdown()
     lg.out(2, 'reactor stopped, EXIT')
diff --git a/bitdust/userid/id_url.py b/bitdust/userid/id_url.py
index 075b0f0..833094c 100644
--- a/bitdust/userid/id_url.py
+++ b/bitdust/userid/id_url.py
@@ -741,7 +741,7 @@ def idurl_to_id(idurl_text, by_parts=False):
 class ID_URL_FIELD(object):
     """
     A class represents a valid, verified and synced IDURL identifier of a device.
-    The IDURL is always corresponds to your own identity file.
+    The IDURL is always corresponding to the identity file.
 
     When your identity file is updated due to rotation to another identity server,
     the "host" component of your IDURL is changed:
@@ -903,7 +903,7 @@ def __hash__(self):
     def __repr__(self):
         if _Debug:
             lg.args(_DebugLevel*2, latest_as_string=self.latest_as_string)
-        return '[%s%s]' % ('' if self.is_latest() else '*', self.latest_as_string)
+        return '{%s%s}' % ('' if self.is_latest() else '*', self.latest_as_string)
 
     def __str__(self):
         if _Debug:
@@ -944,7 +944,7 @@ def refresh(self, replace_original=True):
             caller_modul = os.path.basename(caller_code.co_filename).replace('.py', '')
             if caller_method.count('lambda') or caller_method == 'field':
                 caller_method = sys._getframe(1).f_back.f_code.co_name
-            exc = ValueError('tried to modify username of the identity %r -> %r' % (self.current, self.latest))
+            exc = ValueError('while refreshing tried to modify username of the identity %r -> %r' % (self.current, self.latest))
             lg.exc(msg='called from %s.%s()' % (caller_modul, caller_method), exc_value=exc)
             raise exc
         self.latest_host = latest_host
diff --git a/bitdust_forks/Bismuth/apihandler.py b/bitdust_forks/Bismuth/apihandler.py
index decfdbc..39feaee 100644
--- a/bitdust_forks/Bismuth/apihandler.py
+++ b/bitdust_forks/Bismuth/apihandler.py
@@ -703,7 +703,7 @@ def api_gettransaction(self, socket_handler, db_handler, peers):
             if self.config.old_sqlite:
                 db_handler.execute_param(db_handler.h, 'SELECT * FROM transactions WHERE signature like ?1', (transaction_id + '%', ))
             else:
-                db_handler.execute_param(db_handler.h, 'SELECT * FROM transactions WHERE substr(signature,1,4)=substr(?1,1,4) and  signature like ?1', (transaction_id + '%', ))
+                db_handler.execute_param(db_handler.h, 'SELECT * FROM transactions WHERE substr(signature,1,4)=substr(?1,1,4) and signature like ?1', (transaction_id + '%', ))
             raw = db_handler.h.fetchone()
             if not format:
                 connections.send(socket_handler, raw)
diff --git a/bitdust_forks/Bismuth/dbhandler.py b/bitdust_forks/Bismuth/dbhandler.py
index c04da05..8c7ca3c 100644
--- a/bitdust_forks/Bismuth/dbhandler.py
+++ b/bitdust_forks/Bismuth/dbhandler.py
@@ -166,7 +166,7 @@ def txsearch(self, address=None, recipient=None, operation=None, openfield=None,
         sql += ' AND '.join(queries)
         sql += ' LIMIT ?, ?;'
         try:
-            print('DB:txsearch', sql, params)
+            # print('DB:txsearch', sql, params)
             self.execute_param(self.h, sql, tuple(params))
             result = self.h.fetchall()
         except:
diff --git a/bitdust_forks/Bismuth/worker.py b/bitdust_forks/Bismuth/worker.py
index 9fac411..33932c1 100644
--- a/bitdust_forks/Bismuth/worker.py
+++ b/bitdust_forks/Bismuth/worker.py
@@ -27,11 +27,11 @@ def sendsync(sdef, peer_ip, status, node):
     """
     # TODO: ERROR, does **not** save anything. code or comment wrong.
     node.logger.app_log.debug(f'Outbound: Synchronization with {peer_ip} finished after: {status}, sending new sync request')
-    time.sleep(Decimal(node.pause))
+    time.sleep(int(node.pause))
     while node.db_lock.locked():
         if node.IS_STOPPING:
             return
-        time.sleep(Decimal(node.pause))
+        time.sleep(int(node.pause))
     send(sdef, 'sendsync')
 
 
@@ -332,6 +332,8 @@ def worker(host, port, node):
             fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1]
             print(exc_type, fname, exc_tb.tb_lineno)
             """
+            import traceback
+            traceback.print_exc()
 
             # remove from active pool
             node.peers.remove_client(this_client)
diff --git a/requirements-testing.txt b/requirements-testing.txt
index 451b8c9..9fe4e5d 100644
--- a/requirements-testing.txt
+++ b/requirements-testing.txt
@@ -1,2 +1,3 @@
 coverage
 mock
+pre_commit
diff --git a/tests/test_id_url.py b/tests/test_id_url.py
index 951853a..fc39a64 100644
--- a/tests/test_id_url.py
+++ b/tests/test_id_url.py
@@ -280,9 +280,9 @@ def test_identity_cached(self):
         self._cache_identity('bob')
         self.assertTrue(id_url.field(alice_text) != id_url.field(bob))
         self.assertEqual(str(id_url.field(alice_text)), 'http://127.0.0.1:8084/alice.xml')
-        self.assertEqual(repr(id_url.field(alice_text)), '[http://127.0.0.1:8084/alice.xml]')
+        self.assertEqual(repr(id_url.field(alice_text)), '{http://127.0.0.1:8084/alice.xml}')
         self.assertEqual('=%s=' % id_url.field(alice_text), '=http://127.0.0.1:8084/alice.xml=')
-        self.assertEqual('=%r=' % id_url.field(alice_text), '=[http://127.0.0.1:8084/alice.xml]=')
+        self.assertEqual('=%r=' % id_url.field(alice_text), '={http://127.0.0.1:8084/alice.xml}=')
 
     def test_identity_not_cached(self):
         self._cache_identity('alice')
@@ -601,15 +601,15 @@ def test_fake_name(self):
 
     def test_latest_vs_original(self):
         idurl_hans_not_cached = id_url.field(hans1)
-        self.assertEqual('=%r=' % idurl_hans_not_cached, '=[http://first.com/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans_not_cached, '={http://first.com/hans.xml}=')
         self._cache_identity('hans1')
         idurl_hans_cached = id_url.field(hans1)
-        self.assertEqual('=%r=' % idurl_hans_cached, '=[http://first.com/hans.xml]=')
-        self.assertEqual('=%r=' % id_url.field(hans1), '=[http://first.com/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans_cached, '={http://first.com/hans.xml}=')
+        self.assertEqual('=%r=' % id_url.field(hans1), '={http://first.com/hans.xml}=')
         self._cache_identity('hans2')
-        self.assertEqual('=%r=' % id_url.field(hans1), '=[*http://second.net/hans.xml]=')
+        self.assertEqual('=%r=' % id_url.field(hans1), '={*http://second.net/hans.xml}=')
         self._cache_identity('hans3')
-        self.assertEqual('=%r=' % id_url.field(hans1), '=[*http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % id_url.field(hans1), '={*http://third.org/hans.xml}=')
         self.assertEqual(id_url.field(hans1), id_url.field(hans2))
         self.assertNotEqual(id_url.field(hans1).original(), id_url.field(hans2).original())
         self.assertEqual(id_url.field(hans1), id_url.field(hans3))
@@ -620,21 +620,21 @@ def test_latest_vs_original(self):
         self.assertEqual(id_url.field(hans2).to_text(), hans3)
         self.assertEqual(id_url.field(hans3).to_text(), hans3)
         idurl_hans1 = id_url.field(hans1)
-        self.assertEqual('=%r=' % idurl_hans1, '=[*http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans1, '={*http://third.org/hans.xml}=')
         self.assertFalse(idurl_hans1.refresh())
-        self.assertEqual('=%r=' % idurl_hans1, '=[*http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans1, '={*http://third.org/hans.xml}=')
         idurl_hans2 = id_url.field(hans2)
-        self.assertEqual('=%r=' % idurl_hans2, '=[*http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans2, '={*http://third.org/hans.xml}=')
         self.assertFalse(idurl_hans2.refresh())
-        self.assertEqual('=%r=' % idurl_hans2, '=[*http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans2, '={*http://third.org/hans.xml}=')
         idurl_hans3 = id_url.field(hans3)
-        self.assertEqual('=%r=' % idurl_hans3, '=[http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans3, '={http://third.org/hans.xml}=')
         self.assertFalse(idurl_hans3.refresh())
-        self.assertEqual('=%r=' % idurl_hans3, '=[http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans3, '={http://third.org/hans.xml}=')
         self.assertTrue(idurl_hans_not_cached.refresh())
-        self.assertEqual('=%r=' % idurl_hans_not_cached, '=[http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans_not_cached, '={http://third.org/hans.xml}=')
         self.assertTrue(idurl_hans_cached.refresh())
-        self.assertEqual('=%r=' % idurl_hans_cached, '=[http://third.org/hans.xml]=')
+        self.assertEqual('=%r=' % idurl_hans_cached, '={http://third.org/hans.xml}=')
 
     def test_latest_revision_order_123(self):
         self._cache_identity('hans1')