wip

wavesplatform · Nov 23, 2023 · dbdb722 · dbdb722
1 parent 5a68c59
commit dbdb722
Show file tree

Hide file tree

Showing 22 changed files with 1,991 additions and 2,187 deletions.
diff --git a/node/src/main/scala/com/wavesplatform/state/TxStateSnapshotHashBuilder.scala b/node/src/main/scala/com/wavesplatform/state/TxStateSnapshotHashBuilder.scala
@@ -54,9 +54,9 @@ object TxStateSnapshotHashBuilder {
       changedKeys += address.bytes ++ alias.name.getBytes(StandardCharsets.UTF_8)
     }
 
-    snapshot.accountScriptsByAddress.foreach { case (address, sv) =>
-      changedKeys += address.bytes ++ (sv match {
-        case Some(s) => s.script.bytes().arr ++ s.publicKey.arr ++ Longs.toByteArray(s.verifierComplexity)
+    snapshot.accountScripts.foreach { case (pk, sv) =>
+      changedKeys += pk.arr ++ (sv match {
+        case Some(s) => s.script.bytes().arr ++ Longs.toByteArray(s.verifierComplexity)
         case None    => Array.emptyByteArray
       })
     }

diff --git a/node/src/test/scala/com/wavesplatform/TestValues.scala b/node/src/test/scala/com/wavesplatform/TestValues.scala
@@ -23,7 +23,7 @@ object TestValues {
   def invokeFee(scripts: Int = 0, issues: Int = 0): Long =
     invokeFee + scripts * ScriptExtraFee + issues * FeeConstants(TransactionType.Issue) * FeeUnit
 
-  val (script, scriptComplexity) = ScriptCompiler
+  lazy val (script, scriptComplexity) = ScriptCompiler
     .compile(
       """
       |{-# STDLIB_VERSION 2 #-}
@@ -35,7 +35,7 @@ object TestValues {
     )
     .explicitGet()
 
-  val (assetScript, assetScriptComplexity) = ScriptCompiler
+  lazy val (assetScript, assetScriptComplexity) = ScriptCompiler
     .compile(
       """
       |{-# STDLIB_VERSION 2 #-}
@@ -47,7 +47,7 @@ object TestValues {
     )
     .explicitGet()
 
-  val (rejectAssetScript, rejectAssetScriptComplexity) = ScriptCompiler
+  lazy val (rejectAssetScript, rejectAssetScriptComplexity) = ScriptCompiler
     .compile(
       """
       |{-# STDLIB_VERSION 2 #-}