Merge pull request opentimestamps#35 from brunocvcunha/master

fix: make verify workable
thandal · Aug 16, 2019 · 3856b85 · 3856b85
2 parents 6a6358f + b362be0
commit 3856b85
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 language: java
 jdk:
-  - oraclejdk8
+  - openjdk8
 notifications:
   slack: eternitywall:etqKsfod1e0lcsOFby1npMh6g
diff --git a/src/main/java/com/eternitywall/http/Request.java b/src/main/java/com/eternitywall/http/Request.java
@@ -55,7 +55,8 @@ public Response call() throws Exception {
             HttpURLConnection httpURLConnection = (HttpURLConnection) url.openConnection();
             httpURLConnection.setReadTimeout(10000);
             httpURLConnection.setConnectTimeout(10000);
-            httpURLConnection.setRequestProperty("User-Agent", "java");
+            httpURLConnection.setRequestProperty("User-Agent", "OpenTimestamps/1.17");
+            httpURLConnection.setRequestProperty("Accept", "application/json");
 
             if (headers != null) {
                 for (Map.Entry<String, String> entry : headers.entrySet()) {

diff --git a/src/main/java/com/eternitywall/ots/MultiInsight.java b/src/main/java/com/eternitywall/ots/MultiInsight.java
@@ -35,7 +35,7 @@ public MultiInsight(String chain) throws Exception {
         if (chain.equals("bitcoin")) {
             //insightUrls.add("https://search.bitaccess.co/insight-api");
             //insightUrls.add("https://www.localbitcoinschain.com/api");
-            //insightUrls.add("https://insight.bitpay.com/api");
+            insightUrls.add("https://insight.bitpay.com/api");
             //insightUrls.add("https://finney.calendar.eternitywall.com/insight-api");
             insightUrls.add("https://btc-bitcore1.trezor.io/api");
             //insightUrls.add("https://btc-bitcore4.trezor.io/api");
@@ -79,7 +79,7 @@ public BlockHeader block(String hash) throws Exception {
                 JSONObject jsonObject = take.getJson();
 
                 try {
-                    String merkleroot = jsonObject.getString("merkleroot");
+                    String merkleroot = jsonObject.has("merkleroot") ? jsonObject.getString("merkleroot") : jsonObject.getString("merkleRoot");
                     String time = String.valueOf(jsonObject.getInt("time"));
                     BlockHeader blockHeader = new BlockHeader();
                     blockHeader.setMerkleroot(merkleroot);
@@ -93,7 +93,7 @@ public BlockHeader block(String hash) throws Exception {
 
                     results.add(blockHeader);
                 } catch (JSONException e) {
-                    log.warning("Cannot parse merkleroot from body: " + jsonObject);
+                    log.warning("Cannot parse merkleroot from body: " + jsonObject + ": " + e.getMessage());
                 }
             }
         }

diff --git a/src/main/java/com/eternitywall/ots/OtsCli.java b/src/main/java/com/eternitywall/ots/OtsCli.java
@@ -355,8 +355,7 @@ public static void verify(String argsOts, Hash hash, String argsFile) {
                     System.out.println("Success! " + Utils.toUpperFirstLetter(chain) + " " + entry.getValue().toString());
                 }
             } catch (Exception e) {
-                System.out.println(e.getMessage());
-
+                e.printStackTrace();
                 return;
             }
         } catch (Exception e) {