MassTransfer feature

lunes-platform · Jun 28, 2018 · 850225a · 850225a
1 parent 93d3207
commit 850225a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/build.sbt b/build.sbt
@@ -5,7 +5,7 @@ import sbtcrossproject.CrossPlugin.autoImport.crossProject
 
 enablePlugins(GitVersioning)
 git.useGitDescribe := true
-git.baseVersion := "0.0.6"
+git.baseVersion := "0.0.7"
 name := "LunesNode"
 mainClass in Compile := Some("io.lunes.LunesNode")
 

diff --git a/src/main/scala/io/lunes/LunesNode.scala b/src/main/scala/io/lunes/LunesNode.scala
@@ -5,7 +5,6 @@ package io.lunes
   *
   */
 import java.io.File
-import java.security.Security
 import java.util.concurrent._
 
 import akka.actor.ActorSystem
@@ -341,12 +340,7 @@ object LunesNode extends ScorexLogging {
    * @param args - Command Line arguments
    */
   def main(args: Array[String]): Unit = {
-    //fixNTP()
-
-    System.setProperty("sun.net.inetaddr.ttl", "0")
-    System.setProperty("sun.net.inetaddr.negative.ttl", "0")
-    Security.setProperty("networkaddress.cache.ttl", "0")
-    Security.setProperty("networkaddress.cache.negative.ttl", "0")
+    fixNTP()
 
     SLF4JBridgeHandler.removeHandlersForRootLogger()
     SLF4JBridgeHandler.install()

diff --git a/src/main/scala/io/lunes/features/BlockchainFeature.scala b/src/main/scala/io/lunes/features/BlockchainFeature.scala
@@ -15,6 +15,5 @@ object BlockchainFeatures {
   val MassTransfer = BlockchainFeature(3)
   val SmartAccounts = BlockchainFeature(4)
 
-  val implemented: Set[Short] = Set(NG).map(_.id)
-  val preActivated: Map[Short, Int] = Set(NG).map(_.id).map{case (v: Short) =>  (v,v.toInt)}.toMap
+  val implemented: Set[Short] = Set(MassTransfer,NG).map(_.id)
 }
diff --git a/src/main/scala/io/lunes/settings/Constants.scala b/src/main/scala/io/lunes/settings/Constants.scala
@@ -6,9 +6,9 @@ import scorex.utils.ScorexLogging
   * System constants here.
   */
 object Constants extends ScorexLogging {
-  val VersionStr = "0.0.6"
-  val VersionTuple = (0, 0, 6)
-  val MinimalVersion = (0, 0, 6)
+  val VersionStr = "0.0.7"
+  val VersionTuple = (0, 0, 7)
+  val MinimalVersion = (0, 0, 7)
   val ApplicationName = "lunesnode"
   val CoinName = "LUNES"
   val CoinAbr = "LNS"

diff --git a/src/main/scala/io/lunes/state2/diffs/ExchangeTransactionDiff.scala b/src/main/scala/io/lunes/state2/diffs/ExchangeTransactionDiff.scala
@@ -5,7 +5,7 @@ import cats.implicits._
 import io.lunes.state2._
 import io.lunes.state2.reader.SnapshotStateReader
 import io.lunes.transaction.ValidationError
-import io.lunes.transaction.ValidationError.{GenericError, OrderValidationError}
+import io.lunes.transaction.ValidationError.OrderValidationError
 import io.lunes.transaction.assets.exchange.ExchangeTransaction
 
 import scala.util.Right