add web interface

546621120 · Aug 18, 2017 · 4a1d659 · 4a1d659
1 parent 7286a8c
commit 4a1d659
Show file tree

Hide file tree

Showing 12 changed files with 360 additions and 443 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,22 +1,53 @@
-# Compiled class file
 *.class
-
-# Log file
+**/bin/
+**/build/
+**/classes/
 *.log
-
-# BlueJ files
-*.ctxt
-
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+**/.nb*/
+**/*.swp
+**/*.swo
 
 # Package Files #
 *.jar
 *.war
 *.ear
-*.zip
-*.tar.gz
-*.rar
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+
+*.zip
+
+# Various settings files that should be handled otherwise
+.classpath
+.project
+.gradle
+.settings
+.pmd
+gradle.properties
+gradlew
+**/gradlew
+**/gradlew.bat
+**/gradle/
+
+# Windows binary executables
+*.exe
+
+# Editor backup files
+*.bak
+*.*~
+*.keep
+*.contrib
+
+# BeyondCompare3 temp & backup files files
+*.orig
+*.java.*.*.java
+.idea/tasks.xml
+.idea/workspace.xml
+.idea/libraries
+.idea/**
+/bin/
+*.iml
+*.ipr
+*.iws
+out/
+.metadata/
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,2 @@
-rootProject.name = 'Blockchain'
+rootProject.name = 'blockchain'
 
diff --git a/src/main/java/agent/Agent.java b/src/main/java/agent/Agent.java
@@ -1,157 +1,157 @@
-package agent;
-
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.net.ServerSocket;
-import java.net.Socket;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-
-import static agent.Message.MESSAGE_TYPE.NEW_BLOCK;
-import static agent.Message.MESSAGE_TYPE.READY;
-
-public class Agent {
-
-    private String name;
-    private int port;
-    private List<Agent> peers;
-    private List<Block> blockchain = new ArrayList<>();
-
-    private ServerSocket serverSocket;
-    private ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(10);
-
-    private boolean listening = true;
-
-    // for jackson
-    public Agent() {
-    }
-
-    Agent(String name, final int port, Block root, final List<Agent> agents) {
-        this.name = name;
-        this.port = port;
-        this.peers = agents;
-        blockchain.add(root);
-    }
-
-    public Block createBlock() {
-        if (blockchain.isEmpty()) {
-            return null;
-        }
-
-        Block previousBlock = getLatestBlock();
-        if (previousBlock == null) {
-            return null;
-        }
-
-        final int index = previousBlock.getIndex() + 1;
-        final Block block = new Block(index, previousBlock.getHash(), name);
-        System.out.println(String.format("%s created new block %s", name, block.toString()));
-        broadcast(block);
-        return block;
-    }
-
-    void addBlock(Block block) {
-        if (isBlockValid(block)) {
-            blockchain.add(block);
-        }
-    }
-
-    public List<Block> getBlockchain() {
-        return blockchain;
-    }
-
-    private void broadcast(final Block block) {
-        for (Agent peer : peers) {
-            send("localhost", peer.getPort(), block);
-        }
-    }
-
-    private Block getLatestBlock() {
-        if (blockchain.isEmpty()) {
-            return null;
-        }
-        return blockchain.get(blockchain.size() - 1);
-    }
-
-    private boolean isBlockValid(final Block block) {
-        final Block latestBlock = getLatestBlock();
-        if (latestBlock == null) {
-            return false;
-        }
-        final int expected = latestBlock.getIndex() + 1;
-        if (block.getIndex() != expected) {
-            System.out.println(String.format("Invalid index. Expected: %s Actual: %s", expected, block.getIndex()));
-            return false;
-        }
-        if (!Objects.equals(block.getPreviousHash(), latestBlock.getHash())) {
-            System.out.println("Unmatched hash code");
-            return false;
-        }
-
-
-        return true;
-    }
-
-    public void startHost() {
-        executor.execute(() -> {
-            try {
-                serverSocket = new ServerSocket(port);
-                System.out.println(String.format("Server %s started", serverSocket.getLocalPort()));
-                listening = true;
-                while (listening) {
-                    final AgentServerThread thread = new AgentServerThread(this, serverSocket.accept());
-                    thread.start();
-                }
-                serverSocket.close();
-            } catch (IOException e) {
-                System.err.println("Could not listen to port " + port);
-            }
-        });
-    }
-
-    public void stopHost() {
-        listening = false;
-        try {
-            serverSocket.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void send(String host, int port, Block block) {
-        try (
-                final Socket peer = new Socket(host, port);
-                final ObjectOutputStream out = new ObjectOutputStream(peer.getOutputStream());
-                final ObjectInputStream in = new ObjectInputStream(peer.getInputStream())) {
-            Object fromPeer;
-            while ((fromPeer = in.readObject()) != null) {
-                if (fromPeer instanceof Message) {
-                    final Message msg = (Message) fromPeer;
-                    System.out.println(String.format("%d received: %s", this.port, msg.toString()));
-                    if (READY == msg.type) {
-                        out.writeObject(new Message.MessageBuilder().withType(NEW_BLOCK).withReceiver(port).withSender(this.port).withBlock(block).build());
-                        break;
-                    }
-                }
-            }
-        } catch (UnknownHostException e) {
-            System.err.println("Unknown host " + host);
-        } catch (IOException e) {
-            System.err.println("Couldn't get I/O for the connection to " + host);
-        } catch (ClassNotFoundException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public int getPort() {
-        return port;
-    }
-}
+package agent;
+
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+
+import static agent.Message.MESSAGE_TYPE.NEW_BLOCK;
+import static agent.Message.MESSAGE_TYPE.READY;
+
+public class Agent {
+
+    private String name;
+    private int port;
+    private List<Agent> peers;
+    private List<Block> blockchain = new ArrayList<>();
+
+    private ServerSocket serverSocket;
+    private ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(10);
+
+    private boolean listening = true;
+
+    // for jackson
+    public Agent() {
+    }
+
+    Agent(String name, final int port, Block root, final List<Agent> agents) {
+        this.name = name;
+        this.port = port;
+        this.peers = agents;
+        blockchain.add(root);
+    }
+
+    public Block createBlock() {
+        if (blockchain.isEmpty()) {
+            return null;
+        }
+
+        Block previousBlock = getLatestBlock();
+        if (previousBlock == null) {
+            return null;
+        }
+
+        final int index = previousBlock.getIndex() + 1;
+        final Block block = new Block(index, previousBlock.getHash(), name);
+        System.out.println(String.format("%s created new block %s", name, block.toString()));
+        broadcast(block);
+        return block;
+    }
+
+    void addBlock(Block block) {
+        if (isBlockValid(block)) {
+            blockchain.add(block);
+        }
+    }
+
+    public List<Block> getBlockchain() {
+        return blockchain;
+    }
+
+    private void broadcast(final Block block) {
+        for (Agent peer : peers) {
+            send("localhost", peer.getPort(), block);
+        }
+    }
+
+    private Block getLatestBlock() {
+        if (blockchain.isEmpty()) {
+            return null;
+        }
+        return blockchain.get(blockchain.size() - 1);
+    }
+
+    private boolean isBlockValid(final Block block) {
+        final Block latestBlock = getLatestBlock();
+        if (latestBlock == null) {
+            return false;
+        }
+        final int expected = latestBlock.getIndex() + 1;
+        if (block.getIndex() != expected) {
+            System.out.println(String.format("Invalid index. Expected: %s Actual: %s", expected, block.getIndex()));
+            return false;
+        }
+        if (!Objects.equals(block.getPreviousHash(), latestBlock.getHash())) {
+            System.out.println("Unmatched hash code");
+            return false;
+        }
+
+
+        return true;
+    }
+
+    public void startHost() {
+        executor.execute(() -> {
+            try {
+                serverSocket = new ServerSocket(port);
+                System.out.println(String.format("Server %s started", serverSocket.getLocalPort()));
+                listening = true;
+                while (listening) {
+                    final AgentServerThread thread = new AgentServerThread(this, serverSocket.accept());
+                    thread.start();
+                }
+                serverSocket.close();
+            } catch (IOException e) {
+                System.err.println("Could not listen to port " + port);
+            }
+        });
+    }
+
+    public void stopHost() {
+        listening = false;
+        try {
+            serverSocket.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void send(String host, int port, Block block) {
+        try (
+                final Socket peer = new Socket(host, port);
+                final ObjectOutputStream out = new ObjectOutputStream(peer.getOutputStream());
+                final ObjectInputStream in = new ObjectInputStream(peer.getInputStream())) {
+            Object fromPeer;
+            while ((fromPeer = in.readObject()) != null) {
+                if (fromPeer instanceof Message) {
+                    final Message msg = (Message) fromPeer;
+                    System.out.println(String.format("%d received: %s", this.port, msg.toString()));
+                    if (READY == msg.type) {
+                        out.writeObject(new Message.MessageBuilder().withType(NEW_BLOCK).withReceiver(port).withSender(this.port).withBlock(block).build());
+                        break;
+                    }
+                }
+            }
+        } catch (UnknownHostException e) {
+            System.err.println("Unknown host " + host);
+        } catch (IOException e) {
+            System.err.println("Couldn't get I/O for the connection to " + host);
+        } catch (ClassNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getPort() {
+        return port;
+    }
+}
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		rootProject.name = 'Blockchain'
		rootProject.name = 'blockchain'