Merge branch 'master' of github.com:evias/pacNEM

evias · Feb 27, 2018 · c02a50e · c02a50e
2 parents 89fd192 + 8cc3c3a
commit c02a50e
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/_bmSAeAjQBpzPaWOIrOqEJ6EtvZivl8-9ueH5YFl14Y b/_bmSAeAjQBpzPaWOIrOqEJ6EtvZivl8-9ueH5YFl14Y
@@ -0,0 +1 @@
+_bmSAeAjQBpzPaWOlrOqEJ6EtvZivl8-9ueH5YFl14Y.CoVcSDMkgLQq8f-hSwfP1fkR_xTAeOQWeJ7zWazQTVU
diff --git a/config/default.json b/config/default.json
@@ -41,19 +41,19 @@
             { "host": "http://123.56.253.121", "port": 7890 }
         ],
         "nodes_test": [
+            { "host": "http://23.228.67.85", "port": 7890 },
             { "host": "http://50.3.87.123", "port": 7890 },
             { "host": "http://bigalice2.nem.ninja", "port": 7890 },
             { "host": "http://104.128.226.60", "port": 7890 },
             { "host": "http://150.95.145.157", "port": 7890 },
             { "host": "http://188.68.50.161", "port": 7890 },
             { "host": "http://37.120.188.83", "port": 7890 },
             { "host": "http://23.22.67.85", "port": 7890 },
-            { "host": "http://23.228.67.85", "port": 7890 },
             { "host": "http://45.77.47.227", "port": 7890 }
         ]
     },
     "prices": {
         "entry": 10,
         "heart": 1.8
     }
-}
+}
diff --git a/config/production.json b/config/production.json
@@ -41,19 +41,19 @@
             { "host": "http://123.56.253.121", "port": 7890 }
         ],
         "nodes_test": [
+            { "host": "http://23.228.67.85", "port": 7890 },
             { "host": "http://50.3.87.123", "port": 7890 },
             { "host": "http://bigalice2.nem.ninja", "port": 7890 },
             { "host": "http://104.128.226.60", "port": 7890 },
             { "host": "http://150.95.145.157", "port": 7890 },
             { "host": "http://188.68.50.161", "port": 7890 },
             { "host": "http://37.120.188.83", "port": 7890 },
             { "host": "http://23.22.67.85", "port": 7890 },
-            { "host": "http://23.228.67.85", "port": 7890 },
             { "host": "http://45.77.47.227", "port": 7890 }
         ]
     },
     "prices": {
         "entry": 10,
         "heart": 1.8
     }
-}
+}
diff --git a/core/blockchain/payments-core.js b/core/blockchain/payments-core.js
@@ -346,7 +346,7 @@
                     }
                 })
                 .catch(function(err) { 
-                    self.logger_.error("[NEM] [PAY-HISTORY] ", __line, "An error happened: ", err);
+                    self.logger_.error("[NEM] [PAY-HISTORY] ", __line, "An error happened: " + JSON.stringify(err));
                 }); 
         };
 

diff --git a/www/ssl-verification/8AyIZr5_-jIGC96YNEz9uPqgqCyPaHh-G2Q6qqGuIzQ b/www/ssl-verification/8AyIZr5_-jIGC96YNEz9uPqgqCyPaHh-G2Q6qqGuIzQ
@@ -0,0 +1 @@
+8AyIZr5_-jIGC96YNEz9uPqgqCyPaHh-G2Q6qqGuIzQ.CoVcSDMkgLQq8f-hSwfP1fkR_xTAeOQWeJ7zWazQTVU
diff --git a/www/ssl-verification/P4UnfBMGwHPh7GfIh0JnYtoaTCUY5d6osS41fxw7wdA b/www/ssl-verification/P4UnfBMGwHPh7GfIh0JnYtoaTCUY5d6osS41fxw7wdA
@@ -0,0 +1 @@
+P4UnfBMGwHPh7GfIh0JnYtoaTCUY5d6osS41fxw7wdA.CoVcSDMkgLQq8f-hSwfP1fkR_xTAeOQWeJ7zWazQTVU
diff --git a/www/ssl-verification/gKxwc2UPtvaoaxX-2YVv9efCnf7k7dWvAed9LmN72no b/www/ssl-verification/gKxwc2UPtvaoaxX-2YVv9efCnf7k7dWvAed9LmN72no
@@ -0,0 +1 @@
+gKxwc2UPtvaoaxX-2YVv9efCnf7k7dWvAed9LmN72no.CoVcSDMkgLQq8f-hSwfP1fkR_xTAeOQWeJ7zWazQTVU