Merge branch 'master' into master

Jenkinsfile

@@ -9,6 +9,9 @@ def testUbuntu = {
         echo 'Ubuntu Test: Checkout csm'
         checkout scm
 
+        helpers.shell('cp setup-charm.sh ci/setup-charm.sh')
+        helpers.shell('sed -ir s/sudo// ci/setup-charm.sh')
+
         echo 'Ubuntu Test: Build docker image'
         def testEnv = dockerHelpers.build(name)
 

README.md

@@ -6,6 +6,21 @@ IBM Research (see https://idemix.wordpress.com/ and
 http://www.research.ibm.com/labs/zurich/idemix/). We have built some additional
 features for revocation.
 
+Anonymous credential technology is used to exchange claims and proofs,
+increasing trust between parties in a [self-sovereign identity ecosystem](https://sovrin.org).
+These claims and proofs are not recorded on a distributed ledger like the one provided
+by Indy--but they rely on public keys, accumulators, and revocation registries published
+on the ledger, and they dramatically increase privacy for participants. Hence their
+inclusion with the Indy family of projects.
+
+This particular codebase will soon be superseded by an implentation that is easier to
+call (has cleaner interfaces) in [Indy SDK](https://github.com/hyperledger/indy-sdk).
+Both implementations use the same underlying primitives, and implement the same
+algorithms.
+
+If you want to log bugs or examine the backlog for anoncreds, we recommend that you use
+[Hyperledger's Jira](https://jira.hyperledger.org) and use the INDY-SDK project.
+
 Anonymous Credentials requires a cryptographic framework. We have tested it with charm-crypto.
 ## Installation on Linux
 

anoncreds/__metadata__.py

@@ -1,7 +1,7 @@
 """
 Package metadata
 """
-__version_info__ = (0, 3)
+__version_info__ = (0, 4)
 __version__ = '.'.join(map(str, __version_info__))
 __author__ = "Evernym, Inc."
 __license__ = "Apache 2.0"

anoncreds/protocol/wallet/wallet.py

@@ -12,6 +12,10 @@ def __init__(self, schemaId, repo: PublicRepo):
         self.walletId = schemaId
         self._repo = repo
 
+    @property
+    def name(self):
+        return self.walletId
+
     # GET
 
     @abstractmethod

anoncreds/test/test_base_wallet.py

@@ -0,0 +1,8 @@
+from anoncreds.protocol.wallet.wallet import Wallet
+
+
+def test_wallet_name(publicRepo):
+    walletName = "test-wallet-name-1"
+    wallet = Wallet(walletName, publicRepo)
+    assert wallet.name == walletName
+    assert wallet.walletId == wallet.name

ci/ubuntu.dockerfile

@@ -13,21 +13,20 @@ RUN apt-get install -y \
 	python-setuptools \
 	python3-nacl \
 	apt-transport-https \
-	ca-certificates 
+	ca-certificates \
+	zip \
+	unzip
 RUN pip3 install -U \ 
 	pip \ 
 	setuptools \
 	virtualenv
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys EAA542E8
 RUN echo "deb https://repo.evernym.com/deb xenial master" >> /etc/apt/sources.list
-RUN apt-get update -y
-RUN apt-get install -y \ 
-	python3-charm-crypto
+ADD setup-charm.sh setup-charm.sh
+RUN bash setup-charm.sh
 RUN useradd -ms /bin/bash -u $uid sovrin
 USER sovrin
 RUN virtualenv -p python3.5 /home/sovrin/test
-RUN cp -r /usr/local/lib/python3.5/dist-packages/Charm_Crypto-0.0.0.egg-info /home/sovrin/test/lib/python3.5/site-packages/Charm_Crypto-0.0.0.egg-info
-RUN cp -r /usr/local/lib/python3.5/dist-packages/charm /home/sovrin/test/lib/python3.5/site-packages/charm
 USER root
 RUN ln -sf /home/sovrin/test/bin/python /usr/local/bin/python
 RUN ln -sf /home/sovrin/test/bin/pip /usr/local/bin/pip