diff --git a/.gitignore b/.gitignore index 9c07d4a..1d529e0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ +project/target/* +target/** *.class *.log diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c58e9d..2b32d3c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +# 2.4.0 + +* added Omni field confirmations +* added Omni field invalidreason + # 2.3.0 * removed implicit config diff --git a/build.sbt b/build.sbt index c2abad9..43dddd2 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ lazy val commonSettings = Seq( organization := "io.tokenanalyst", - version := "2.3.0", + version := "2.4.0", scalaVersion := "2.12.10", description := "bitcoin-rpc") @@ -48,7 +48,8 @@ pomExtra := -val http4sVersion = "0.20.11" +val http4sVersion = "0.21.0-M5" +val circeVersion = "0.12.0-M4" lazy val http4s = Seq( "org.http4s" %% "http4s-dsl" % http4sVersion, @@ -58,9 +59,9 @@ lazy val http4s = Seq( lazy val json = Seq( "org.http4s" %% "http4s-circe" % http4sVersion, - "io.circe" %% "circe-generic" % "0.11.1", - "io.circe" %% "circe-literal" % "0.11.1", - "io.circe" %% "circe-parser" % "0.11.1" + "io.circe" %% "circe-generic" % circeVersion, + "io.circe" %% "circe-literal" % circeVersion, + "io.circe" %% "circe-parser" % circeVersion ) lazy val zmq = Seq ( diff --git a/project/project/plugins.sbt b/project/project/plugins.sbt deleted file mode 100644 index 374eb18..0000000 --- a/project/project/plugins.sbt +++ /dev/null @@ -1,6 +0,0 @@ -addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") -addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.5.0") -addSbtPlugin("com.frugalmechanic" % "fm-sbt-s3-resolver" % "0.19.0") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.8") -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") \ No newline at end of file diff --git a/src/main/scala/omni/Protocol.scala b/src/main/scala/omni/Protocol.scala index 1fba438..b236671 100644 --- a/src/main/scala/omni/Protocol.scala +++ b/src/main/scala/omni/Protocol.scala @@ -23,10 +23,12 @@ object Protocol { txid: String, block: Long, blockhash: String, + confirmations: Int, positioninblock: Option[Int], version: Option[Int], blocktime: Long, valid: Option[Boolean], + invalidreason: Option[String], type_int: Option[Int], `type`: Option[String], propertyid: Option[Int],