From dbd8b101a3c5ff5fdeedd060842f1668bb3ee446 Mon Sep 17 00:00:00 2001 From: Sergey Nazarov Date: Mon, 9 Oct 2023 16:01:17 +0400 Subject: [PATCH] Version 1.5.0 (Stagenet) (#3889) --- .../com/wavesplatform/it/BaseTargetChecker.scala | 2 +- .../src/test/scala/com/wavesplatform/it/Docker.scala | 2 +- .../wavesplatform/it/sync/BlockChallengeSuite.scala | 2 +- .../wavesplatform/features/BlockchainFeature.scala | 4 ++-- .../wavesplatform/features/RideVersionProvider.scala | 4 ++-- .../main/scala/com/wavesplatform/mining/Miner.scala | 2 +- node/src/main/scala/com/wavesplatform/package.scala | 2 +- .../com/wavesplatform/state/appender/package.scala | 4 ++-- .../com/wavesplatform/state/diffs/BlockDiffer.scala | 2 +- .../wavesplatform/state/diffs/CommonValidation.scala | 8 ++++---- .../state/diffs/ExchangeTransactionDiff.scala | 2 +- .../test/scala/com/wavesplatform/db/WithState.scala | 6 +++--- .../scala/com/wavesplatform/history/Domain.scala | 8 ++++---- .../com/wavesplatform/state/BlockChallengeTest.scala | 12 ++++++------ .../state/diffs/ExchangeTransactionDiffTest.scala | 4 ++-- .../smart/predef/RideVersionDeactivationTest.scala | 2 +- .../diffs/smart/predef/TransactionBindingsTest.scala | 8 ++++---- .../scala/com/wavesplatform/test/DomainPresets.scala | 2 +- .../transaction/InvokeScriptComplexitySpec.scala | 2 +- .../com/wavesplatform/utx/UtxPoolSpecification.scala | 2 +- project/Dependencies.scala | 2 +- version.sbt | 2 +- 22 files changed, 42 insertions(+), 42 deletions(-) diff --git a/node-it/src/test/scala/com/wavesplatform/it/BaseTargetChecker.scala b/node-it/src/test/scala/com/wavesplatform/it/BaseTargetChecker.scala index 857155a4db..ebc35669cd 100644 --- a/node-it/src/test/scala/com/wavesplatform/it/BaseTargetChecker.scala +++ b/node-it/src/test/scala/com/wavesplatform/it/BaseTargetChecker.scala @@ -35,7 +35,7 @@ object BaseTargetChecker { .genesis( settings.blockchainSettings.genesisSettings, blockchainUpdater.isFeatureActivated(BlockchainFeatures.RideV6), - blockchainUpdater.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot) + blockchainUpdater.isFeatureActivated(BlockchainFeatures.LightNode) ) .explicitGet() blockchainUpdater.processBlock(genesisBlock, genesisBlock.header.generationSignature, None) diff --git a/node-it/src/test/scala/com/wavesplatform/it/Docker.scala b/node-it/src/test/scala/com/wavesplatform/it/Docker.scala index 460542f689..9e643ee19e 100644 --- a/node-it/src/test/scala/com/wavesplatform/it/Docker.scala +++ b/node-it/src/test/scala/com/wavesplatform/it/Docker.scala @@ -579,7 +579,7 @@ object Docker { .resolve() .getAs[Map[Short, Int]]("waves.blockchain.custom.functionality.pre-activated-features") val isRideV6Activated = features.exists(_.get(BlockchainFeatures.RideV6.id).contains(0)) - val isTxStateSnapshotActivated = features.exists(_.get(BlockchainFeatures.TransactionStateSnapshot.id).contains(0)) + val isTxStateSnapshotActivated = features.exists(_.get(BlockchainFeatures.LightNode.id).contains(0)) val genesisSignature = Block.genesis(gs, isRideV6Activated, isTxStateSnapshotActivated).explicitGet().id() diff --git a/node-it/src/test/scala/com/wavesplatform/it/sync/BlockChallengeSuite.scala b/node-it/src/test/scala/com/wavesplatform/it/sync/BlockChallengeSuite.scala index ee9ca74b85..05d16dbecf 100644 --- a/node-it/src/test/scala/com/wavesplatform/it/sync/BlockChallengeSuite.scala +++ b/node-it/src/test/scala/com/wavesplatform/it/sync/BlockChallengeSuite.scala @@ -33,7 +33,7 @@ class BlockChallengeSuite extends BaseFunSuite with TransferSending { BlockchainFeatures.SynchronousCalls.id.toInt -> 0, BlockchainFeatures.RideV6.id.toInt -> 0, BlockchainFeatures.ConsensusImprovements.id.toInt -> 0, - BlockchainFeatures.TransactionStateSnapshot.id.toInt -> 0 + BlockchainFeatures.LightNode.id.toInt -> 0 ) ) .withDefault(1) diff --git a/node/src/main/scala/com/wavesplatform/features/BlockchainFeature.scala b/node/src/main/scala/com/wavesplatform/features/BlockchainFeature.scala index 293c6a11d1..4667f77767 100644 --- a/node/src/main/scala/com/wavesplatform/features/BlockchainFeature.scala +++ b/node/src/main/scala/com/wavesplatform/features/BlockchainFeature.scala @@ -25,7 +25,7 @@ object BlockchainFeatures { val BlockRewardDistribution = BlockchainFeature(19, "Block Reward Distribution") val CappedReward = BlockchainFeature(20, "Capped XTN buy-back & DAO amounts") val CeaseXtnBuyback = BlockchainFeature(21, "Cease XTN buy-back") - val TransactionStateSnapshot = BlockchainFeature(22, "Transaction State Snapshot") + val LightNode = BlockchainFeature(22, "Light Node") // Not exposed val ContinuationTransaction = BlockchainFeature(23, "Continuation Transaction") @@ -56,7 +56,7 @@ object BlockchainFeatures { BlockRewardDistribution, CappedReward, CeaseXtnBuyback, - TransactionStateSnapshot + LightNode ).map(f => f.id -> f).toMap val implemented: Set[Short] = dict.keySet diff --git a/node/src/main/scala/com/wavesplatform/features/RideVersionProvider.scala b/node/src/main/scala/com/wavesplatform/features/RideVersionProvider.scala index 1128fb4408..fd18daf3dd 100644 --- a/node/src/main/scala/com/wavesplatform/features/RideVersionProvider.scala +++ b/node/src/main/scala/com/wavesplatform/features/RideVersionProvider.scala @@ -1,6 +1,6 @@ package com.wavesplatform.features -import com.wavesplatform.features.BlockchainFeatures.{BlockRewardDistribution, BlockV5, Ride4DApps, RideV6, SynchronousCalls, TransactionStateSnapshot} +import com.wavesplatform.features.BlockchainFeatures.{BlockRewardDistribution, BlockV5, Ride4DApps, RideV6, SynchronousCalls, LightNode} import com.wavesplatform.lang.directives.DirectiveDictionary import com.wavesplatform.lang.directives.values.* import com.wavesplatform.state.Blockchain @@ -8,7 +8,7 @@ import com.wavesplatform.state.Blockchain object RideVersionProvider { val actualVersionByFeature = List( - TransactionStateSnapshot -> V8, + LightNode -> V8, BlockRewardDistribution -> V7, RideV6 -> V6, SynchronousCalls -> V5, diff --git a/node/src/main/scala/com/wavesplatform/mining/Miner.scala b/node/src/main/scala/com/wavesplatform/mining/Miner.scala index 6a6dff83e2..ec84c72047 100644 --- a/node/src/main/scala/com/wavesplatform/mining/Miner.scala +++ b/node/src/main/scala/com/wavesplatform/mining/Miner.scala @@ -192,7 +192,7 @@ class MinerImpl( ) consensusData <- consensusData(height, account, lastBlockHeader, blockTime) prevStateHash = - if (blockchainUpdater.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot, blockchainUpdater.height + 1)) + if (blockchainUpdater.isFeatureActivated(BlockchainFeatures.LightNode, blockchainUpdater.height + 1)) Some(blockchainUpdater.lastStateHash(Some(reference))) else None (unconfirmed, totalConstraint, stateHash) = packTransactionsForKeyBlock(account.toAddress, reference, prevStateHash) diff --git a/node/src/main/scala/com/wavesplatform/package.scala b/node/src/main/scala/com/wavesplatform/package.scala index d9fc199deb..608615c028 100644 --- a/node/src/main/scala/com/wavesplatform/package.scala +++ b/node/src/main/scala/com/wavesplatform/package.scala @@ -38,7 +38,7 @@ package object wavesplatform { .genesis( settings.blockchainSettings.genesisSettings, blockchainUpdater.isFeatureActivated(BlockchainFeatures.RideV6), - blockchainUpdater.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot) + blockchainUpdater.isFeatureActivated(BlockchainFeatures.LightNode) ) .flatMap { genesis => logger.trace(s"Genesis block json: ${genesis.json()}") diff --git a/node/src/main/scala/com/wavesplatform/state/appender/package.scala b/node/src/main/scala/com/wavesplatform/state/appender/package.scala index 2285122f49..9d61ba9312 100644 --- a/node/src/main/scala/com/wavesplatform/state/appender/package.scala +++ b/node/src/main/scala/com/wavesplatform/state/appender/package.scala @@ -180,7 +180,7 @@ package object appender { private def validateChallengedHeader(block: Block, blockchain: Blockchain): Either[ValidationError, Unit] = for { _ <- Either.cond( - block.header.challengedHeader.isEmpty || blockchain.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot, blockchain.height + 1), + block.header.challengedHeader.isEmpty || blockchain.isFeatureActivated(BlockchainFeatures.LightNode, blockchain.height + 1), (), BlockAppendError("Challenged header is not supported yet", block) ) @@ -193,7 +193,7 @@ package object appender { private def validateStateHash(block: Block, blockchain: Blockchain): Either[ValidationError, Unit] = Either.cond( - block.header.stateHash.isEmpty || blockchain.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot, blockchain.height + 1), + block.header.stateHash.isEmpty || blockchain.isFeatureActivated(BlockchainFeatures.LightNode, blockchain.height + 1), (), BlockAppendError("Block state hash is not supported yet", block) ) diff --git a/node/src/main/scala/com/wavesplatform/state/diffs/BlockDiffer.scala b/node/src/main/scala/com/wavesplatform/state/diffs/BlockDiffer.scala index d008dde196..310a6daa2f 100644 --- a/node/src/main/scala/com/wavesplatform/state/diffs/BlockDiffer.scala +++ b/node/src/main/scala/com/wavesplatform/state/diffs/BlockDiffer.scala @@ -498,7 +498,7 @@ object BlockDiffer { ): TracedResult[ValidationError, Unit] = TracedResult( Either.cond( - !blockchain.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot) || blockStateHash.contains(computedStateHash), + !blockchain.isFeatureActivated(BlockchainFeatures.LightNode) || blockStateHash.contains(computedStateHash), (), InvalidStateHash(blockStateHash) ) diff --git a/node/src/main/scala/com/wavesplatform/state/diffs/CommonValidation.scala b/node/src/main/scala/com/wavesplatform/state/diffs/CommonValidation.scala index 39313b0ea6..d4d58d7adb 100644 --- a/node/src/main/scala/com/wavesplatform/state/diffs/CommonValidation.scala +++ b/node/src/main/scala/com/wavesplatform/state/diffs/CommonValidation.scala @@ -3,7 +3,7 @@ package com.wavesplatform.state.diffs import cats.implicits.toBifunctorOps import com.wavesplatform.account.{Address, AddressScheme} import com.wavesplatform.database.patch.DisableHijackedAliases -import com.wavesplatform.features.BlockchainFeatures.TransactionStateSnapshot +import com.wavesplatform.features.BlockchainFeatures.LightNode import com.wavesplatform.features.OverdraftValidationProvider.* import com.wavesplatform.features.{BlockchainFeature, BlockchainFeatures, RideVersionProvider} import com.wavesplatform.lang.ValidationError @@ -146,8 +146,8 @@ object CommonValidation { } def oldScriptVersionDeactivation(sc: Script): Either[ActivationError, Unit] = sc.stdLibVersion match { - case V1 | V2 | V3 if blockchain.isFeatureActivated(TransactionStateSnapshot) => - Left(ActivationError(s"Script version below V4 is not allowed after ${TransactionStateSnapshot.description} feature activation")) + case V1 | V2 | V3 if blockchain.isFeatureActivated(LightNode) => + Left(ActivationError(s"Script version below V4 is not allowed after ${LightNode.description} feature activation")) case _ => Right(()) } @@ -172,7 +172,7 @@ object CommonValidation { } val versionsBarrier = tx match { - case v: VersionedTransaction if !TransactionParsers.versionIsCorrect(v) && blockchain.isFeatureActivated(TransactionStateSnapshot) => + case v: VersionedTransaction if !TransactionParsers.versionIsCorrect(v) && blockchain.isFeatureActivated(LightNode) => Left(UnsupportedTypeAndVersion(v.tpe.id.toByte, v.version)) case p: PBSince if p.isProtobufVersion => diff --git a/node/src/main/scala/com/wavesplatform/state/diffs/ExchangeTransactionDiff.scala b/node/src/main/scala/com/wavesplatform/state/diffs/ExchangeTransactionDiff.scala index 5d09e8f466..9d1058f428 100644 --- a/node/src/main/scala/com/wavesplatform/state/diffs/ExchangeTransactionDiff.scala +++ b/node/src/main/scala/com/wavesplatform/state/diffs/ExchangeTransactionDiff.scala @@ -294,7 +294,7 @@ object ExchangeTransactionDiff { private def checkAttachment(order: Order, blockchain: Blockchain): Either[GenericError, Unit] = for { _ <- Either.cond( - order.attachment.isEmpty || blockchain.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot), + order.attachment.isEmpty || blockchain.isFeatureActivated(BlockchainFeatures.LightNode), (), GenericError("Attachment field for orders is not supported yet") ) diff --git a/node/src/test/scala/com/wavesplatform/db/WithState.scala b/node/src/test/scala/com/wavesplatform/db/WithState.scala index 825e93419d..42bba1cb50 100644 --- a/node/src/test/scala/com/wavesplatform/db/WithState.scala +++ b/node/src/test/scala/com/wavesplatform/db/WithState.scala @@ -11,7 +11,7 @@ import com.wavesplatform.database.{KeyTags, RDB, RocksDBWriter, TestStorageFacto import com.wavesplatform.db.WithState.AddrWithBalance import com.wavesplatform.events.BlockchainUpdateTriggers import com.wavesplatform.features.BlockchainFeatures -import com.wavesplatform.features.BlockchainFeatures.TransactionStateSnapshot +import com.wavesplatform.features.BlockchainFeatures.LightNode import com.wavesplatform.history.SnapshotOps.TransactionStateSnapshotExt import com.wavesplatform.history.{Domain, SnapshotOps} import com.wavesplatform.lagonaki.mocks.TestBlock @@ -317,7 +317,7 @@ trait WithState extends BeforeAndAfterAll with DBCacheSettings with Matchers wit signer: KeyPair, blockchain: BlockchainUpdater & Blockchain ): TracedResult[ValidationError, Block] = { - (if (blockchain.isFeatureActivated(TransactionStateSnapshot, blockchain.height + 1)) { + (if (blockchain.isFeatureActivated(LightNode, blockchain.height + 1)) { val compBlockchain = SnapshotBlockchain(blockchain, StateSnapshot.empty, blockWithoutStateHash, ByteStr.empty, 0, blockchain.computeNextReward, None) val prevStateHash = blockchain.lastStateHash(Some(blockWithoutStateHash.header.reference)) @@ -400,7 +400,7 @@ trait WithDomain extends WithState { _: Suite => domain.appendBlock( createGenesisWithStateHash( genesis, - bcu.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot, 1), + bcu.isFeatureActivated(BlockchainFeatures.LightNode, 1), Some(settings.blockchainSettings.genesisSettings.initialBaseTarget) ) ) diff --git a/node/src/test/scala/com/wavesplatform/history/Domain.scala b/node/src/test/scala/com/wavesplatform/history/Domain.scala index 97db038dee..fd8bf4215d 100644 --- a/node/src/test/scala/com/wavesplatform/history/Domain.scala +++ b/node/src/test/scala/com/wavesplatform/history/Domain.scala @@ -14,7 +14,7 @@ import com.wavesplatform.consensus.{PoSCalculator, PoSSelector} import com.wavesplatform.database.{DBExt, Keys, RDB, RocksDBWriter} import com.wavesplatform.events.BlockchainUpdateTriggers import com.wavesplatform.features.BlockchainFeatures -import com.wavesplatform.features.BlockchainFeatures.{BlockV5, RideV6, TransactionStateSnapshot} +import com.wavesplatform.features.BlockchainFeatures.{BlockV5, RideV6, LightNode} import com.wavesplatform.history.SnapshotOps.TransactionStateSnapshotExt import com.wavesplatform.lagonaki.mocks.TestBlock import com.wavesplatform.lang.ValidationError @@ -30,7 +30,7 @@ import com.wavesplatform.state.reader.SnapshotBlockchain import com.wavesplatform.test.TestTime import com.wavesplatform.transaction.Asset.{IssuedAsset, Waves} import com.wavesplatform.transaction.smart.script.trace.TracedResult -import com.wavesplatform.transaction.{BlockchainUpdater, *} +import com.wavesplatform.transaction.* import com.wavesplatform.utils.{EthEncoding, SystemTime} import com.wavesplatform.utx.UtxPoolImpl import com.wavesplatform.wallet.Wallet @@ -300,7 +300,7 @@ case class Domain(rdb: RDB, blockchainUpdater: BlockchainUpdaterImpl, rocksDBWri ): Either[ValidationError, MicroBlock] = { val lastBlock = this.lastBlock val blockSigner = signer.getOrElse(defaultSigner) - val stateHashE = if (blockchain.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot)) { + val stateHashE = if (blockchain.isFeatureActivated(BlockchainFeatures.LightNode)) { stateHash .map(Right(_)) .getOrElse( @@ -447,7 +447,7 @@ case class Domain(rdb: RDB, blockchainUpdater: BlockchainUpdaterImpl, rocksDBWri challengedHeader = challengedHeader ) resultStateHash <- stateHash.map(Right(_)).getOrElse { - if (blockchain.isFeatureActivated(TransactionStateSnapshot, blockchain.height + 1)) { + if (blockchain.isFeatureActivated(LightNode, blockchain.height + 1)) { val hitSource = posSelector.validateGenerationSignature(blockWithoutStateHash).getOrElse(blockWithoutStateHash.header.generationSignature) val blockchainWithNewBlock = SnapshotBlockchain(blockchain, StateSnapshot.empty, blockWithoutStateHash, hitSource, 0, blockchain.computeNextReward, None) diff --git a/node/src/test/scala/com/wavesplatform/state/BlockChallengeTest.scala b/node/src/test/scala/com/wavesplatform/state/BlockChallengeTest.scala index 3d9841c28c..f40885f640 100644 --- a/node/src/test/scala/com/wavesplatform/state/BlockChallengeTest.scala +++ b/node/src/test/scala/com/wavesplatform/state/BlockChallengeTest.scala @@ -236,7 +236,7 @@ class BlockChallengeTest extends PropSpec with WithDomain with ScalatestRouteTes } property( - s"NODE-889. Block without challenge (before ${BlockchainFeatures.TransactionStateSnapshot} activation) should not contain ChallengedHeader" + s"NODE-889. Block without challenge (before ${BlockchainFeatures.LightNode} activation) should not contain ChallengedHeader" ) { val sender = TxHelpers.signer(1) val challengedMiner = TxHelpers.signer(2) @@ -1032,11 +1032,11 @@ class BlockChallengeTest extends PropSpec with WithDomain with ScalatestRouteTes } } - property(s"NODE-910. Block at ${BlockchainFeatures.TransactionStateSnapshot} activation height can be challenged") { + property(s"NODE-910. Block at ${BlockchainFeatures.LightNode} activation height can be challenged") { withDomain( DomainPresets.BlockRewardDistribution .addFeatures(BlockchainFeatures.SmallerMinimalGeneratingBalance) - .setFeaturesHeight(BlockchainFeatures.TransactionStateSnapshot -> 1003), + .setFeaturesHeight(BlockchainFeatures.LightNode -> 1003), balances = AddrWithBalance.enoughBalances(defaultSigner) ) { d => val challengingMiner = d.wallet.generateNewAccount().get @@ -1044,7 +1044,7 @@ class BlockChallengeTest extends PropSpec with WithDomain with ScalatestRouteTes d.appendBlock(TxHelpers.transfer(defaultSigner, challengingMiner.toAddress, 1000.waves)) (1 to 1000).foreach(_ => d.appendBlock()) - d.blockchain.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot) shouldBe false + d.blockchain.isFeatureActivated(BlockchainFeatures.LightNode) shouldBe false val originalBlock = d.createBlock( Block.ProtoBlockVersion, @@ -1107,7 +1107,7 @@ class BlockChallengeTest extends PropSpec with WithDomain with ScalatestRouteTes withDomain( DomainPresets.BlockRewardDistribution .addFeatures(BlockchainFeatures.SmallerMinimalGeneratingBalance) - .setFeaturesHeight(BlockchainFeatures.TransactionStateSnapshot -> 1008), + .setFeaturesHeight(BlockchainFeatures.LightNode -> 1008), balances = AddrWithBalance.enoughBalances(sender) ) { d => val challengingMiner = d.wallet.generateNewAccount().get @@ -1975,7 +1975,7 @@ class BlockChallengeTest extends PropSpec with WithDomain with ScalatestRouteTes private def rollbackActivationHeightScenario(d: Domain, challengedMiner: KeyPair, txs: Seq[Transaction]): Assertion = { (1 to 6).foreach(_ => d.appendBlock()) - d.blockchain.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot) shouldBe false + d.blockchain.isFeatureActivated(BlockchainFeatures.LightNode) shouldBe false val originalBlock = d.createBlock( Block.ProtoBlockVersion, diff --git a/node/src/test/scala/com/wavesplatform/state/diffs/ExchangeTransactionDiffTest.scala b/node/src/test/scala/com/wavesplatform/state/diffs/ExchangeTransactionDiffTest.scala index 3049c87b1f..94bc8008ad 100644 --- a/node/src/test/scala/com/wavesplatform/state/diffs/ExchangeTransactionDiffTest.scala +++ b/node/src/test/scala/com/wavesplatform/state/diffs/ExchangeTransactionDiffTest.scala @@ -1999,12 +1999,12 @@ class ExchangeTransactionDiffTest extends PropSpec with Inside with WithDomain w } } - property(s"NODE-970. Non-empty attachment field is allowed only after ${BlockchainFeatures.TransactionStateSnapshot.description} activation") { + property(s"NODE-970. Non-empty attachment field is allowed only after ${BlockchainFeatures.LightNode.description} activation") { val matcher = TxHelpers.defaultSigner val issuer = TxHelpers.secondSigner withDomain( - ConsensusImprovements.setFeaturesHeight(BlockchainFeatures.TransactionStateSnapshot -> 4), + ConsensusImprovements.setFeaturesHeight(BlockchainFeatures.LightNode -> 4), AddrWithBalance.enoughBalances(matcher, issuer) ) { d => val issue = TxHelpers.issue(issuer) diff --git a/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/RideVersionDeactivationTest.scala b/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/RideVersionDeactivationTest.scala index 56c47ffc68..d52b4e7c89 100644 --- a/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/RideVersionDeactivationTest.scala +++ b/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/RideVersionDeactivationTest.scala @@ -24,7 +24,7 @@ class RideVersionDeactivationTest extends PropSpec with WithDomain { property(s"RIDE V1, V2, V3 are forbidden after TransactionStateSnapshot") { withDomain( - TransactionStateSnapshot.setFeaturesHeight(BlockchainFeatures.TransactionStateSnapshot -> 4), + TransactionStateSnapshot.setFeaturesHeight(BlockchainFeatures.LightNode -> 4), AddrWithBalance.enoughBalances(defaultSigner) ) { d => val issueTx = issue(script = Some(verifier(V7))) diff --git a/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/TransactionBindingsTest.scala b/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/TransactionBindingsTest.scala index ae0b763e2d..79618f62b3 100644 --- a/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/TransactionBindingsTest.scala +++ b/node/src/test/scala/com/wavesplatform/state/diffs/smart/predef/TransactionBindingsTest.scala @@ -781,7 +781,7 @@ class TransactionBindingsTest extends PropSpec with PathMockFactory with EitherV } property( - s"NODE-1039. Orders should contain attachment field in Ride version >= V8 after ${BlockchainFeatures.TransactionStateSnapshot} activation" + s"NODE-1039. Orders should contain attachment field in Ride version >= V8 after ${BlockchainFeatures.LightNode} activation" ) { val issuer = TxHelpers.signer(1) val buyer = TxHelpers.signer(2) @@ -835,7 +835,7 @@ class TransactionBindingsTest extends PropSpec with PathMockFactory with EitherV TestCompiler(v).compileExpressionE(script) should produce("Undefined field `attachment` of variable of type `Order`") withDomain( - DomainPresets.BlockRewardDistribution.setFeaturesHeight(BlockchainFeatures.TransactionStateSnapshot -> Int.MaxValue), + DomainPresets.BlockRewardDistribution.setFeaturesHeight(BlockchainFeatures.LightNode -> Int.MaxValue), AddrWithBalance.enoughBalances(issuer, matcher, buyer) ) { d => d.appendBlock(issue) @@ -846,12 +846,12 @@ class TransactionBindingsTest extends PropSpec with PathMockFactory with EitherV } withDomain( - DomainPresets.BlockRewardDistribution.setFeaturesHeight(BlockchainFeatures.TransactionStateSnapshot -> 4), + DomainPresets.BlockRewardDistribution.setFeaturesHeight(BlockchainFeatures.LightNode -> 4), AddrWithBalance.enoughBalances(issuer, matcher, buyer) ) { d => d.appendBlock(issue) - d.appendBlockE(TxHelpers.setScript(smartAcc, compiledScript)) should produce("Transaction State Snapshot feature has not been activated yet") + d.appendBlockE(TxHelpers.setScript(smartAcc, compiledScript)) should produce("Light Node feature has not been activated yet") d.appendBlock() d.appendBlockE(TxHelpers.setScript(smartAcc, compiledScript)) should beRight diff --git a/node/src/test/scala/com/wavesplatform/test/DomainPresets.scala b/node/src/test/scala/com/wavesplatform/test/DomainPresets.scala index 15379b8ec4..09ed712fe0 100644 --- a/node/src/test/scala/com/wavesplatform/test/DomainPresets.scala +++ b/node/src/test/scala/com/wavesplatform/test/DomainPresets.scala @@ -100,7 +100,7 @@ object DomainPresets { featuresSettings = RideV6.featuresSettings.copy(autoShutdownOnUnsupportedFeature = false) ) - val TransactionStateSnapshot: WavesSettings = BlockRewardDistribution.addFeatures(BlockchainFeatures.TransactionStateSnapshot) + val TransactionStateSnapshot: WavesSettings = BlockRewardDistribution.addFeatures(BlockchainFeatures.LightNode) def settingsForRide(version: StdLibVersion): WavesSettings = version match { diff --git a/node/src/test/scala/com/wavesplatform/transaction/InvokeScriptComplexitySpec.scala b/node/src/test/scala/com/wavesplatform/transaction/InvokeScriptComplexitySpec.scala index d4635b23a3..b51715ac5a 100644 --- a/node/src/test/scala/com/wavesplatform/transaction/InvokeScriptComplexitySpec.scala +++ b/node/src/test/scala/com/wavesplatform/transaction/InvokeScriptComplexitySpec.scala @@ -65,7 +65,7 @@ class InvokeScriptComplexitySpec extends FreeSpec with WithDomain with NTPTime { private[this] val settings = domainSettingsWithFS( SettingsFromDefaultConfig.blockchainSettings.functionalitySettings.copy(preActivatedFeatures = BlockchainFeatures.implemented - .excl(BlockchainFeatures.TransactionStateSnapshot.id) + .excl(BlockchainFeatures.LightNode.id) .map { case v @ BlockchainFeatures.FeeSponsorship.id => v -> -SettingsFromDefaultConfig.blockchainSettings.functionalitySettings.featureCheckBlocksPeriod diff --git a/node/src/test/scala/com/wavesplatform/utx/UtxPoolSpecification.scala b/node/src/test/scala/com/wavesplatform/utx/UtxPoolSpecification.scala index 2dbf1c38d2..68f1c1f03a 100644 --- a/node/src/test/scala/com/wavesplatform/utx/UtxPoolSpecification.scala +++ b/node/src/test/scala/com/wavesplatform/utx/UtxPoolSpecification.scala @@ -97,7 +97,7 @@ class UtxPoolSpecification extends FreeSpec with MockFactory with BlocksTransact .genesis( genesisSettings, bcu.isFeatureActivated(BlockchainFeatures.RideV6), - bcu.isFeatureActivated(BlockchainFeatures.TransactionStateSnapshot) + bcu.isFeatureActivated(BlockchainFeatures.LightNode) ) .explicitGet() ) should beRight diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e2d5fbc5fd..155d73d95e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,7 +6,7 @@ import sbt.{Def, _} object Dependencies { // Node protobuf schemas private[this] val protoSchemasLib = - "com.wavesplatform" % "protobuf-schemas" % "1.5.0-SNAPSHOT" classifier "protobuf-src" intransitive () + "com.wavesplatform" % "protobuf-schemas" % "1.5.0" classifier "protobuf-src" intransitive () def akkaModule(module: String): ModuleID = "com.typesafe.akka" %% s"akka-$module" % "2.6.20" diff --git a/version.sbt b/version.sbt index db528df359..41ba891c00 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -git.baseVersion := "1.4.18" +git.baseVersion := "1.5.0"