New Anoncreds API with revocation support

examples/simple_client.py

@@ -13,6 +13,7 @@
 
 from plenum.common.looper import Looper
 from plenum.common.signer_simple import SimpleSigner
+
 from sovrin.client.client import Client
 from sovrin.common.txn import TXN_TYPE, NYM
 

examples/simple_node.py

@@ -14,6 +14,7 @@
 from tempfile import TemporaryDirectory
 
 from plenum.common.looper import Looper
+
 from sovrin.server.node import Node
 
 

post-setup.py

@@ -1,4 +1,6 @@
-from sovrin.common.setup_util import Setup
 import os
+
+from sovrin.common.setup_util import Setup
+
 BASE_DIR = os.path.join(os.path.expanduser("~"), ".sovrin")
 Setup(BASE_DIR).setupAll()

sample/acme-job-application.sovrin

@@ -15,7 +15,8 @@
         "degree": "string",
         "status": "string",
         "ssn": "string"
-    }
+    },
+    "verifiableAttributes": ["degree", "status", "ssn"]
   }],
   "sig": "oeGeMdt5HRjRsbaXybGpRmkkijhHrGT82syxofEJQbkjTCLW63tM3jMn1boaf62vCSEEDyTaVJZnrpfDXAHtLZ9"
 }

sample/thrift-loan-application.sovrin

@@ -11,15 +11,17 @@
       "attributes": {
             "salary_bracket": "string",
             "employee_status": "string"
-       }
+       },
+       "verifiableAttributes": ["salary_bracket", "employee_status"]
     }, {
       "name": "Loan-Application-KYC",
       "version": "0.1",
       "attributes": {
             "first_name": "string",
             "last_name": "string",
             "ssn": "string"
-      }
+      },
+      "verifiableAttributes": ["first_name", "last_name", "ssn"]
     }],
   "sig": "D1vU5fbtJbqWKdCoVJgqHBLLhh5CYspikuEXdnBVVyCnLHiYC9ZsZrDWpz3GkFFGvfC4RQ4kuB64vUFLo3F7Xk6"
 }

scripts/add_new_node.py → scripts/add_new_node

@@ -1,5 +1,8 @@
+#! /usr/bin/env python3
+
 from plenum.common.looper import Looper
 from plenum.common.signer_simple import SimpleSigner
+
 from sovrin.client.client import Client
 from sovrin.common.config_util import getConfig
 

scripts/change_node_ha

@@ -7,6 +7,7 @@ from plenum.common.types import HA
 from plenum.common.util import getMaxFailures
 from plenum.test.eventually import eventually
 from plenum.test.helper import checkSufficientRepliesRecvd
+
 from sovrin.common.config_util import getConfig
 
 

scripts/gen_load_ratcheting

@@ -4,12 +4,12 @@
 import sys
 
 from jsonpickle import json
-
 from ledger.stores.text_file_store import TextFileStore
 from plenum.common.looper import Looper
 from plenum.common.signer_simple import SimpleSigner
 from plenum.common.txn import TARGET_NYM, TXN_TYPE, NYM, ROLE, USER, NEW_NODE, DATA, ALIAS, CLIENT_IP, CLIENT_PORT
 from plenum.common.types import HA, CLIENT_STACK_SUFFIX
+
 from sovrin.client.client import Client
 from sovrin.common.config_util import getConfig
 

scripts/generate_sovrin_pool_transactions

@@ -1,10 +1,9 @@
 #! /usr/bin/env python3
 
-import os
-from sovrin.common.txn import getTxnOrderedFields
-
 from plenum.common.test_network_setup import TestNetworkSetup
+
 from sovrin.common.config_util import getConfig
+from sovrin.common.txn import getTxnOrderedFields
 
 config = getConfig()
 keepDir = config.baseDir

scripts/init_sovrin_raet_keep

@@ -1,7 +1,6 @@
 #! /usr/bin/env python3
 
 import argparse
-import os
 import os.path
 
 from plenum.common.raet import initLocalKeep

scripts/sovrin

@@ -16,9 +16,10 @@ $ sovrin "new nodes all"
 # Do not remove this import
 import plenum.cli.ensure_logging_not_setup
 
