Merge pull request #131 from OpenSTFoundation/release-1.0

merging v1.0.8 to master

.travis.yml

@@ -5,6 +5,8 @@ branches:
   only:
   - master
   - develop
+  - release-1.0
+  - pre-release-v1.0.8
 notifications:
   email:
     recipients:
@@ -13,6 +15,47 @@ notifications:
     on_failure: always
 node_js:
   - "8"
+env:
+  - GETH_VERSION=1.7.2
+matrix:
+  include:
+    - if: branch =~ ^master
+      env: GETH_VERSION=1.7.2
+      node_js: "8"
+    - if: branch =~ ^master
+      env: GETH_VERSION=1.8.3
+      node_js: "8"
+    - if: branch =~ ^master
+      env: GETH_VERSION=1.8.8
+      node_js: "8"
+    - if: branch =~ ^develop
+      env: GETH_VERSION=1.7.2
+      node_js: "8"
+    - if: branch =~ ^develop
+      env: GETH_VERSION=1.8.3
+      node_js: "8"
+    - if: branch =~ ^develop
+      env: GETH_VERSION=1.8.8
+      node_js: "8"
+    - if: branch =~ ^master
+      env: GETH_VERSION=1.7.2
+      node_js: "9"
+    - if: branch =~ ^master
+      env: GETH_VERSION=1.8.3
+      node_js: "9"
+    - if: branch =~ ^master
+      env: GETH_VERSION=1.8.8
+      node_js: "9"
+    - if: branch =~ ^develop
+      env: GETH_VERSION=1.7.2
+      node_js: "9"
+    - if: branch =~ ^develop
+      env: GETH_VERSION=1.8.3
+      node_js: "9"
+    - if: branch =~ ^develop
+      env: GETH_VERSION=1.8.8
+      node_js: "9"
+
 services:
   - mysql
 before_install:
@@ -23,20 +66,29 @@ before_install:
   - sudo apt-get install software-properties-common
   - sudo add-apt-repository -y ppa:ethereum/ethereum
   - sudo apt-get update
-  - sudo bash mocha_test/scripts/install_geth_1_8_3.sh
-  - sudo apt-get install solc
+  - sudo bash mocha_test/scripts/install_geth_$GETH_VERSION.sh
   - geth version
+  - sudo apt-get install solc
 install: 
   - npm install 
 before_script:
   - mkdir -p ~/.ethash
   - geth makedag 0 ~/.ethash
   - nohup sh tools/runTestRpc.sh </dev/null >/dev/null 2>&1 &
   - bash contracts/compile.sh
-script:  
+  - mkdir -p dynamodb
+  - wget https://s3.ap-south-1.amazonaws.com/dynamodb-local-mumbai/dynamodb_local_latest.zip -O ./dynamodb/dynamodb_local_latest.zip
+  - unzip ./dynamodb/dynamodb_local_latest.zip
+  - nohup java -Djava.library.path=./dynamodb/DynamoDBLocal_lib -jar DynamoDBLocal.jar -sharedDb &
+  - sleep 30
+  - . ./mocha_test/scripts/set_env_vars.sh
+  - node tools/dynamo_db_init.js
+script:
   - truffle test  
   - cd mocha_test/scripts/  
   - bash travis_test.sh  
 after_script:
   - kill $(ps aux | grep 'testrpc' | awk '{print $2}')
   - kill $(ps aux | grep 'geth' | awk '{print $2}')
+  - kill $(ps aux | grep 'DynamoDBLocal.jar' | awk '{print $2}')
+  - rm -rf dynamodb

CHANGELOG.md

