adding timestamps

snowblossomcoin · Jun 8, 2018 · 970e8eb · 970e8eb
1 parent c971ef5
commit 970e8eb
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/.project/.blaze/modules/.workspace.iml b/.project/.blaze/modules/.workspace.iml
@@ -6,15 +6,17 @@
       <sourceFolder url="file://$MODULE_DIR$/../../.." isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../../../client/src" isTestSource="false" packagePrefix="snowblossom.client" />
       <sourceFolder url="file://$MODULE_DIR$/../../../client/test" isTestSource="false" packagePrefix="client.test" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src" isTestSource="false" packagePrefix="lib.src" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/db" isTestSource="false" packagePrefix="lib.src.db" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/db/lobstack" isTestSource="false" packagePrefix="lib.src.db.lobstack" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/db/rocksdb" isTestSource="false" packagePrefix="lib.src.db.rocksdb" />
-      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/trie" isTestSource="false" packagePrefix="lib.src.trie" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src" isTestSource="false" packagePrefix="snowblossom.lib" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/db" isTestSource="false" packagePrefix="snowblossom.lib.db" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/db/lobstack" isTestSource="false" packagePrefix="snowblossom.lib.db.lobstack" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/db/rocksdb" isTestSource="false" packagePrefix="snowblossom.lib.db.rocksdb" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../lib/src/trie" isTestSource="false" packagePrefix="snowblossom.lib.trie" />
       <sourceFolder url="file://$MODULE_DIR$/../../../lib/test" isTestSource="false" packagePrefix="lib.test" />
       <sourceFolder url="file://$MODULE_DIR$/../../../lib/test/trie" isTestSource="false" packagePrefix="lib.test.trie" />
       <sourceFolder url="file://$MODULE_DIR$/../../../miner/src" isTestSource="false" packagePrefix="snowblossom.miner" />
       <sourceFolder url="file://$MODULE_DIR$/../../../miner/test" isTestSource="false" packagePrefix="miner.test" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../node/src" isTestSource="false" packagePrefix="snowblossom.node" />
+      <sourceFolder url="file://$MODULE_DIR$/../../../node/test" isTestSource="false" packagePrefix="node.test" />
       <sourceFolder url="file://$MODULE_DIR$/../../../shackleton/src" isTestSource="false" packagePrefix="snowblossom.shackleton" />
       <sourceFolder url="file://$MODULE_DIR$/../../../shackleton/test" isTestSource="false" packagePrefix="shackleton.test" />
       <sourceFolder url="file://$MODULE_DIR$/../../../systemtests/test" isTestSource="false" packagePrefix="systemtests.test" />
@@ -29,6 +31,7 @@
     <orderEntry type="library" name="error_prone_annotations-2.1.2-ijar_a2ad6d75" level="project" />
     <orderEntry type="library" name="liblib-hjar_21ca43a" level="project" />
     <orderEntry type="library" name="commons-math3-3.6.1-ijar_985bb5c9" level="project" />
+    <orderEntry type="library" name="libnode-hjar_4178e2ed" level="project" />
     <orderEntry type="library" name="grpc-stub-1.12.0-ijar_db090a05" level="project" />
     <orderEntry type="library" name="libprotolib-hjar_c5857708" level="project" />
     <orderEntry type="library" name="junit-4.12-ijar_b66bc329" level="project" />

diff --git a/.project/.idea/misc.xml b/.project/.idea/misc.xml
diff --git a/shackleton/src/AddressPage.java b/shackleton/src/AddressPage.java
@@ -27,7 +27,7 @@ public void render()
   {
 
   }
-
+/*
   long loadConfirmed = 0;
   long valueUnconfirmed = 0;
 
@@ -152,4 +152,5 @@ public List<TransactionBridge> getSpendable(AddressSpecHash addr)
     return lst;
 
   }
+  */
 }
diff --git a/shackleton/src/WebServer.java b/shackleton/src/WebServer.java
@@ -12,6 +12,8 @@
 import java.io.PrintStream;
 import java.net.InetSocketAddress;
 import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.Map;
 
 public class WebServer
@@ -169,7 +171,7 @@ private void displayStatus(PrintStream out)
     out.println("<h2>Recent Blocks</h2>");
     int min = Math.max(0, header.getBlockHeight()-75);
     out.println("<table border='0' cellspacing='0'>");
-    out.println("<thead><tr><th>Height</th><th>Hash</th><th>Tx</th><th>Size</th><th>Miner</th></tr></thead>");
+    out.println("<thead><tr><th>Height</th><th>Hash</th><th>Tx</th><th>Size</th><th>Miner</th><th>Timestamp</th></tr></thead>");
     for(int h=header.getBlockHeight(); h>=min; h--)
     {
       BlockHeader blk_head = shackleton.getStub().getBlockHeader(RequestBlockHeader.newBuilder().setBlockHeight(h).build());
@@ -210,12 +212,13 @@ private String getBlockSummaryLine(ChainHash hash)
       miner = miner_addr + " - " + remark;
     }
 
-
+    SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    Date resultdate = new Date(blk.getHeader().getTimestamp());
 
-    String s = String.format("<tr><td>%d</td><td>%s %s</td><td>%d</td><td>%d</td><td>%s</td></tr>", 
+    String s = String.format("<tr><td>%d</td><td>%s %s</td><td>%d</td><td>%d</td><td>%s</td><td>%s</td></tr>",
         blk.getHeader().getBlockHeight(), 
         hash.toString(), link,
-        tx_count, size, miner);
+        tx_count, size, miner, sdf.format(resultdate));
 
     synchronized(block_summary_lines)
     {
@@ -262,7 +265,10 @@ private void displayBlock(PrintStream out, Block blk)
       out.println("height: " + header.getBlockHeight());
       out.println("prev_block_hash: " + new ChainHash(header.getPrevBlockHash()));
       out.println("utxo_root_hash: " + new ChainHash(header.getUtxoRootHash()));
-      out.println("timestamp: " + header.getTimestamp());
+
+      SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+      Date resultdate = new Date(header.getTimestamp());
+      out.println("timestamp: " + header.getTimestamp() + " - " + sdf.format(resultdate));
       out.println("snow_field: " + header.getSnowField());
       out.println("size: " + blk.toByteString().size());
       out.println();