Merge pull request #144 from KitHat/master

Pushed plenum version to align the latest indy-node version

Author: mac-arrap

Makefile

@@ -14,8 +14,8 @@ test_fees:
 start:
 	docker-sync-stack start
 deps: 
-	docker exec -u 0 -ti ${dirname:=_token_1} /bin/bash -c 'sed s/msgpack==0.4.6-1build1/python-msgpack==0.4.6/ /usr/local/lib/python3.5/dist-packages/indy_plenum-1.6.50-py3.5.egg-info/requires.txt > /usr/local/lib/python3.5/dist-packages/indy_plenum-1.6.50-py3.5.egg-info/requires.txt'
-	docker exec -u 0 -ti ${dirname:=_token_1} /bin/bash -c 'sed s/ujson==1.33-1build1/ujson==1.33/ /usr/local/lib/python3.5/dist-packages/indy_plenum-1.6.50-py3.5.egg-info/requires.txt > /usr/local/lib/python3.5/dist-packages/indy_plenum-1.6.50-py3.5.egg-info/requires.txt '
+	docker exec -u 0 -ti ${dirname:=_token_1} /bin/bash -c 'sed s/msgpack==0.4.6-1build1/python-msgpack==0.4.6/ /usr/local/lib/python3.5/dist-packages/indy_plenum-1.6.51-py3.5.egg-info/requires.txt > /usr/local/lib/python3.5/dist-packages/indy_plenum-1.6.51-py3.5.egg-info/requires.txt'
+	docker exec -u 0 -ti ${dirname:=_token_1} /bin/bash -c 'sed s/ujson==1.33-1build1/ujson==1.33/ /usr/local/lib/python3.5/dist-packages/indy_plenum-1.6.51-py3.5.egg-info/requires.txt > /usr/local/lib/python3.5/dist-packages/indy_plenum-1.6.51-py3.5.egg-info/requires.txt '
 clean:
 	docker-sync-stack clean
 

devops/Makefile

@@ -52,7 +52,7 @@ ifeq ($(SRC_DIR_NAME),sovtoken)
 # remove that once sovtoken starts using indy-plenum from stable:
 # 	pypi: indy-plenum
 # 	apt: indy-plenum (stable component)
-FPM_P_DEPENDS := indy-plenum(=1.6.50)
+FPM_P_DEPENDS := indy-plenum(=1.6.51)
 FPM_ARGS := --no-python-dependencies $(FPM_ARGS)
 endif
 

devops/build-scripts/xenial/Pool_Party/Dockerfile

@@ -51,10 +51,10 @@ RUN useradd -m -d /home/indy -s /bin/bash -p $(openssl passwd -1 "token") -u $ui
 ARG indy_stream=stable
 
 ARG indy_anoncreds_ver=1.0.11
-ARG indy_node_ver=1.6.71
-ARG python3_indy_crypto_ver=0.4.1
-ARG indy_crypto_ver=0.4.0
-ARG indy_plenum_ver=1.6.50
+ARG indy_node_ver=1.6.73
+ARG python3_indy_crypto_ver=0.4.3
+ARG indy_crypto_ver=0.4.3
+ARG indy_plenum_ver=1.6.51
 
 
 ARG sovtoken_pkg_name=sovtoken_0.9.2_amd64.deb

devops/denv/Dockerfile

@@ -39,8 +39,8 @@ RUN apt-get update -y && apt-get install -y \
         libsnappy-dev \
     # libindy 
         python3-nacl \
-        libindy-crypto=0.4.1 \
-        libindy=1.6.1
+        libindy-crypto=0.4.3 \
+        libindy=1.6.5
         #//python3-indy-crypto
 
 RUN pip3 install -U \
@@ -49,21 +49,21 @@ RUN pip3 install -U \
     setuptools \
     pytest \
     pytest-xdist \
-    python3-indy==1.6.1 \
+    python3-indy==1.6.5 \
     mock
 
 RUN useradd -m -d /home/indy -s /bin/bash -p $(openssl passwd -1 "token") -u 1000 indy; usermod -aG sudo indy
 
 WORKDIR /home/indy
 
 # indy-node along with supervisor
-ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.6.71}
-ARG indy_plenum_ver=1.6.50
+ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.6.73}
+ARG indy_plenum_ver=1.6.51
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
 RUN echo "deb https://repo.sovrin.org/deb xenial stable" >> /etc/apt/sources.list \
     && apt-get update && apt-get install -y \
 	    supervisor \
