Merge pull request #732 from CounterpartyXCP/hotfix

HOTFIX: Check maximum quantity also for invalid `send`

ChangeLog.md

@@ -1,4 +1,6 @@
 ## Client Versions ##
+* v9.50.0 (2014-03-18)
+	* hotfix: global integer overflow
 * v9.49.4 (2014-02-05)
 	* reconceived this package as a libary
 	* moved CLI to new repository: `counterparty-cli`

counterpartylib/lib/check.py

@@ -128,11 +128,11 @@ def software_version():
     logger.debug('Checking version.')
 
     try:
-        host = 'https://counterpartyxcp.github.io/counterparty-lib/protocol_changes.json'
+        host = 'https://counterpartyxcp.github.io/counterparty-lib/counterpartylib/protocol_changes.json'
         response = requests.get(host, headers={'cache-control': 'no-cache'})
         # TODO: Temporary
         if response.status_code != 200:
-            host = 'https://counterpartyxcp.github.io/counterpartyd/protocol_changes.json'  # Old Location
+            host = 'https://counterpartyxcp.github.io/counterpartyd/counterpartylib/protocol_changes.json'  # Old Location
             response = requests.get(host, headers={'cache-control': 'no-cache'})
         versions = json.loads(response.text)
     except (requests.exceptions.ConnectionError, ConnectionRefusedError, ValueError):

counterpartylib/lib/config.py

@@ -6,8 +6,8 @@
 
 # Versions
 VERSION_MAJOR = 9
-VERSION_MINOR = 49
-VERSION_REVISION = 4
+VERSION_MINOR = 50
+VERSION_REVISION = 0
 VERSION_STRING = str(VERSION_MAJOR) + '.' + str(VERSION_MINOR) + '.' + str(VERSION_REVISION)
 
 

counterpartylib/lib/messages/versions/send1.py

@@ -97,9 +97,11 @@ def parse (db, tx, message):
         elif balances[0]['quantity'] < quantity:
             quantity = min(balances[0]['quantity'], quantity)
 
-    if status == 'valid':
-        # For SQLite3
+    # For SQLite3
+    if quantity:
         quantity = min(quantity, config.MAX_INT)
+
+    if status == 'valid':
         problems = validate(db, tx['source'], tx['destination'], asset, quantity, tx['block_index'])
         if problems: status = 'invalid: ' + '; '.join(problems)
 

counterpartylib/protocol_changes.json

@@ -34,5 +34,12 @@
 			"minimum_version_minor": 49,
 			"minimum_version_revision": 0,
 			"block_index": 334000
+		},
+	"hotfix_integer_overflow":      {
+			"minimum_version_major": 9,
+			"minimum_version_minor": 50,
+			"minimum_version_revision": 0,
+			"block_index": 0
 		}
+
 }

setup.py

@@ -8,7 +8,9 @@
 import sys
 import shutil
 
-CURRENT_VERSION = '9.49.4'
+from counterpartylib.lib import config
+
+CURRENT_VERSION = config.VERSION_STRING
 
 # NOTE: Why we don’t use the the PyPi package:
 # <https://code.google.com/p/apsw/source/detail?r=358a9623d051>
@@ -98,7 +100,6 @@ def finalize_options(self):
 
     def run(self):
         import appdirs
-        from counterpartylib.lib import config
 
         old_data_dir = appdirs.user_config_dir(appauthor='Counterparty', appname='counterpartyd', roaming=True)
         old_database = os.path.join(old_data_dir, 'counterpartyd.9.db')