Merge pull request #238 from xenohunter/master

Hotfix: HTTPS issue
wavesplatform · May 12, 2017 · eb91aef · eb91aef
2 parents 5007ca5 + 586ea39
commit eb91aef
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -10,6 +10,7 @@ module.exports = function (grunt) {
             .replace(/NETWORK_NAME\s*:\s*'[^']+'/, grunt.template.process("NETWORK_NAME: '<%= meta.configurations." + target + ".name %>'"))
             .replace(/NETWORK_CODE\s*:\s*'[^']+'/, grunt.template.process("NETWORK_CODE: '<%= meta.configurations." + target + ".code %>'"))
             .replace(/COINOMAT_ADDRESS\s*:\s*'[^']+'/, grunt.template.process("COINOMAT_ADDRESS: '<%= meta.configurations." + target + ".coinomat %>'"))
+            .replace(/DATAFEED_ADDRESS\s*:\s*'[^']+'/, grunt.template.process("DATAFEED_ADDRESS: '<%= meta.configurations." + target + ".datafeed %>'"))
             .replace(/MATCHER_ADDRESS\s*:\s*'[^']+'/, grunt.template.process("MATCHER_ADDRESS: '<%= meta.configurations." + target + ".matcher %>'"));
     };
 
@@ -86,21 +87,24 @@ module.exports = function (grunt) {
                     code: 'T',
                     server: 'http://52.30.47.67:6869',
                     coinomat: 'https://test.coinomat.com',
-                    matcher: 'http://52.28.66.217:6886'
+                    matcher: 'http://52.28.66.217:6886',
+                    datafeed: 'http://marketdata.wavesplatform.com'
                 },
                 mainnet: {
                     name: 'mainnet',
                     code: 'W',
                     server: 'https://nodes.wavesnodes.com',
                     coinomat: 'https://coinomat.com',
-                    matcher: 'https://nodes.wavesnodes.com'
+                    matcher: 'https://nodes.wavesnodes.com',
+                    datafeed: 'https://marketdata.wavesplatform.com'
                 },
                 devnet: {
                     name: 'devnet',
                     code: 'D',
                     server: 'http://35.157.212.173:6869',
                     coinomat: 'https://test.coinomat.com',
-                    matcher: 'http://52.28.66.217:6886'
+                    matcher: 'http://52.28.66.217:6886',
+                    datafeed: 'http://marketdata.wavesplatform.com'
                 },
                 chrome: {
                     testnet: {

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "waves-lite-client",
-  "version": "0.4.18",
+  "version": "0.4.19",
   "dependencies": {
     "angular": "~1.6.0",
     "angular-route": "~1.6.0",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "waves-lite-client",
-  "version": "0.4.18",
+  "version": "0.4.19",
   "description": "A lite client for the Waves platform",
   "license": "See license in ./LICENSE",
   "engines": {

diff --git a/src/js/app.js b/src/js/app.js
@@ -54,7 +54,8 @@ function AngularApplicationConfig($provide, $compileProvider, $validatorProvider
         'self',
         'https://test.coinomat.com/api/**',
         'https://coinomat.com/api/**',
-        'http://marketdata.wavesplatform.com/**'
+        'http://marketdata.wavesplatform.com/**',
+        'https://marketdata.wavesplatform.com/**'
     ]);
 
     // Globally disables all ARIA warnings.