Merge branch 'master' into stable

Author: mac-arrap

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.9.3
+* Changed FEES transaction to only allow a single change address.
+* Changed CI/CD to new stable branch.
+* CD added to the new stable branch with new stable release process
+* Source code is now public Sovrin repository
+* bugfixes
+
 ## 0.9.2
 * Changed from using LevelDB to RocksDB
 * Changed transactions to use JSON objects rather than unlabeled arrays

devops/aws-codebuild/Jenkinsfile.cd

@@ -1,6 +1,6 @@
 #!groovy
 
-def evLibrary = library(identifier: 'evernym-aws-codebuild@aws-codebuild', retriever: modernSCM(
+def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.8.0-aws-codebuild', retriever: modernSCM(
     github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared')
 )).com.evernym.pipeline
 
@@ -10,6 +10,9 @@ logger.setGlobalLevel('TRACE')
 
 pipelineWrapper({
 
+    //put code build containers inside a vpc under our dev account
+    env.USE_VPC_CONFIG = true
+
     nodeWrapper {
         def osname = 'xenial'
         List projects = ['sovtoken', 'sovtokenfees']
@@ -111,7 +114,9 @@ pipelineWrapper({
                     }
                 }
 
-                stage('Upload deb to repositories') {
+
+                stage('Upload debs to repos') {
+                  
                     String debName
 
                     dir("${awsCBHelper.buildCtx.projects[prTag].artifactsDir}") {
@@ -123,10 +128,11 @@ pipelineWrapper({
                             packagePath = debName
                         }
 
-                        if (env.BRANCH_NAME == 'stable') {
+	                if (env.BRANCH_NAME == 'stable') {
                             logger.info("Uploading debian package '$debName' to sovrin repo")
                             SovrinRepo.upload {
-                                repoDistr = 'sdk'
+                                repoDistr = 'deb'
+
                                 packagePath = debName
                             }
                         }

devops/aws-codebuild/Jenkinsfile.ci

@@ -1,6 +1,6 @@
 #!groovy
 
-def evLibrary = library(identifier: 'evernym-aws-codebuild@aws-codebuild', retriever: modernSCM(
+def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.8.0-aws-codebuild', retriever: modernSCM(
     github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared')
 )).com.evernym.pipeline
 
@@ -15,6 +15,9 @@ pipelineWrapper({
         List projects = ['sovtoken', 'sovtokenfees']
         List goals = ['test']
 
+        //put code build containers inside a vpc under our dev account
+        env.USE_VPC_CONFIG = true
+
         stage('Checkout from SCM') {
             checkout scm
         }

devops/build-scripts/xenial/Pool_Party/Dockerfile

@@ -57,8 +57,8 @@ ARG indy_crypto_ver=0.4.3
 ARG indy_plenum_ver=1.6.51
 
 
-ARG sovtoken_pkg_name=sovtoken_0.9.2_amd64.deb
-ARG sovtokenfees_pkg_name=sovtokenfees_0.9.2_amd64.deb
+ARG sovtoken_pkg_name=sovtoken_0.9.3_amd64.deb
+ARG sovtokenfees_pkg_name=sovtokenfees_0.9.3_amd64.deb
 
 COPY ${sovtoken_pkg_name} /root
 COPY ${sovtokenfees_pkg_name} /root
@@ -67,11 +67,11 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88
 RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sources.list
 
 RUN apt-get update -y && apt-get install -y \
-	indy-plenum=${indy_plenum_ver} \        
-        indy-node=${indy_node_ver} \
-        indy-anoncreds=${indy_anoncreds_ver} \
-        python3-indy-crypto=${python3_indy_crypto_ver} \
-        libindy-crypto=${indy_crypto_ver} \
+	indy-plenum>=${indy_plenum_ver} \
+        indy-node>=${indy_node_ver} \
+        indy-anoncreds>=${indy_anoncreds_ver} \
+        python3-indy-crypto>=${python3_indy_crypto_ver} \
+        libindy-crypto>=${indy_crypto_ver} \
         vim sudo
 
 RUN dpkg -i /root/${sovtoken_pkg_name}

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.5']
+tests_require = ['pytest', 'pytest-xdist', 'mock', 'python3-indy>=1.6.5']
 
 setup(
     name=metadata['__title__'],
@@ -37,13 +37,8 @@
         '': ['*.txt', '*.md', '*.rst', '*.json', '*.conf', '*.html',
              '*.css', '*.ico', '*.png', 'LICENSE', 'LEGAL', 'sovtoken']},
     include_package_data=True,
-    # TODO change to 'indy-plenum' with proper version
-    # once sovtoken starts using indy-plenum from stable
-    #
-    # '>=' 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.51'],
+
+    install_requires=['indy-plenum>=1.6.51'],
     setup_requires=['pytest-runner'],
     extras_require={
         'test': tests_require,

sovtoken/sovtoken/__metadata__.py

@@ -4,7 +4,7 @@
 
 # TODO: Update the field values below where needed
 __title__ = 'sovtoken'
-__version_info__ = (0, 9, 2)
+__version_info__ = (0, 9, 3)
 __version__ = '.'.join(map(str, __version_info__))
 __description__ = 'Token Plugin For Indy Plenum'
 __long_description__ = ''

sovtokenfees/sovtokenfees/__metadata__.py

@@ -9,7 +9,7 @@
 __maintainer__ = 'Evernym'
 __title__ = 'sovtokenfees'
 __url__ = 'https://github.com/evernym/plugin/tree/master/sovtokenfees'
-__version_info__ = (0, 9, 2)
+__version_info__ = (0, 9, 3)
 __version__ = '.'.join(map(str, __version_info__))
 
 __all__ = ['__title__',