added new fields; new version 2.4.0

tokenanalyst · Nov 28, 2019 · 5747c1a · 5747c1a
1 parent 1422ac3
commit 5747c1a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,4 @@
+project/target/*
+target/**
 *.class
 *.log
diff --git 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
@@ -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 :=
       </developer>
     </developers>
 
-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
diff --git 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],