Merge pull request #575 from alephium/update-common

Update common
alephium · Oct 31, 2024 · c6664e2 · c6664e2
2 parents 899327a + 8e587fd
commit c6664e2
Show file tree

Hide file tree

Showing 8 changed files with 6,096 additions and 6,033 deletions.
diff --git a/app/src/main/resources/explorer-backend-openapi.json b/app/src/main/resources/explorer-backend-openapi.json
diff --git a/app/src/main/scala/org/alephium/explorer/api/BaseEndpoint.scala b/app/src/main/scala/org/alephium/explorer/api/BaseEndpoint.scala
@@ -40,6 +40,7 @@ trait BaseEndpoint extends ErrorExamples with TapirCodecs with TapirSchemasLike
 
   val baseEndpoint: BaseEndpoint[Unit, Unit] =
     endpoint
+      .out(emptyOutput.description("Ok"))
       .errorOut(
         oneOf[ApiError[_ <: StatusCode]](
           error(BadRequest, { case BadRequest(_) => true }),

diff --git a/app/src/main/scala/org/alephium/explorer/service/BlockFlowClient.scala b/app/src/main/scala/org/alephium/explorer/service/BlockFlowClient.scala
@@ -133,6 +133,8 @@ object BlockFlowClient extends StrictLogging {
       with Endpoints
       with ApiModelCodec {
 
+    override val apiKeys: AVector[api.model.ApiKey] = AVector.empty
+
     private val endpointSender = new EndpointSender(maybeApiKey)
 
     override def startSelfOnce(): Future[Unit] = {

diff --git a/app/src/main/scala/org/alephium/explorer/web/DocumentationServer.scala b/app/src/main/scala/org/alephium/explorer/web/DocumentationServer.scala
@@ -40,7 +40,7 @@ class DocumentationServer(
   val routes: ArraySeq[Router => Route] =
     ArraySeq.from(
       SwaggerUI(
-        openApiJson(docs, dropAuth = false),
+        openApiJson(docs, dropAuth = false, truncateAddresses = true),
         openapiFileName = "explorer-backend-openapi.json"
       ).map(route(_))
     )

diff --git a/app/src/test/scala/org/alephium/explorer/GenCoreApi.scala b/app/src/test/scala/org/alephium/explorer/GenCoreApi.scala
@@ -344,10 +344,12 @@ object GenCoreApi {
       unsigned         <- unsignedTxGen
       inputSignatures  <- Gen.listOfN(2, bytesGen)
       scriptSignatures <- Gen.listOfN(2, bytesGen)
+      seenAt           <- timestampGen
     } yield TransactionTemplate(
       unsigned,
       AVector.from(inputSignatures),
-      AVector.from(scriptSignatures)
+      AVector.from(scriptSignatures),
+      seenAt
     )
 
   val outputRefProtocolGen: Gen[OutputRef] = for {

diff --git a/app/src/test/scala/org/alephium/explorer/service/BlockFlowClientSpec.scala b/app/src/test/scala/org/alephium/explorer/service/BlockFlowClientSpec.scala
@@ -148,8 +148,9 @@ class BlockFlowClientSpec extends AlephiumFutureSpec with DatabaseFixtureForAll
 object BlockFlowClientSpec extends ScalaFutures with IntegrationPatience {
   class BlockFlowServerMock(localhost: InetAddress, port: Int) extends api.Endpoints with Server {
 
-    implicit val groupConfig: GroupConfig     = groupSetting.groupConfig
-    val maybeApiKey: Option[api.model.ApiKey] = None
+    implicit val groupConfig: GroupConfig           = groupSetting.groupConfig
+    override val apiKeys: AVector[api.model.ApiKey] = AVector.empty
+    val maybeApiKey: Option[api.model.ApiKey]       = None
 
     val cliqueId = CliqueId.generate
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -17,7 +17,7 @@
 import sbt._
 
 object Version {
-  lazy val common = "3.0.2"
+  lazy val common = "3.8.7"
 
   lazy val akka       = "2.6.20"
   lazy val rxJava     = "3.1.8"

diff --git a/tools/src/main/scala/org/alephium/tools/OpenApiUpdate.scala b/tools/src/main/scala/org/alephium/tools/OpenApiUpdate.scala
@@ -36,7 +36,7 @@ object OpenApiUpdate {
         val currencies                         = config.market.currencies
         val tokensWithPrice                    = config.market.symbolName
 
-        private val json = openApiJson(docs, dropAuth = false)
+        private val json = openApiJson(docs, dropAuth = false, truncateAddresses = true)
 
         import java.io.PrintWriter
         new PrintWriter("../app/src/main/resources/explorer-backend-openapi.json") {