[OP-15] contracts and dapp restructure (#85)

app/.editorconfig → .editorconfig

@@ -1,17 +1,17 @@
 root = true
 
 [*]
+charset = utf-8
 end_of_line = lf
 insert_final_newline = true
-
-[src/**.{css,js,jsx,ts,tsx}]
-charset = utf-8
 trim_trailing_whitespace = true
 indent_style = space
+
+[src/**.{css,js,jsx,ts,tsx}]
 indent_size = 2
 
-[package.json]
-charset = utf-8
-trim_trailing_whitespace = true
-indent_style = space
+[*.json]
 indent_size = 2
+
+[*.sol]
+indent_size = 4

.gitignore

@@ -26,6 +26,7 @@ test-results/
 node_modules
 build
 app/src/contracts
+src/chain/abis
 .DS_Store
 .idea
 
@@ -63,6 +64,8 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+.pnp
+.pnp.js
 
 # TypeScript v1 declaration files
 typings/
@@ -79,12 +82,19 @@ typings/
 # Output of 'npm pack'
 *.tgz
 
+# Junit output
+junit.xml
+
 # Yarn Integrity file
 .yarn-integrity
 
 # dotenv environment variables file
 .env
 .env.test
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
 
 # parcel-bundler cache (https://parceljs.org/)
 .cache

.solcover.js

@@ -1,3 +1,3 @@
 module.exports = {
-    buildDirPath: '/app/src/contracts'
+    buildDirPath: '/src/chain/abis'
 };

Jenkinsfile

@@ -15,56 +15,51 @@ pipeline {
         stage('Contracts: Build') {
             steps {
                 sh 'npm install'
-                sh 'npm run build'
+                sh 'npm run build:contracts'
             }
         }
         stage('Contracts: Lint') {
             steps {
-                sh 'npm run lint'
+                sh 'npm run lint:contracts'
             }
         }
         stage('Contracts: Test') {
             steps {
-                sh 'npm test'
+                sh 'npm run test:contracts'
             }
         }
         stage('Contracts: Coverage') {
             steps {
-                sh 'npm run coverage'
+                sh 'npm run coverage:contracts'
                 sh './node_modules/.bin/istanbul report cobertura --root .'
             }
         }
         stage('Dapp: Build') {
             steps {
-                dir('app') {
-                    sh 'npm install'
-                    sh 'npm run build'
-                }
+                sh 'npm run build:app'
             }
         }
         stage('Dapp: Test') {
             steps {
-                dir('app') {
-                    sh 'npm run test:ci'
-                }
+                sh 'npm run test:app:ci'
             }
         }
     }
     post {
         always {
             junit 'test-results/**/*.xml'
-            junit 'app/junit.xml'
+            junit 'junit.xml'
             publishCoverage adapters: [
                 istanbulCoberturaAdapter(
-                    path: 'coverage/cobertura-coverage.xml', 
+                    path: 'coverage/cobertura-coverage.xml',
                     thresholds: [[failUnhealthy: true, thresholdTarget: 'Function', unhealthyThreshold: 80.0, unstableThreshold: 85.0]])]
             publishHTML([
-                allowMissing: false, 
-                alwaysLinkToLastBuild: false, 
-                keepAll: false, 
-                reportDir: 'coverage', 
-                reportFiles: 'index.html', 
-                reportName: 'Coverage Report (HTML)', 
+                allowMissing: false,
+                alwaysLinkToLastBuild: false,
+                keepAll: false,
+                reportDir: 'coverage',
+                reportFiles: 'index.html',
+                reportName: 'Coverage Report (HTML)',
                 reportTitles: ''])
         }
       }