Merge branch 'sprint' into 'master'

Sprint to Master

Closes OP-134, OP-44, OP-133, OP-90, and OP-105

See merge request open-platform/api!146

Author: evgeny-krylov

.gitlab-ci.yml

@@ -11,13 +11,13 @@ stages:
   - certificates
 
 variables:
-    DOCKER_DRIVER: overlay2
-    IMAGE_NAME: openplatform/api
+  DOCKER_DRIVER: overlay2
+  IMAGE_NAME: openplatform/api
 
 
-###########################
-# Building
-###########################
+###########################/
+# Tests
+###########################/
 unit-tests:
   stage: test
   image: openjdk:8-jdk
@@ -31,6 +31,7 @@ unit-tests:
     NETWORK_URL: $NETWORK_URL_DEV
     ETHEREUM_PRIVATE_KEY: $ETHEREUM_PRIVATE_KEY_DEV
     OPEN_TOKEN_ADDRESS: $OPEN_TOKEN_ADDRESS_DEV
+    EVENT_SUBSCRIPTION: "false"
   services:
     - name: postgres
       alias: $POSTGRES_HOST
@@ -55,7 +56,19 @@ unit-tests:
   except:
     - schedules
 
+contract-tests:
+  services:
+    - name: openplatform/ganache
+      alias: ganache
+  image: openplatform/truffle
+  script:
+    - export RPC_HOST="ganache"
+    - cd src/test/truffle && truffle test
+
 
+###########################
+# Building
+###########################
 build-jar:
   stage: build
   image: openjdk:8-jdk
@@ -76,6 +89,7 @@ build-jar:
   only:
     - master
     - sprint
+    - tags
   except:
     - schedules
 
@@ -93,6 +107,7 @@ package-docker:
   only:
     - sprint
     - master
+    - tags
   except:
     - schedules
 
@@ -133,6 +148,7 @@ package-docker:
                  -e "NETWORK_URL=${NETWORK_URL}" \
                  -e "ETHEREUM_PRIVATE_KEY=${ETHEREUM_PRIVATE_KEY}" \
                  -e "OPEN_TOKEN_ADDRESS=${OPEN_TOKEN_ADDRESS}" \
+                 -e "EVENT_SUBSCRIPTION=${EVENT_SUBSCRIPTION}" \
                  ${IMAGE_NAME}:${IMAGE_TAG}
     "
 
@@ -153,6 +169,7 @@ deploy-development:
     NETWORK_URL: $NETWORK_URL_DEV
     ETHEREUM_PRIVATE_KEY: $ETHEREUM_PRIVATE_KEY_DEV
     OPEN_TOKEN_ADDRESS: $OPEN_TOKEN_ADDRESS_DEV
+    EVENT_SUBSCRIPTION: "true"
     IMAGE_TAG: sprint
   before_script: *prepare_key
   script: *deploy_to_host
@@ -181,6 +198,7 @@ deploy-production:
     NETWORK_URL: $NETWORK_URL_PROD
     ETHEREUM_PRIVATE_KEY: $ETHEREUM_PRIVATE_KEY_PROD
     OPEN_TOKEN_ADDRESS: $OPEN_TOKEN_ADDRESS_PROD
+    EVENT_SUBSCRIPTION: "true"
     IMAGE_TAG: latest
   before_script: *prepare_key
   script: *deploy_to_host

frontend/.editorconfig

@@ -0,0 +1,10 @@
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.{js,css,html}]
+indent_style = space
+indent_size = 2

frontend/.vscode/settings.json

@@ -0,0 +1,7 @@
+{
+  "emmet.includeLanguages": {
+    "javascript": "javascriptreact",
+    "vue-html": "html",
+    "plaintext": "jade"
+}
+}