Merge pull request #583 from hyperledger/rc-55

Rc 1.3.55

indy_node/server/upgrader.py

@@ -258,8 +258,8 @@ def isScheduleValid(self, schedule, node_srvs, force) -> (bool, str):
         Validates schedule of planned node upgrades
 
         :param schedule: dictionary of node ids and upgrade times
-        :param nodeSrvs: dictionary of node ids and services
-        :return: whether schedule valid
+        :param node_srvs: dictionary of node ids and services
+        :return: a 2-tuple of whether schedule valid or not and the reason
         """
 
         # flag "force=True" ignore basic checks! only datetime format is

indy_node/test/upgrade/test_node_schedules_upgrade_after_pool_ledger_update.py

@@ -0,0 +1,21 @@
+import pytest
+
+from plenum.test.bls.helper import change_bls_key, check_bls_key
+from plenum.test.conftest import pool_txn_stewards_data, stewards_and_wallets
+
+
+@pytest.fixture(scope="module")
+def update_bls_keys(looper, tconf, nodeSet, stewards_and_wallets):
+    node = nodeSet[0]
+    steward_client, steward_wallet = stewards_and_wallets[0]
+    new_blspk = change_bls_key(looper, nodeSet, node,
+                               steward_client, steward_wallet)
+
+    check_bls_key(new_blspk, node, nodeSet)
+
+
+def test_node_schedules_upgrade_after_bls_keys_update(update_bls_keys,
+                                                      upgradeScheduled):
+    # Upgrade should work even after an update to the pool ledger with a
+    # transaction that does not contain `SERVICES` field
+    pass

setup.py

@@ -56,7 +56,7 @@
     data_files=[(
         (BASE_DIR, ['data/nssm_original.exe'])
     )],
-    install_requires=['indy-plenum==1.2.33',
+    install_requires=['indy-plenum==1.2.34',
                       'indy-anoncreds==1.0.11',
                       'python-dateutil',
                       'timeout-decorator'],