Merge branch 'v5.0.15' of github.com:ergoplatform/ergo into v5.0.15

Author: kushti

src/main/resources/api/openapi.yaml

@@ -2704,7 +2704,7 @@ paths:
                 $ref: '#/components/schemas/ApiError'
 
   /blocks/headerIds:
-    get:
+    post:
       summary: Get the list of full block info by given header ids
       operationId: getFullBlockByIds
       tags:

src/main/scala/scorex/core/network/ConnectedPeer.scala

@@ -10,7 +10,6 @@ import scorex.core.network.peer.PeerInfo
   *
   * @param connectionId - connection address
   * @param handlerRef   - reference to PeerConnectionHandler that is responsible for communication with this peer
-  * @param lastMessage  - timestamp of last received message
   * @param peerInfo     - information about this peer. May be None if peer is connected, but is not handshaked yet
   */
 case class ConnectedPeer(connectionId: ConnectionId,

src/main/scala/scorex/core/network/NetworkController.scala

@@ -425,9 +425,10 @@ class NetworkController(ergoSettings: ErgoSettings,
         peerManagerRef ! RemovePeer(peerAddress)
         connections -= connectedPeer.connectionId.remoteAddress
       } else {
-        peerManagerRef ! AddOrUpdatePeer(peerInfo)
+        val newPeerInfo = peerInfo.copy(lastStoredActivityTime = time())
+        peerManagerRef ! AddOrUpdatePeer(newPeerInfo)
 
-        val updatedConnectedPeer = connectedPeer.copy(peerInfo = Some(peerInfo))
+        val updatedConnectedPeer = connectedPeer.copy(peerInfo = Some(newPeerInfo))
         connections += remoteAddress -> updatedConnectedPeer
         context.system.eventStream.publish(HandshakedPeer(updatedConnectedPeer))
       }

src/main/scala/scorex/core/network/peer/PeerInfo.scala

@@ -37,7 +37,7 @@ object PeerInfo {
     */
   def fromAddress(address: InetSocketAddress): PeerInfo = {
     val peerSpec = PeerSpec("unknown", Version.initial, s"unknown-$address", Some(address), Seq())
-    PeerInfo(peerSpec, 0L, None)
+    PeerInfo(peerSpec, 0L, None, 0L)
   }
 
 }
@@ -51,12 +51,14 @@ object PeerInfoSerializer extends ErgoSerializer[PeerInfo] {
     w.putLong(obj.lastHandshake)
     w.putOption(obj.connectionType)((w,d) => w.putBoolean(d.isIncoming))
     PeerSpecSerializer.serialize(obj.peerSpec, w)
+    w.putLong(obj.lastStoredActivityTime)
   }
 
    override def parse(r: Reader): PeerInfo = {
      val lastHandshake = r.getLong()
      val connectionType = r.getOption(if (r.getUByte() != 0) Incoming else Outgoing)
      val peerSpec = PeerSpecSerializer.parse(r)
-     PeerInfo(peerSpec, lastHandshake, connectionType)
+     val lastStoredTime = r.getLong()
+     PeerInfo(peerSpec, lastHandshake, connectionType, lastStoredTime)
    }
 }

src/test/scala/org/ergoplatform/http/routes/BlocksApiRouteSpec.scala

@@ -4,6 +4,7 @@ import akka.http.scaladsl.model.{ContentTypes, HttpEntity, StatusCodes, Universa
 import akka.http.scaladsl.server.Route
 import akka.http.scaladsl.testkit.ScalatestRouteTest
 import de.heikoseeberger.akkahttpcirce.FailFastCirceSupport
+import io.circe.Json
 import io.circe.syntax._
 import org.ergoplatform.http.api.BlocksApiRoute
 import org.ergoplatform.modifiers.ErgoFullBlock
@@ -34,8 +35,7 @@ class BlocksApiRouteSpec
       history
         .headerIdsAt(0, 50)
         .map(Algos.encode)
-        .asJson
-        .toString() shouldEqual responseAs[String]
+        .asJson shouldEqual responseAs[Json]
     }
   }
 
@@ -56,8 +56,7 @@ class BlocksApiRouteSpec
         .lastHeaders(1)
         .headers
         .map(_.asJson)
-        .asJson
-        .toString() shouldEqual responseAs[String]
+        .asJson shouldEqual responseAs[Json]
     }
   }
 
@@ -67,19 +66,18 @@ class BlocksApiRouteSpec
       history
         .headerIdsAtHeight(0)
         .map(Algos.encode)
-        .asJson
-        .toString() shouldEqual responseAs[String]
+        .asJson shouldEqual responseAs[Json]
     }
   }
 
   it should "get chain slice" in {
     Get(prefix + "/chainSlice?fromHeight=0") ~> route ~> check {
       status shouldBe StatusCodes.OK
-      chain.map(_.header).asJson.toString() shouldEqual responseAs[String]
+      chain.map(_.header).asJson shouldEqual responseAs[Json]
     }
     Get(prefix + "/chainSlice?fromHeight=2&toHeight=4") ~> route ~> check {
       status shouldBe StatusCodes.OK
-      chain.slice(2, 4).map(_.header).asJson.toString() shouldEqual responseAs[String]
+      chain.slice(2, 4).map(_.header).asJson shouldEqual responseAs[Json]
     }
   }
 
@@ -91,8 +89,8 @@ class BlocksApiRouteSpec
         .flatMap(history.getFullBlock)
         .map(_.asJson)
         .get
-        .toString
-      responseAs[String] shouldEqual expected
+
+      responseAs[Json] shouldEqual expected
     }
   }
 
@@ -121,8 +119,8 @@ class BlocksApiRouteSpec
         .flatMap(history.getFullBlock)
         .map(_.header.asJson)
         .get
-        .toString
-      responseAs[String] shouldEqual expected
+
+      responseAs[Json] shouldEqual expected
     }
   }
 
@@ -131,8 +129,8 @@ class BlocksApiRouteSpec
       status shouldBe StatusCodes.OK
       val header    = history.typedModifierById[Header](headerIdBytes).value
       val fullBlock = history.getFullBlock(header).value
-      val expected  = fullBlock.blockTransactions.asJson.toString
-      responseAs[String] shouldEqual expected
+      val expected  = fullBlock.blockTransactions.asJson
+      responseAs[Json] shouldEqual expected
     }
   }