Merge pull request #75 from virtualeconomy/contract_minor_update

contract minor update

Author: ncying

build.sbt

@@ -7,7 +7,7 @@ enablePlugins(sbtdocker.DockerPlugin, JavaServerAppPackaging, JDebPackaging, Sys
 
 name := "vsys"
 organization := "systems.v"
-version := "0.1.1"
+version := "0.2.0"
 scalaVersion in ThisBuild := "2.12.6"
 crossPaths := false
 publishArtifact in (Compile, packageDoc) := false

src/main/resources/application.conf

@@ -2,7 +2,7 @@
 vsys {
   # Node base directory
   directory = ${user.home}"/.vsys"
-  data-directory = ${user.home}"/.vsys/data"
+  data-directory = ${vsys.directory}"/data"
 
   # Application logging level. Could be TRACE | DEBUG | INFO | WARN | ERROR. Default value is INFO.
   logging-level = INFO

src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala

@@ -19,14 +19,14 @@ object FunctionalitySettings {
     mintingSpeed = 1,
     //TODO
     //set the value
-    allowContractTransactionAfterHeight = 1)
+    allowContractTransactionAfterHeight = Int.MaxValue)
 
   val TESTNET = FunctionalitySettings(
     numOfSlots = 60,
     mintingSpeed = 1,
     //TODO
     //set the value
-    allowContractTransactionAfterHeight = 1)
+    allowContractTransactionAfterHeight = 423600)
 
   val configPath = "vsys.blockchain.custom.functionality"
 }

src/main/scala/scorex/transaction/PaymentTransaction.scala

