Merge pull request #66 from ergoplatform/update-sigma-v4.0.1

Updated deps to use sigma v4.0.1, ergo-wallet v4.0.0
ergoplatform · Jan 26, 2021 · 4d9e660 · 4d9e660
2 parents 9291d57 + 37c4b3c
commit 4d9e660
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -121,8 +121,8 @@ assemblyMergeStrategy in assembly := {
 
 lazy val allConfigDependency = "compile->compile;test->test"
 
-val sigmaStateVersion = "3.3.1"
-val ergoWalletVersion = "v3.3.3-c42d8b5b-SNAPSHOT"
+val sigmaStateVersion = "4.0.1"
+val ergoWalletVersion = "4.0.0"
 lazy val sigmaState = ("org.scorexfoundation" %% "sigma-state" % sigmaStateVersion).force()
     .exclude("ch.qos.logback", "logback-classic")
     .exclude("org.scorexfoundation", "scrypto")

diff --git a/common/src/main/java/org/ergoplatform/appkit/AppkitProvingInterpreter.scala b/common/src/main/java/org/ergoplatform/appkit/AppkitProvingInterpreter.scala
@@ -76,19 +76,21 @@ class AppkitProvingInterpreter(
       val unsignedInput = unsignedTx.inputs(boxIdx)
       require(util.Arrays.equals(unsignedInput.boxId, inputBox.id))
 
-      val transactionContext = TransactionContext(boxesToSpend, dataBoxes, unsignedTx, boxIdx.toShort)
+      val transactionContext = TransactionContext(boxesToSpend, dataBoxes, unsignedTx)
 
-      val context = new ErgoLikeContext(ErgoInterpreter.avlTreeFromDigest(stateContext.previousStateDigest),
+      val context = new ErgoLikeContext(
+        ErgoInterpreter.avlTreeFromDigest(stateContext.previousStateDigest),
         stateContext.sigmaLastHeaders,
         stateContext.sigmaPreHeader,
         transactionContext.dataBoxes,
         transactionContext.boxesToSpend,
         transactionContext.spendingTransaction,
-        transactionContext.selfIndex,
+        boxIdx.toShort,
         ContextExtension.empty,
         ValidationRules.currentSettings,
         params.maxBlockCost,
-        currentCost
+        currentCost,
+        (params.blockVersion - 1).toByte
       )
 
       prove(inputBox.ergoTree, context, unsignedTx.messageToSign).mapOrThrow { proverResult =>