From e847035adbac46a917906ecd94ec071b3a6f4ca0 Mon Sep 17 00:00:00 2001
From: Gamzaliev Ruslan <rgamzaliev@wavesplatform.com>
Date: Thu, 24 Nov 2022 19:30:30 +0400
Subject: [PATCH] =?UTF-8?q?WE-8462=20=E2=80=93=20Fixed=20specific=20case?=
 =?UTF-8?q?=20with=20contract=20updating?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../docker/ValidatorTransactionsExecutor.scala  | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/node/src/main/scala/com/wavesenterprise/docker/ValidatorTransactionsExecutor.scala b/node/src/main/scala/com/wavesenterprise/docker/ValidatorTransactionsExecutor.scala
index 1098dcf..6ee1013 100644
--- a/node/src/main/scala/com/wavesenterprise/docker/ValidatorTransactionsExecutor.scala
+++ b/node/src/main/scala/com/wavesenterprise/docker/ValidatorTransactionsExecutor.scala
@@ -56,7 +56,11 @@ class ValidatorTransactionsExecutor(
                                              atomically: Boolean): Either[ValidationError, TransactionWithDiff] = {
     (for {
       executedTx <- ExecutedContractTransactionV1.selfSigned(nodeOwnerAccount, tx, List.empty, time.getTimestamp())
-      _ = log.debug(s"Built executed transaction '${executedTx.id()}' for '${tx.id()}'")
+      _          = log.debug(s"Built executed transaction '${executedTx.id()}' for '${tx.id()}'")
+      contractId = ContractId(tx.contractId)
+      // We need to check the validation policy before tx appending, because if the policy changes to any, we will not
+      // send validation result and miner will not be able to process the tx.
+      validationPolicyIsNotAnyBeforeAppend = validationPolicyIsNotAny(contractId)
       diff <- {
         if (atomically)
           transactionsAccumulator.processAtomically(executedTx, maybeCertChainWithCrl)
@@ -64,9 +68,12 @@ class ValidatorTransactionsExecutor(
           transactionsAccumulator.process(executedTx, maybeCertChainWithCrl)
       }
     } yield {
-      if (validationPolicyIsNotAny(tx)) {
+      def validationPolicyIsNotAnyAfterAppend: Boolean = validationPolicyIsNotAny(contractId)
+
+      if (validationPolicyIsNotAnyBeforeAppend || validationPolicyIsNotAnyAfterAppend) {
         broadcastResultsMessage(tx, List.empty, List.empty)
       }
+
       log.debug(s"Success update contract execution for tx '${tx.id()}'")
       TransactionWithDiff(executedTx, diff)
     }).leftMap { error =>
@@ -110,7 +117,7 @@ class ValidatorTransactionsExecutor(
       }
     } yield {
 
-      if (validationPolicyIsNotAny(tx)) {
+      if (validationPolicyIsNotAny(ContractId(tx.contractId))) {
         broadcastResultsMessage(tx, results, assetOperations)
       }
       log.debug(s"Success contract execution for tx '${tx.id()}'")
@@ -168,9 +175,9 @@ class ValidatorTransactionsExecutor(
   }
 
   @inline
-  private def validationPolicyIsNotAny(tx: ExecutableTransaction): Boolean = {
+  private def validationPolicyIsNotAny(contractId: ContractId): Boolean = {
     transactionsAccumulator
-      .contract(ContractId(tx.contractId))
+      .contract(contractId)
       .exists(_.validationPolicy != ValidationPolicy.Any)
   }
 }