@@ -87,7 +87,7 @@ object PaymentTransaction {
       Left(ValidationError.InsufficientFee)
     } else if (Try(Math.addExact(amount, feeAmount)).isFailure) {
       Left(ValidationError.OverflowError) // CHECK THAT fee+amount won't overflow Long
-    } else if (feeScale != 100) {
+    } else if (feeScale != DefaultFeeScale) {
       Left(ValidationError.WrongFeeScale(feeScale))
     } else {
       Right(PaymentTransaction(recipient, amount, feeAmount, feeScale, timestamp, attachment, proofs))

src/main/scala/scorex/transaction/TransactionParser.scala

@@ -39,6 +39,7 @@ object TransactionParser {
   val SignatureStringLength: Int = base58Length(SignatureLength)
   val KeyLength = 32
   val SlotIdLength = 4
+  val DefaultFeeScale: Short = 100
   val KeyStringLength: Int = base58Length(KeyLength)
 
   def parseBytes(data: Array[Byte]): Try[Transaction] =

src/main/scala/scorex/transaction/lease/LeaseCancelTransaction.scala

@@ -61,7 +61,7 @@ object LeaseCancelTransaction {
       Left(ValidationError.GenericError("Lease transaction id is invalid"))
     } else if (fee <= 0) {
       Left(ValidationError.InsufficientFee)
-    } else if (feeScale != 100){
+    } else if (feeScale != DefaultFeeScale){
       Left(ValidationError.WrongFeeScale(feeScale))
     } else {
       Right(LeaseCancelTransaction(leaseId, fee, feeScale, timestamp, proofs))

src/main/scala/scorex/transaction/lease/LeaseTransaction.scala

@@ -71,7 +71,7 @@ object LeaseTransaction {
       Left(ValidationError.OverflowError)
     } else if (fee <= 0) {
       Left(ValidationError.InsufficientFee)
-    } else if (feeScale != 100) {
+    } else if (feeScale != DefaultFeeScale) {
       Left(ValidationError.WrongFeeScale(feeScale))
     } else if (recipient.isInstanceOf[Address]
       && !proofs.equals(Proofs.empty)

src/main/scala/vsys/state/opcdiffs/LoadOpcDiff.scala

@@ -17,11 +17,7 @@ object LoadOpcDiff {
   }
 
   def caller(context: ExecutionContext)(dataStack: Seq[DataEntry], pointer: Byte): Either[ValidationError, Seq[DataEntry]] = {
-    if (pointer > dataStack.length || pointer < 0) {
-      Left(ContractLocalVariableIndexOutOfRange)
-    } else {
-      Right(dataStack.patch(pointer, Seq(DataEntry(context.signers.head.bytes.arr, DataType.Address)), 1))
-    }
+    signer(context)(dataStack, pointer)
   }
 
   object LoadType extends Enumeration {

src/main/scala/vsys/transaction/contract/ExecuteContractFunctionTransaction.scala

@@ -87,7 +87,7 @@ object ExecuteContractFunctionTransaction {
       Left(ValidationError.TooBigArray)
     } else if (fee <= 0) {
       Left(ValidationError.InsufficientFee)
-    } else if (feeScale != 100) {
+    } else if (feeScale != DefaultFeeScale) {
       Left(ValidationError.WrongFeeScale(feeScale))
     } else {
       Right(ExecuteContractFunctionTransaction(contractId, funcIdx, data, attachment, fee, feeScale, timestamp, proofs))

src/main/scala/vsys/transaction/contract/RegisterContractTransaction.scala

@@ -91,7 +91,7 @@ object RegisterContractTransaction {
       Left(ValidationError.InvalidUTF8String("contractDescription"))
     } else if(fee <= 0) {
       Left(ValidationError.InsufficientFee)
-    } else if (feeScale != 100) {
+    } else if (feeScale != DefaultFeeScale) {
       Left(ValidationError.WrongFeeScale(feeScale))
     } else {
       Right(RegisterContractTransaction(contract, data, description, fee, feeScale, timestamp, proofs))

src/main/scala/vsys/transaction/database/DbPutTransaction.scala

@@ -6,7 +6,7 @@ import play.api.libs.json.{JsObject, Json}
 import scorex.account.{Address, PrivateKeyAccount, PublicKeyAccount}
 import vsys.database.{DataType, Entry}
 import scorex.serialization.{BytesSerializable, Deser}
-import scorex.transaction.TransactionParser.TransactionType
+import scorex.transaction.TransactionParser._
 import scorex.transaction.ValidationError.DbDataTypeError
 import scorex.transaction.{AssetId, ValidationError}
 import vsys.transaction.ProvenTransaction
@@ -80,7 +80,7 @@ object DbPutTransaction {
       Left(ValidationError.InvalidUTF8String("dbKey"))
     } else if(fee <= 0) {
       Left(ValidationError.InsufficientFee)
-    } else if (feeScale != 100) {
+    } else if (feeScale != DefaultFeeScale) {
       Left(ValidationError.WrongFeeScale(feeScale))
     } else {
       Right(DbPutTransaction(dbKey, dbEntry, fee, feeScale, timestamp, proofs))

src/main/scala/vsys/transaction/spos/ContendSlotsTransaction.scala

@@ -65,7 +65,7 @@ object ContendSlotsTransaction {
              proofs: Proofs): Either[ValidationError, ContendSlotsTransaction] =
     if (fee <= 0) {
       Left(ValidationError.InsufficientFee)
-    } else if (feeScale != 100){
+    } else if (feeScale != DefaultFeeScale){
       Left(ValidationError.WrongFeeScale(feeScale))
     } else if (slotId % SlotGap!= 0){
       Left(ValidationError.InvalidSlotId(slotId))

src/main/scala/vsys/transaction/spos/ReleaseSlotsTransaction.scala

@@ -65,7 +65,7 @@ object ReleaseSlotsTransaction {
              proofs: Proofs): Either[ValidationError, ReleaseSlotsTransaction] =
     if (fee <= 0) {
       Left(ValidationError.InsufficientFee)
-    } else if (feeScale != 100){
+    } else if (feeScale != DefaultFeeScale){
       Left(ValidationError.WrongFeeScale(feeScale))
     } else if (slotId % SlotGap!= 0){
       Left(ValidationError.InvalidSlotId(slotId))

src/test/scala/com/wavesplatform/settings/BlockchainSettingsSpecification.scala

@@ -95,7 +95,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers {
     settings.addressSchemeCharacter should be('T')
     settings.functionalitySettings.numOfSlots should be (60)
     settings.functionalitySettings.mintingSpeed should be (1)
-    settings.functionalitySettings.allowContractTransactionAfterHeight should be (1) // same as the setting
+    settings.functionalitySettings.allowContractTransactionAfterHeight should be (423600) // same as the setting
     settings.genesisSettings.blockTimestamp should be(1535356447650226656L)
     settings.genesisSettings.timestamp should be(1535356447650226656L)
     settings.genesisSettings.averageBlockDelay should be(60.seconds)
@@ -134,7 +134,7 @@ class BlockchainSettingsSpecification extends FlatSpec with Matchers {
     settings.addressSchemeCharacter should be('M')
     settings.functionalitySettings.numOfSlots should be (60)
     settings.functionalitySettings.mintingSpeed should be (1)
-    settings.functionalitySettings.allowContractTransactionAfterHeight should be (1) // same as the setting
+    settings.functionalitySettings.allowContractTransactionAfterHeight should be (Int.MaxValue) // same as the setting
     settings.genesisSettings.blockTimestamp should be(1543286357457333127L)
     settings.genesisSettings.timestamp should be(1543286357457333127L)
     settings.genesisSettings.signature should be(ByteStr.decodeBase58("3yYNd7quEWaWytrAug4yGwQvpL3PVJegf9d9NTv9PVE3ouBYJs5PTQqxCjd294uK1zPLj6G5Tk447LqFMWdSFvaQ").toOption)