-        python3-indy-crypto=0.4.1 \
+        python3-indy-crypto=0.4.3 \
         indy-plenum=${indy_plenum_ver} \
         indy-node=${INDY_NODE_VERSION} \
     && rm -rf /var/lib/apt/lists/*

devops/docker/ci/xenial/Dockerfile

@@ -24,8 +24,8 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \
 # TODO: I DO REALLY THINK THAT THIS SHOULD BE CHANGED
 RUN add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial stable" \
     && apt-get update && apt-get install -y \
-        libindy-crypto=0.4.1 \
-        libindy=1.6.1 \
+        libindy-crypto=0.4.3 \
+        libindy=1.6.5 \
     && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /etc/indy && echo "ENABLED_PLUGINS = ['sovtoken', 'sovtokenfees']" > /etc/indy/indy_config.py \
@@ -43,4 +43,4 @@ RUN if [ "$u_id" != "0" ]; then \
 USER $u_id
 
 # TODO CMD ENTRYPOINT ...
-ENV CI_ENV_VERSION=0.7.0
+ENV CI_ENV_VERSION=0.8.0

devops/vagrant/desktop/scripts/setup.sh

@@ -47,8 +47,8 @@ sudo apt-get update -y && apt-get install -y \
 echo ${CYAN}libindy
 sudo apt-get update -y && apt-get install -y \
         python3-nacl \
-        libindy-crypto=0.4.1 \
-        libindy=1.6.1
+        libindy-crypto=0.4.3 \
+        libindy=1.6.5
 
 echo ${CYAN}python
 sudo pip3 install -U \
@@ -57,16 +57,16 @@ sudo pip3 install -U \
     setuptools \
     pytest \
     pytest-xdist \
-    python3-indy==1.6.1 \
+    python3-indy==1.6.5 \
     mock
 
 echo ${CYAN}plenum
 echo "deb https://repo.sovrin.org/deb xenial stable" >> /etc/apt/sources.list \
 sudo apt-get update && apt-get install -y \
          supervisor \
-         python3-indy-crypto=0.4.1 \
-         indy-plenum=1.6.50 \
-         indy-node=1.6.71 \
+         python3-indy-crypto=0.4.3 \
+         indy-plenum=1.6.51 \
+         indy-node=1.6.73 \
      && rm -rf /var/lib/apt/lists/*
 
 

sovtoken/setup.py

@@ -19,7 +19,7 @@
 with open(os.path.join(here, 'sovtoken', '__metadata__.py'), 'r') as f:
     exec(f.read(), metadata)
 
-tests_require = ['pytest', 'pytest-xdist', 'mock', 'python3-indy==1.6.1']
+tests_require = ['pytest', 'pytest-xdist', 'mock', 'python3-indy==1.6.5']
 
 setup(
     name=metadata['__title__'],
@@ -43,7 +43,7 @@
     # '>=' here seems makes sense since usually indy-plenum is
     # installed as indy-node's dependency and might be with greater
     # version (just to not update each time new indy-node is released)
-    install_requires=['indy-plenum==1.6.50'],
+    install_requires=['indy-plenum==1.6.51'],
     setup_requires=['pytest-runner'],
     extras_require={
         'test': tests_require,

sovtokenfees/setup.py

@@ -18,7 +18,7 @@
 with open(os.path.join(here, 'sovtokenfees', '__metadata__.py'), 'r') as f:
     exec(f.read(), metadata)
 
-tests_require = ['pytest', 'pytest-xdist', 'python3-indy==1.6.1']
+tests_require = ['pytest', 'pytest-xdist', 'python3-indy==1.6.5']
 
 setup(
 

sovtokenfees/sovtokenfees/test/three_phase_commit_helper.py

@@ -150,7 +150,7 @@ def create_pre_prepare():
             # reqIdr
             ['B8fV7naUqLATYocqu7yZ8WM9BJDuS24bqbJNvBRsoGg3'],
             # discarded
-            1,
+            "",
             # digest
             'ccb7388bc43a1e4669a23863c2b8c43efa183dde25909541b06c0f5196ac4f3b',
             # ledger id
@@ -159,6 +159,10 @@ def create_pre_prepare():
             '5BU5Rc3sRtTJB6tVprGiTSqiRaa9o6ei11MjH4Vu16ms',
             # txn root
             'EdxDR8GUeMXGMGtQ6u7pmrUgKfc2XdunZE79Z9REEHg6',
+            # sub_seq_no
+            0,
+            # final
+            True
         ]
 
         return PrePrepare(*pre_prepare_args)
@@ -200,11 +204,13 @@ def from_request(req, three_phase_handler):
             replica.lastPrePrepareSeqNo + 1,
             get_utc_epoch(),
             [req.digest],
-            1,
+            "",
             req.digest,
             CONFIG_LEDGER_ID,
             replica.stateRootHash(TOKEN_LEDGER_ID),
             replica.txnRootHash(TOKEN_LEDGER_ID),
+            0,
+            True
         ]
         return PrePrepare(*args)
 
@@ -236,7 +242,8 @@ def create_ordered(pp):
         ord_args = [
             pp.instId,
             pp.viewNo,
-            pp.reqIdr[:pp.discarded],
+            pp.reqIdr,
+            [],
             pp.ppSeqNo,
             pp.ppTime,
             pp.ledgerId,