From 86a1b4e39c52a31daa15564643646f257f1a8cea Mon Sep 17 00:00:00 2001 From: Alexander Slesarenko Date: Tue, 4 Jun 2024 16:58:46 +0200 Subject: [PATCH 1/2] multisig-tx: update sigma dependency --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index edd1f519..509445ab 100644 --- a/build.sbt +++ b/build.sbt @@ -134,7 +134,7 @@ assemblyMergeStrategy in assembly := { lazy val allConfigDependency = "compile->compile;test->test" -val sigmaStateVersion = "5.0.14" +val sigmaStateVersion = "5.0.14-69-e71d0da3-SNAPSHOT" val ergoWalletVersion = "5.0.19-4-9f5a24bf-SNAPSHOT" lazy val sigmaState = ("org.scorexfoundation" %% "sigma-state" % sigmaStateVersion).force() .exclude("ch.qos.logback", "logback-classic") From 8b432ba42d5ef802ac647d33f252515c6bad5690 Mon Sep 17 00:00:00 2001 From: Alexander Slesarenko Date: Tue, 4 Jun 2024 17:10:04 +0200 Subject: [PATCH 2/2] multisig-tx: fix compilation --- common/src/main/java/org/ergoplatform/appkit/JavaHelpers.scala | 2 +- .../main/java/org/ergoplatform/appkit/impl/ErgoProverImpl.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/src/main/java/org/ergoplatform/appkit/JavaHelpers.scala b/common/src/main/java/org/ergoplatform/appkit/JavaHelpers.scala index 7602931e..d946d4f3 100644 --- a/common/src/main/java/org/ergoplatform/appkit/JavaHelpers.scala +++ b/common/src/main/java/org/ergoplatform/appkit/JavaHelpers.scala @@ -14,7 +14,7 @@ import sigma.ast.{EvaluatedValue, Constant, ErgoTree} import sigma.data.CSigmaDslBuilder.validationSettings import sigma.interpreter.ContextExtension import sigma.serialization.ErgoTreeSerializer -import sigmastate.eval.CompiletimeIRContext +import sigma.compiler.ir.CompiletimeIRContext import org.ergoplatform.sdk.SdkIsos._ import java.util import java.util.{List => JList} diff --git a/lib-impl/src/main/java/org/ergoplatform/appkit/impl/ErgoProverImpl.scala b/lib-impl/src/main/java/org/ergoplatform/appkit/impl/ErgoProverImpl.scala index e3057141..5f0bd238 100644 --- a/lib-impl/src/main/java/org/ergoplatform/appkit/impl/ErgoProverImpl.scala +++ b/lib-impl/src/main/java/org/ergoplatform/appkit/impl/ErgoProverImpl.scala @@ -72,7 +72,7 @@ class ErgoProverImpl(_ctx: BlockchainContextBase, } override def signReduced(tx: ReducedTransaction, baseCost: Int): SignedTransaction = { - val signed = _prover.signReduced(sdk.ReducedTransaction(tx.getTx), baseCost) + val signed = _prover.signReduced(sdk.ReducedTransaction(tx.getTx), baseCost, None) new SignedTransactionImpl(_ctx, signed.ergoTx, signed.cost) }