Extra payment validation

wavesplatform · Aug 15, 2024 · 2f9e61c · 2f9e61c
1 parent 7914f70
commit 2f9e61c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/node/src/main/resources/application.conf b/node/src/main/resources/application.conf
@@ -192,7 +192,7 @@ waves {
 
     # Required number of connections (both incoming and outgoing) to attempt block generation. Setting this value to 0
     # enables "off-line generation".
-    quorum = 1
+    quorum = 3
 
     # Enable block generation only in the last block is not older the given period of time
     interval-after-last-block-then-generation-is-allowed = 1d

diff --git a/node/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala b/node/src/main/scala/com/wavesplatform/settings/BlockchainSettings.scala
@@ -78,7 +78,8 @@ case class FunctionalitySettings(
     xtnBuybackAddress: Option[String] = None,
     xtnBuybackRewardPeriod: Int = Int.MaxValue,
     lightNodeBlockFieldsAbsenceInterval: Int = 1000,
-    blockRewardBoostPeriod: Int = 1000
+    blockRewardBoostPeriod: Int = 1000,
+    paymentsCheckHeight: Int = 0
 ) {
   val allowLeasedBalanceTransferUntilHeight: Int              = blockVersion3AfterHeight
   val allowTemporaryNegativeUntil: Long                       = lastTimeBasedForkParameter
@@ -132,7 +133,8 @@ object FunctionalitySettings {
     daoAddress = Some("3PEgG7eZHLFhcfsTSaYxgRhZsh4AxMvA4Ms"),
     xtnBuybackAddress = Some("3PFjHWuH6WXNJbwnfLHqNFBpwBS5dkYjTfv"),
     xtnBuybackRewardPeriod = 100000,
-    blockRewardBoostPeriod = 300_000
+    blockRewardBoostPeriod = 300_000,
+    paymentsCheckHeight = 4303300
   )
 
   val TESTNET: FunctionalitySettings = apply(
@@ -162,7 +164,8 @@ object FunctionalitySettings {
     ethInvokePaymentsCheckHeight = 1311110,
     daoAddress = Some("3MaFVH1vTv18FjBRugSRebx259D7xtRh9ic"),
     xtnBuybackAddress = Some("3MbhiRiLFLJ1EVKNP9npRszcLLQDjwnFfZM"),
-    xtnBuybackRewardPeriod = 1000
+    xtnBuybackRewardPeriod = 1000,
+    paymentsCheckHeight = 2195900
   )
 }
 

diff --git a/node/src/main/scala/com/wavesplatform/state/diffs/invoke/InvokeScriptDiff.scala b/node/src/main/scala/com/wavesplatform/state/diffs/invoke/InvokeScriptDiff.scala
@@ -28,7 +28,6 @@ import com.wavesplatform.metrics.*
 import com.wavesplatform.state.*
 import com.wavesplatform.state.diffs.BalanceDiffValidation
 import com.wavesplatform.state.diffs.invoke.CallArgumentPolicy.*
-import com.wavesplatform.state.SnapshotBlockchain
 import com.wavesplatform.transaction.Asset.{IssuedAsset, Waves}
 import com.wavesplatform.transaction.TxValidationError.*
 import com.wavesplatform.transaction.smart.DAppEnvironment.ActionLimits
@@ -217,6 +216,13 @@ object InvokeScriptDiff {
                   wrapDAppEnv
                 ))
                 for {
+                  _ <-
+                    if (
+                      blockchain.height >= blockchain.settings.functionalitySettings.paymentsCheckHeight && blockchain
+                        .isFeatureActivated(BlockchainFeatures.LightNode)
+                    )
+                      validateIntermediateBalances(blockchain, paymentsPartInsideDApp, 0, Nil)
+                    else traced(Right(()))
                   evaluated <- CoevalR(
                     evaluateV2(
                       version,