Merge remote-tracking branch 'origin/master' into file-struct

Author: Dmitry Surnin

build-scripts/ubuntu-1604/build-3rd-parties.sh

@@ -38,40 +38,6 @@ function build_from_pypi {
     rm ${PREREM_TMP}
 }
 
-function build_indy_crypto {
-    PACKAGE_NAME=$1
-
-    if [ -z $2 ]; then
-        PACKAGE_VERSION=""
-    else
-        PACKAGE_VERSION="==$2"
-    fi
-    POSTINST_TMP=postinst-${PACKAGE_NAME}
-    PREREM_TMP=prerm-${PACKAGE_NAME}
-    cp postinst ${POSTINST_TMP}
-    cp prerm ${PREREM_TMP}
-    sed -i 's/{package_name}/'${PACKAGE_NAME}'/' ${POSTINST_TMP}
-    sed -i 's/{package_name}/'${PACKAGE_NAME}'/' ${PREREM_TMP}
-
-    fpm --input-type "python" \
-        --output-type "deb" \
-        --architecture "amd64" \
-        --verbose \
-        --python-bin "/usr/bin/python3" \
-        --exclude "*.pyc" \
-        --exclude "*.pyo" \
-        --maintainer "Hyperledger <[email protected]>" \
-        --after-install ${POSTINST_TMP} \
-        --before-remove ${PREREM_TMP} \
-        --package ${OUTPUT_PATH} \
-        --depends libindy-crypto \
-        --name ${PACKAGE_NAME} \
-        ${PACKAGE_NAME}${PACKAGE_VERSION}
-
-    rm ${POSTINST_TMP}
-    rm ${PREREM_TMP}
-}
-
 build_from_pypi ioflo 1.5.4
 build_from_pypi orderedset 2.0
 build_from_pypi base58 0.2.4
@@ -83,4 +49,3 @@ build_from_pypi pyzmq 16.0.2
 build_from_pypi intervaltree 2.1.0
 build_from_pypi portalocker 0.5.7
 build_from_pypi sortedcontainers 1.5.7
-build_indy_crypto python3-indy-crypto 0.1.2

ci/ubuntu.dockerfile

@@ -20,15 +20,13 @@ RUN pip3 install -U \
 	virtualenv
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
 RUN echo "deb https://repo.sovrin.org/deb xenial master" >> /etc/apt/sources.list
-RUN apt-get update -y && apt-get install -y libindy-crypto
+RUN apt-get update -y && apt-get install -y libindy-crypto=0.1.6
 RUN useradd -ms /bin/bash -u $uid $user
 USER $user
 RUN virtualenv -p python3.5 /home/$user/test
 USER root
 RUN ln -sf /home/$user/test/bin/python /usr/local/bin/python
 RUN ln -sf /home/$user/test/bin/pip /usr/local/bin/pip
-RUN wget https://repo.evernym.com/libindy_crypto/ubuntu/stable/0.1.2/libindy-crypto_0.1.2_amd64.deb
-RUN dpkg -i ./libindy-crypto_0.1.2_amd64.deb
 USER $user
 # TODO: Automate dependency collection
 RUN pip install jsonpickle \
@@ -52,6 +50,5 @@ RUN pip install jsonpickle \
 	ioflo==1.5.4 \
 	psutil \
 	intervaltree \
-	pytest-xdist \
-	python3-indy-crypto==0.1.2
+	pytest-xdist
 WORKDIR /home/$user

crypto/bls/indy_crypto/bls_crypto_indy_crypto.py

@@ -8,7 +8,7 @@
 class BlsGroupParamsLoaderIndyCrypto(BlsGroupParamsLoader):
     def load_group_params(self) -> GroupParams:
         group_name = 'generator'
-        g = "7BRrJUcxuAomyoBC7YkvRD9TpFrcGoYAT9BQhhxuNB4FFjNPffimLywJViQRJAPnP97PQxCHTiEBTu6KuYV7trC4Ez3eRz7QSnKUwd5KqG9PxQaFaNaJyFv8uAXQgm3Q7nkEqjjKrCKdWmj89ZmAG848Ucn2v6bqhNmShEH9ARQqxhozXbmBy68oa6eh1vxs3DYenGgeWnjCCueBbR7vrMB9ATJBpCuPg25KWXjyh6KqnLsZfcRdst4NzuAmS8NzBPSvW6"
+        g = "3LHpUjiyFC2q2hD7MnwwNmVXiuaFbQx2XkAFJWzswCjgN1utjsCeLzHsKk1nJvFEaS4fcrUmVAkdhtPCYbrVyATZcmzwJReTcJqwqBCPTmTQ9uWPwz6rEncKb2pYYYFcdHa8N17HzVyTqKfgPi4X9pMetfT3A5xCHq54R2pDNYWVLDX"
         return GroupParams(group_name, g)
 
 

crypto/test/bls/indy_crypto/test_bls_crypto_indy_crypto.py

@@ -85,6 +85,23 @@ def test_generate_keys_bytes_seed_32bit(default_params):
     assert sk != pk
 
 
+def test_generate_keys_str_seed_32bit_for_nodes(default_params):
+    seeds = []
+    nodes_count = 4
+    for i in range(1, nodes_count + 1):
+        name = "Node" + str(i)
+        seed = ('0' * (32 - len(name)) + name)
+        seeds.append(seed)
+
+    pks = set()
+    for i in range(nodes_count):
+        sk, pk = BlsCryptoIndyCrypto.generate_keys(default_params, seeds[i])
+        pks.add(pk)
+        print(pk)
+
+    assert len(pks) == nodes_count
+
+
 def test_generate_different_keys(default_params):
     seed2 = 'Seed' + '0' * (48 - len('Seed'))
     seed3 = 'seeeed' + '0' * (48 - len('seeeed'))

setup.py

@@ -71,7 +71,7 @@
                       'ioflo==1.5.4', 'semver', 'base58', 'orderedset',
                       'sortedcontainers==1.5.7', 'psutil', 'pip',
                       'portalocker==0.5.7', 'pyzmq', 'raet',
-                      'psutil', 'intervaltree', 'msgpack-python==0.4.6', 'python3-indy-crypto==0.1.2'],
+                      'psutil', 'intervaltree', 'msgpack-python==0.4.6', 'indy-crypto==0.1.6'],
     extras_require={
         'stats': ['python-firebase'],
         'benchmark': ['pympler']