@@ -1,4 +1,17 @@
-## OpenST-Payments v1.0.5 (17 May 2018)
+## OpenST-Payments v1.0.8 
+#####OpenST-storage and dynamoDB integration for token balances ([openst-payments#124](https://github.com/OpenSTFoundation/openst-payments/issues/124))
+DynamoDB integration for token balance - Now the balances (settled and unsettled debits) are being stored in DynamoDB.
+Openst-Storage takes care of implementing the model class for DynamoDB tables and is integrated in OpenST-Payments in this release.
+Cache for token balances is now responsibility of the OpenST-Storage module and is removed from OpenST-Payments module.
+
+## OpenST-Payments v1.0.7 (23 May 2018)
+
+Changelog:
+
+- Airdrop contract gas limit is increased because of contract changes.
+- Reason is added in logs when transaction fails.
+
+## OpenST-Payments v1.0.6 (17 May 2018)
 
 Changelog:
 

README.md

@@ -13,6 +13,15 @@ While OpenST 0.9 is available as-is for anyone to use, we caution that this is e
 npm install @openstfoundation/openst-payments --save
 ```
 
+# Init DynamoDB
+Following commands need to be run once, only for the first time. DynamoDB initial migrations for shard management are 
+run in it and one shard is created and registered for storing token balance.
+
+```bash
+. ./mocha_test/scripts/set_env_vars.sh
+node tools/dynamo_db_init.js
+```
+
 # Run Test Chain
 
 ```bash

VERSION

@@ -1 +1 @@
-1.0.5
+1.0.8

config/autoscaling.js

@@ -0,0 +1,25 @@
+"use strict";
+
+const rootPrefix = '..'
+;
+
+// Dynamo DB connection config details
+var autoScalingConfig = {
+  'apiVersion': process.env.OS_AUTOSCALING_API_VERSION,
+  'accessKeyId': process.env.OS_AUTOSCALING_ACCESS_KEY_ID,
+  'secretAccessKey': process.env.OS_AUTOSCALING_SECRET_ACCESS_KEY,
+  'region': process.env.OS_AUTOSCALING_REGION,
+  'endpoint': process.env.OS_AUTOSCALING_ENDPOINT
+}
+
+if (process.env.OS_AUTOSCALING_SSL_ENABLED == 1) {
+  autoScalingConfig['sslEnabled'] = true;
+} else {
+  autoScalingConfig['sslEnabled'] = false;
+}
+
+if (process.env.OS_AUTOSCALING_LOGGING_ENABLED == 1) {
+  autoScalingConfig['logger'] = console;
+}
+
+module.exports = autoScalingConfig;

config/core_constants.js

@@ -28,7 +28,11 @@ define("MYSQL_USER", process.env.OP_MYSQL_USER);
 define("MYSQL_PASSWORD", process.env.OP_MYSQL_PASSWORD);
 define("MYSQL_DATABASE", process.env.OP_MYSQL_DATABASE);
 define("MYSQL_CONNECTION_POOL_SIZE", process.env.OP_MYSQL_CONNECTION_POOL_SIZE);
+define("STANDALONE_MODE", process.env.OST_STANDALONE_MODE);
 
 
 //Debug level
 define('DEBUG_ENABLED', process.env.OST_DEBUG_ENABLED || false);
+
+//Environment
+define("RUNNING_TESTS_IN", process.env.RUNNING_TESTS_IN);

config/dynamoDB.js

@@ -0,0 +1,22 @@
+"use strict";
+
+// Dynamo DB connection config details
+const ddbConnectionConfig = {
+  'apiVersion': process.env.OS_DYNAMODB_API_VERSION,
+  'accessKeyId': process.env.OS_DYNAMODB_ACCESS_KEY_ID,
+  'secretAccessKey': process.env.OS_DYNAMODB_SECRET_ACCESS_KEY,
+  'region': process.env.OS_DYNAMODB_REGION,
+  'endpoint': process.env.OS_DYNAMODB_ENDPOINT
+};
+
+if (process.env.OS_DYNAMODB_SSL_ENABLED == 1) {
+  ddbConnectionConfig['sslEnabled'] = true;
+} else {
+  ddbConnectionConfig['sslEnabled'] = false;
+}
+
+if (process.env.OS_DYNAMODB_LOGGING_ENABLED == 1) {
+  ddbConnectionConfig['logger'] = console;
+}
+
+module.exports = ddbConnectionConfig;