Merge branch 'master' of github.com:kyuupichan/electrumx

README.rst

@@ -133,6 +133,14 @@ Roadmap
 ChangeLog
 =========
 
+Version 1.0.15
+--------------
+
+- split server networks faster if a fork is detected
+- minor speedup
+- add Vertcoin support (erasmospunk)
+- update Faircoin (thokon00)
+
 Version 1.0.14
 --------------
 

lib/coins.py

@@ -819,7 +819,7 @@ class Blackcoin(Coin):
         if version > 6:
             return super().header_hash(header)
         else:
-            return cls.HEADER_HASH(header);
+            return cls.HEADER_HASH(header)
 
 
 class Peercoin(Coin):
@@ -877,3 +877,22 @@ class Vertcoin(Coin):
     TX_PER_BLOCK = 3
     RPC_PORT = 5888
     REORG_LIMIT = 1000
+
+
+class Monacoin(Coin):
+    NAME = "Monacoin"
+    SHORTNAME = "MONA"
+    NET = "mainnet"
+    XPUB_VERBYTES = bytes.fromhex("0488B21E")
+    XPRV_VERBYTES = bytes.fromhex("0488ADE4")
+    P2PKH_VERBYTE = bytes.fromhex("32")
+    P2SH_VERBYTES = [bytes.fromhex("37"), bytes.fromhex("05")]
+    WIF_BYTE = bytes.fromhex("B2")
+    GENESIS_HASH = ('ff9f1c0116d19de7c9963845e129f9ed'
+                    '1bfc0b376eb54fd7afa42e0d418c8bb6')
+    DESERIALIZER = DeserializerSegWit
+    TX_COUNT = 2568580
+    TX_COUNT_HEIGHT = 1029766
+    TX_PER_BLOCK = 2
+    RPC_PORT = 9402
+    REORG_LIMIT = 1000

query.py

@@ -56,7 +56,6 @@ def main():
         print('Address: ', addr)
         hashX = coin.address_to_hashX(addr)
 
-        n = None
         for n, (tx_hash, height) in enumerate(bp.get_history(hashX, limit)):
             print('History #{:d}: hash: {} height: {:d}'
                   .format(n + 1, hash_to_str(tx_hash), height))

server/controller.py

@@ -198,7 +198,7 @@ class Controller(util.LoggedClass):
     async def main_loop(self):
         '''Controller main loop.'''
         if self.env.rpc_port is not None:
-            await self.start_server('RPC', 'localhost', self.env.rpc_port)
+            await self.start_server('RPC', None, self.env.rpc_port)
         self.ensure_future(self.bp.main_loop())
         self.ensure_future(self.wait_for_bp_catchup())
 

server/db.py

@@ -571,7 +571,7 @@ class DB(util.LoggedClass):
         if nrows > 4:
             self.log_info('hashX {} is large: {:,d} entries across {:,d} rows'
                           .format(hash_to_str(hashX), len(full_hist) // 4,
-                                  nrows));
+                                  nrows))
 
         # Find what history needs to be written, and what keys need to
         # be deleted.  Start by assuming all keys are to be deleted,
@@ -660,7 +660,6 @@ class DB(util.LoggedClass):
         limit = 50 * 1000 * 1000
 
         while self.comp_cursor != -1:
-            locked = self.semaphore.locked
             if self.semaphore.locked:
                 self.log_info('compact_history: waiting on semaphore...')
             with await self.semaphore:

server/version.py

@@ -1,5 +1,5 @@
 # Server name and protocol versions
 
-VERSION = 'ElectrumX 1.0.14'
+VERSION = 'ElectrumX 1.0.15'
 PROTOCOL_MIN = '1.0'
 PROTOCOL_MAX = '1.0'