+import logging
 import os
 import sys
-import logging
+
 logging.root.handlers = []
 logger = logging.getLogger()
 logger.propagate = False
@@ -44,12 +45,15 @@ def run_cli():
 
     commands = sys.argv[1:]
 
+    withNode = True if '--with-node' in commands else True
+
     with Looper(debug=False) as looper:
         curDir = os.getcwd()
         logFilePath = os.path.join(curDir, config.logFilePath)
         cli = SovrinCli(looper=looper,
                         basedirpath=baseDir,
-                        logFileName=logFilePath
+                        logFileName=logFilePath,
+                        withNode=withNode
                         )
 
         looper.run(cli.shell(*commands))

scripts/start_sovrin_node

@@ -3,13 +3,11 @@
 import os
 import sys
 
-from plenum.common.types import HA
-
-
-from plenum.common.raet import initRemoteKeep
 from ioflo.aid.consoling import Console
 from plenum.common.log import setupLogging, TRACE_LOG_LEVEL, \
     getRAETLogLevelFromConfig
+from plenum.common.types import HA
+
 from sovrin.common.config_util import getConfig
 
 config = getConfig()

setup-dev.py

@@ -1,14 +1,14 @@
 import glob
+import os
 import shutil
 import sys
-import os
-from setuptools import setup, find_packages, __version__
-from pip.req import parse_requirements
 from shutil import copyfile
+
+from setuptools import setup, find_packages, __version__
+
 import data
 import sample
 
-
 v = sys.version_info
 if sys.version_info < (3, 5):
     msg = "FAIL: Requires Python 3.5 or later, " \
@@ -62,7 +62,11 @@
              '*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', '*.sovrin']},
     include_package_data=True,
     data_files=[(
-        (BASE_DIR, ['data/pool_transactions_sandbox', ])
+        (BASE_DIR, ['data/pool_transactions_sandbox',
+                    'data/pool_transactions_local',
+                    'data/transactions_sandbox',
+                    'data/transactions_local',
+                    ])
     )],
     install_requires=['base58', 'pyorient', 'plenum-dev', 'ledger-dev',
                       'semver', 'anoncreds-dev'],

setup.py

@@ -1,17 +1,10 @@
-import glob
-import shutil
-import sys
 import os
+import subprocess
+import sys
 
-import data
 from setuptools import setup, find_packages, __version__
-from setuptools.command.install import install
 from setuptools.command.develop import develop
-from pip.req import parse_requirements
-from shutil import copyfile
-import subprocess
-
-import sample
+from setuptools.command.install import install
 
 v = sys.version_info
 if sys.version_info < (3, 5):
@@ -51,14 +44,14 @@ def post_install():
 
 
 class PostInstall(install):
-    def run(self):
-        install.run(self)
+    def do_egg_install(self):
+        install.do_egg_install(self)
         post_install()
 
 
 class PostInstallDev(develop):
-    def run(self):
-        develop.run(self)
+    def do_egg_install(self):
+        develop.do_egg_install(self)
         post_install()
 
 
@@ -79,7 +72,11 @@ def run(self):
              '*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', '*.sovrin']},
     include_package_data=True,
     data_files=[(
-        (BASE_DIR, ['data/pool_transactions_sandbox', ])
+        (BASE_DIR, ['data/pool_transactions_sandbox',
+                    'data/pool_transactions_local',
+                    'data/transactions_sandbox',
+                    'data/transactions_local',
+                    ])
     )],
     install_requires=['base58', 'pyorient', 'plenum', 'ledger', 'semver',
                       'anoncreds'],

sovrin/__init__.py

@@ -1,8 +1,9 @@
 import os
 
-import sovrin
 from plenum.common.pkg_util import check_deps
 
+import sovrin
+
 check_deps(sovrin)
 
 from sovrin.common.plugin_helper import writeAnonCredPlugin

sovrin/__metadata__.py

@@ -1,7 +1,7 @@
 """
 Sovrin package metadata
 """
-__version_info__ = (0, 1, 140)
+__version_info__ = (0, 1, 141)
 __version__ = '{}.{}.{}'.format(*__version_info__)
 __author__ = "Evernym, Inc."
 __license__ = "Apache 2.0"