Merge pull request #4 from 0bsnetwork/extrascriptfee

Testnet settings, ExtraScriptFee and Testnet Supply
0bsnetwork · Mar 18, 2019 · 2df0985 · 2df0985
2 parents 1796d5d + 43a9534
commit 2df0985
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/src/main/scala/com/zbsnetwork/settings/BlockchainSettings.scala b/src/main/scala/com/zbsnetwork/settings/BlockchainSettings.scala
@@ -118,11 +118,11 @@ object GenesisSettings {
   val TESTNET = GenesisSettings(
     1538694637902L,
     1538694637902L,
-    Constants.UnitsInZbs * Constants.TotalZbs,
+    Constants.UnitsInZbs * Constants.TotalZbsTestNet,
     ByteStr.decodeBase58("24scqU9MhmHHwwjKgAaNd1wiH39yWjtokFjeTxH8suHjw4Z37UPahu9BFYV9aqwsgsgpqBrBYYRD4RwF738XGnPR").toOption,
     List(
-      GenesisTransactionSettings("3NBky6zeZav78TKabgmhKW3e4KFcx16LDVB", (Constants.UnitsInZbs * Constants.TotalZbs * 0.5).toLong),
-      GenesisTransactionSettings("3MoyfqFEEs7enk572o9iqpjLSQT5UvxJMDw", (Constants.UnitsInZbs * Constants.TotalZbs * 0.5).toLong),
+      GenesisTransactionSettings("3NBky6zeZav78TKabgmhKW3e4KFcx16LDVB", (Constants.UnitsInZbs * Constants.TotalZbsTestNet * 0.5).toLong),
+      GenesisTransactionSettings("3MoyfqFEEs7enk572o9iqpjLSQT5UvxJMDw", (Constants.UnitsInZbs * Constants.TotalZbsTestNet * 0.5).toLong),
     ),
     153722867L,
     60.seconds

diff --git a/src/main/scala/com/zbsnetwork/settings/Constants.scala b/src/main/scala/com/zbsnetwork/settings/Constants.scala
@@ -10,6 +10,7 @@ object Constants extends ScorexLogging {
   val ApplicationName = "zbs"
   val AgentName       = s"Zbs v${Version.VersionString}"
 
-  val UnitsInZbs = 100000000L
-  val TotalZbs   = 51000000L
+  val UnitsInZbs      = 100000000L
+  val TotalZbs        = 51000000L
+  val TotalZbsTestNet = 100000000L
 }
diff --git a/src/main/scala/com/zbsnetwork/state/diffs/CommonValidation.scala b/src/main/scala/com/zbsnetwork/state/diffs/CommonValidation.scala
@@ -22,7 +22,7 @@ import scala.util.{Left, Right, Try}
 
 object CommonValidation {
 
-  val ScriptExtraFee = 400000L
+  val ScriptExtraFee = 1000000L
   val FeeUnit        = 100000
 
   val FeeConstants: Map[Byte, Long] = Map(
@@ -40,7 +40,7 @@ object CommonValidation {
     DataTransaction.typeId                     -> 30,
     SetScriptTransaction.typeId                -> 10000,
     SponsorFeeTransaction.typeId               -> 50000,
-    SetAssetScriptTransaction.typeId           -> (10000 - 4),
+    SetAssetScriptTransaction.typeId           -> (10000 - 10),
     smart.ContractInvocationTransaction.typeId -> 100
   )
 

diff --git a/zbs-mainnet.conf b/zbs-mainnet.conf
@@ -49,7 +49,7 @@ zbs {
   # Vote to activate features
   features {
     auto-shutdown-on-unsupported-feature = yes
-    supported = []
+    supported = [12]
   }
 
    miner {

diff --git a/zbs-testnet.conf b/zbs-testnet.conf
@@ -48,7 +48,7 @@ zbs {
   # Vote to activate features
   features {
     auto-shutdown-on-unsupported-feature = yes
-    supported = [9,10,11]
+    supported = [9,10,11,12]
   }
 }