APL - 1676 nodeID

.gitignore

@@ -39,3 +39,4 @@ nbactions.xml
 **/swagger-codegen-cli-*.jar
 **/.swagger-codegen
 /apl-api2/src/gen/
+/apollo-mariadb

apl-api/src/main/java/com/apollocurrency/aplwallet/api/p2p/PeerInfo.java

@@ -167,11 +167,23 @@ public class PeerInfo extends BaseP2PResponse {
     /**
      * PEM-encoded X.509 Certificate of host as String, including
      * BEGIN-CETIFICATE and END-CERTIFICATE marks. Certificate
-     * should be verified and used for private key cryptography. Certificate
-     * also contains some important attributes, that is used widely in communications.
+     * should be verified. CA-signed certificate should be verified using CA x.509 cert.
+     * Self-signed certificate should be verified by checking signature of "blockTime" field
+     * with proposed self-signed certificate to ensure private key ownership.
      * New!
      */
     private String X509_cert;
+    /**
+     * Epoch time of the node. Needed to approve private key ownership and make 
+     * replay attacks less possible
+     */
+    private Integer epochTime;
+    /**
+     * HEX string represenataion of the signature of blockTime (as 4 bytes in netowk order).
+     * Signature algorithm is the default for given public key type of X.509 certiificate,
+     * for more information please see fb-cryptoo library documentation
+     */
+    private String epochTimeSigantureHex;
     /**
      * blacklist cause
      */

apl-api/src/main/resources/META-INF/beans.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+       xmlns:weld="http://jboss.org/schema/weld/beans"
+       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
+       version="1.1" bean-discovery-mode="all">
+  <decorators>
+    <class>org.jboss.weld.environment.se.threading.RunnableDecorator</class>
+  </decorators>
+  <weld:scan>
+    <weld:exclude name="org.jboss.weld.**" />
+    <weld:exclude name="io.swagger.**" />
+  </weld:scan>
+</beans>

apl-api2/src/main/resources/META-INF/beans.xml

@@ -9,5 +9,6 @@
   </decorators>
   <weld:scan>
     <weld:exclude name="org.jboss.weld.**" />
+    <weld:exclude name="io.swagger.**" />
   </weld:scan>
 </beans>

apl-core/pom.xml

@@ -33,6 +33,20 @@
       <artifactId>apl-api2</artifactId>
       <version>${project.version}</version>
     </dependency>
+
+    <!-- EXT BOM DEPENDENCIES -->
+    <dependency>
+      <groupId>io.firstbridge</groupId>
+      <artifactId>fb-identity</artifactId>
+      <version>1.0.1</version>
+      <type>jar</type>
+    </dependency>
+
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+    </dependency>
+
     <dependency>
       <groupId>com.apollocurrency</groupId>
         <artifactId>apl-db-updater</artifactId>
@@ -51,11 +65,6 @@
           <version>${project.version}</version>
       </dependency>
 
-      <!-- EXT BOM DEPENDENCIES -->
-      <dependency>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-      </dependency>
       <dependency>
           <groupId>org.slf4j</groupId>
           <artifactId>slf4j-api</artifactId>

apl-core/src/main/java/com/apollocurrency/aplwallet/apl/core/peer/PeerDb.java → apl-core/src/main/java/com/apollocurrency/aplwallet/apl/core/dao/appdata/PeerDao.java

@@ -18,9 +18,11 @@
  * Copyright © 2018 Apollo Foundation
  */
 
-package com.apollocurrency.aplwallet.apl.core.peer;
+package com.apollocurrency.aplwallet.apl.core.dao.appdata;
 
 import com.apollocurrency.aplwallet.apl.core.dao.TransactionalDataSource;
+import com.apollocurrency.aplwallet.apl.core.entity.appdata.PeerEntity;
+import com.apollocurrency.aplwallet.apl.core.peer.Peer;
 import com.apollocurrency.aplwallet.apl.core.service.appdata.DatabaseManager;
 import com.apollocurrency.aplwallet.apl.util.annotation.DatabaseSpecificDml;
 import com.apollocurrency.aplwallet.apl.util.annotation.DmlMarker;
@@ -36,31 +38,42 @@
 import java.util.List;
 
 @Singleton
-public class PeerDb {
+public class PeerDao {
 
     private final DatabaseManager databaseManager;
 
     @Inject
-    public PeerDb(DatabaseManager databaseManagerParam) {
+    public PeerDao(DatabaseManager databaseManagerParam) {
         databaseManager = databaseManagerParam;
     }
 
-    public List<Entry> loadPeers() {
-        List<Entry> peers = new ArrayList<>();
+
+    public List<PeerEntity> loadPeers() {
+        List<PeerEntity> peers = new ArrayList<>();
+
         TransactionalDataSource dataSource = databaseManager.getDataSource();
         try (Connection con = dataSource.getConnection();
              PreparedStatement pstmt = con.prepareStatement("SELECT * FROM peer");
              ResultSet rs = pstmt.executeQuery()) {
             while (rs.next()) {
-                peers.add(new Entry(rs.getString("address"), rs.getLong("services"), rs.getInt("last_updated")));
+                peers.add(new PeerEntity(
+                        rs.getString("address"), 
+                        rs.getLong("services"), 
+                        rs.getInt("last_updated"), 
+                        rs.getString("x509pem"),
+                        rs.getString("ip_and_port")
+                       )
+                );
             }
         } catch (SQLException e) {
             throw new RuntimeException(e.toString(), e);
         }
         return peers;
     }
 
-    public void deletePeer(Entry peer) {
+
+    public void deletePeer(PeerEntity peer) {
+
         TransactionalDataSource dataSource = databaseManager.getDataSource();
         try (Connection con = dataSource.getConnection()) {
             PreparedStatement pstmt = con.prepareStatement("DELETE FROM peer WHERE address = ?");
@@ -71,11 +84,13 @@ public void deletePeer(Entry peer) {
         }
     }
 
-    public void deletePeers(Collection<Entry> peers) {
+
+    public void deletePeers(Collection<PeerEntity> peers) {
+
         TransactionalDataSource dataSource = databaseManager.getDataSource();
         try (Connection con = dataSource.getConnection();
              PreparedStatement pstmt = con.prepareStatement("DELETE FROM peer WHERE address = ?")) {
-            for (Entry peer : peers) {
+            for (PeerEntity peer : peers) {
                 pstmt.setString(1, peer.getAddress());
                 pstmt.executeUpdate();
             }
@@ -84,18 +99,20 @@ public void deletePeers(Collection<Entry> peers) {
         }
     }
 
-    public void updatePeers(Collection<Entry> peers) {
+    public void updatePeers(Collection<PeerEntity> peers) {
+
         TransactionalDataSource dataSource = databaseManager.getDataSource();
         dataSource.begin();
         try (Connection con = dataSource.getConnection();
              @DatabaseSpecificDml(DmlMarker.MERGE)
+
              PreparedStatement pstmt = con.prepareStatement("INSERT INTO peer "
                  + "(address, services, last_updated) "
                  + "VALUES(?, ?, ?) "
                  + "ON DUPLICATE KEY UPDATE "
                  + "address = VALUES(address), services = VALUES(services), last_updated = VALUES(last_updated)")
         ) {
-            for (Entry peer : peers) {
+            for (PeerEntity peer : peers) {
                 pstmt.setString(1, peer.getAddress());
                 pstmt.setLong(2, peer.getServices());
                 pstmt.setInt(3, peer.getLastUpdated());
@@ -108,7 +125,9 @@ public void updatePeers(Collection<Entry> peers) {
         }
     }
 
-    public void updatePeer(PeerImpl peer) {
+
+    public void updatePeer(Peer peer) {
+
         TransactionalDataSource dataSource = databaseManager.getDataSource();
         dataSource.begin();
         try (Connection con = dataSource.getConnection();
@@ -128,46 +147,4 @@ public void updatePeer(PeerImpl peer) {
         }
     }
 
-    static class Entry {
-        private final String address;
-        private final long services;
-        private final int lastUpdated;
-
-        Entry(String address, long services, int lastUpdated) {
-            this.address = address;
-            this.services = services;
-            this.lastUpdated = lastUpdated;
-        }
-
-        public String getAddress() {
-            return address;
-        }
-
-        public long getServices() {
-            return services;
-        }
-
-        public int getLastUpdated() {
-            return lastUpdated;
-        }
-
-        @Override
-        public int hashCode() {
-            return address.hashCode();
-        }
-
-        @Override
-        public boolean equals(Object obj) {
-            return (obj != null && (obj instanceof Entry) && address.equals(((Entry) obj).address));
-        }
-
-        @Override
-        public String toString() {
-            return "PeerEntry{" +
-                "address='" + address + '\'' +
-                ", services=" + services +
-                ", lastUpdated=" + lastUpdated +
-                '}';
-        }
-    }
 }

apl-core/src/main/java/com/apollocurrency/aplwallet/apl/core/dao/state/publickey/PublicKeyTableProducer.java

@@ -78,7 +78,7 @@ private void init() {
     @Named("publicKeyTable")
     public EntityDbTableInterface<PublicKey> getPublicKeyTable() {
         if (isCacheEnabled()) {
-            return new CachedTable<>(publicKeyCache, publicKeyTable);
+                return new CachedTable<>(publicKeyCache, publicKeyTable);
         } else {
             return publicKeyTable;
         }

apl-core/src/main/java/com/apollocurrency/aplwallet/apl/core/entity/appdata/BlockIndex.java

@@ -1,3 +1,6 @@
+/*
+ *  Copyright © 2019-2020 Apollo Foundation
+ */
 package com.apollocurrency.aplwallet.apl.core.entity.appdata;
 
 import lombok.AllArgsConstructor;

apl-core/src/main/java/com/apollocurrency/aplwallet/apl/core/entity/appdata/PeerEntity.java

@@ -0,0 +1,39 @@
+/*
+ *  Copyright © 2019-2020 Apollo Foundation
+ */
+package com.apollocurrency.aplwallet.apl.core.entity.appdata;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+/**
+ * DB record of known peer
+ *
+ * @author [email protected]
+ */
+@Data
+@AllArgsConstructor
+public class PeerEntity {
+
+    /**
+     * In previous version address is public IP, but now it could be IP:port or
+     * 256 bit identity in hexadecimal form
+     */
+    private String address;
+    /**
+     * Services of node
+     */
+    private long services;
+    /**
+     *  time of last update in seconds
+     */
+    private int lastUpdated;
+    /**
+     * X.509 certificate of node in PEM format
+     */
+    private String x509pem;
+    /**
+     * Last seen on IP and port (IPv4 or IPv6)
+     */
+    private String ipAndPort;
+}

apl-core/src/main/java/com/apollocurrency/aplwallet/apl/core/http/JSONData.java

@@ -707,8 +707,8 @@ public static JSONObject peer(Peer peer) {
         json.put("lastUpdated", peer.getLastUpdated());
         json.put("lastConnectAttempt", peer.getLastConnectAttempt());
         json.put("inbound", peer.isInbound());
-        json.put("inboundWebSocket", peer.isInboundSocket());
-        json.put("outboundWebSocket", peer.isOutboundSocket());
+        json.put("inboundWebSocket", peer.isInbound());
+        json.put("outboundWebSocket", peer.isOutbound());
         if (peer.isBlacklisted()) {
             json.put("blacklistingCause", peer.getBlacklistingCause());
         }