Adhere DEX orders to "limit order" behavior (single counter order)

README.md

@@ -12,9 +12,9 @@ Enjoy:
 
 ### DEX with partial filling contracts
 
-[Run in Scastie](https://scastie.scala-lang.org/YCzvl8NBQwa7R0pVI5mHnA)
+[Run in Scastie](https://scastie.scala-lang.org/mh3h6SrESnKJwdqZjKnVkw)
 
-[Source code](https://github.com/ergoplatform/ergo-playgrounds/blob/c91117ae0b1434b7a554028592e30a5bba15a14b/playgrounds/src/main/scala/org/ergoplatform/playgrounds/examples/AssetsAtomicExchangePlayground.scala#L1-L1)
+[Source code](https://github.com/ergoplatform/ergo-playgrounds/blob/e42b5f14e9bfc50be27d69db44e40e17a3d7e58f/playgrounds/src/main/scala/org/ergoplatform/playgrounds/examples/DEXPlayground.scala#L3)
 
 ### Assets Atomic Exchange contracts
 

build.sbt

@@ -27,7 +27,7 @@ dynverSeparator in ThisBuild := "-"
 lazy val allConfigDependency = "compile->compile;test->test"
 
 lazy val dependencies = Seq(
-  "org.ergoplatform" %% "ergo-scala-compiler" % "0.0.0-32-aaadbee1-SNAPSHOT",
+  "org.ergoplatform" %% "ergo-scala-compiler" % "0.0.0-41-13995374-SNAPSHOT",
   "org.ergoplatform" %% "ergo-appkit" % "develop-d77acfb8-SNAPSHOT"
 )
 

playground-env/src/main/scala/org/ergoplatform/playground.scala

@@ -7,9 +7,12 @@ import org.ergoplatform.playgroundenv.dsl.{
   TypesDsl
 }
 import sigmastate.Values.{SigmaPropConstant, SigmaPropValue}
+import sigmastate.eval.CompiletimeIRContext
 
 object playground extends GeneratorsDsl with TypesDsl with BoxDsl with TransactionDsl {
 
+  implicit override protected def IR = new CompiletimeIRContext()
+
   val MinTxFee: Long = 1000 * 1000
   val MinErg: Long   = 1000 * 1000
 

playground-env/src/main/scala/org/ergoplatform/playgroundenv/dsl/BoxDsl.scala

@@ -5,6 +5,7 @@ import org.ergoplatform.playgroundenv.models.TokenAmount
 import org.ergoplatform.{ErgoBox, ErgoBoxCandidate}
 import scorex.crypto.hash.Digest32
 import sigmastate.SType
+import sigmastate.SType.AnyOps
 import sigmastate.Values.{ByteArrayConstant, EvaluatedValue}
 import sigmastate.eval.Extensions._
 import sigmastate.eval._
@@ -35,38 +36,50 @@ trait BoxDsl extends TypesDsl {
     )
   }
 
-  private def liftVal[T](v: T): EvaluatedValue[SType] = v match {
-    case ba: Array[Byte] => ByteArrayConstant(ba)
+  private def liftVal(v: Any): EvaluatedValue[SType] = {
+    val (tV, newV) = v match {
+      case a: Array[Byte] => (Evaluation.rtypeOf(a.toColl).get, a.toColl)
+      case _              => (Evaluation.rtypeOf(v).get, v)
+    }
+    val elemTpe = Evaluation.rtypeToSType(tV)
+    IR.builder.mkConstant[SType](newV.asWrappedType, elemTpe)
   }
 
-  def Box[T](
+  private def liftRegVals(
+    regs: Seq[(NonMandatoryRegisterId, Any)]
+  ): Map[NonMandatoryRegisterId, EvaluatedValue[SType]] =
+    regs.map { t =>
+      (t._1, liftVal(t._2))
+    }.toMap
+
+  def Box(
     value: Long,
-    register: (NonMandatoryRegisterId, T),
-    script: ErgoContract
+    script: ErgoContract,
+    registers: (NonMandatoryRegisterId, Any)*
   ): ErgoBoxCandidate = {
     require(value > 0, s"box value shoulde be > 0, got $value")
     new ErgoBoxCandidate(
       value,
       script.ergoTree,
       0,
       Array[(TokenId, Long)]().toColl,
-      Map((register._1, liftVal(register._2)))
+      liftRegVals(registers)
     )
   }
 
   def Box(
     value: Long,
     token: (TokenInfo, Long),
-    register: (NonMandatoryRegisterId, Any),
-    script: ErgoContract
+    script: ErgoContract,
+    registers: (NonMandatoryRegisterId, Any)*
   ): ErgoBoxCandidate = {
     require(value > 0, s"box value shoulde be > 0, got $value")
     new ErgoBoxCandidate(
       value,
       script.ergoTree,
       0,
       Array[(TokenId, Long)]((Digest32 @@ token._1.tokenId.toArray, token._2)).toColl,
-      Map((register._1, liftVal(register._2)))
+      liftRegVals(registers)
     )
   }
 }

playground-env/src/main/scala/org/ergoplatform/playgroundenv/dsl/TypesDsl.scala

@@ -1,7 +1,11 @@
 package org.ergoplatform.playgroundenv.dsl
 
+import sigmastate.eval.CompiletimeIRContext
+
 trait TypesDsl {
 
+  implicit protected def IR: CompiletimeIRContext;
+
   type Coll[A]              = special.collection.Coll[A]
   type SigmaProp            = special.sigma.SigmaProp
   type ErgoContract         = org.ergoplatform.compiler.ErgoContract

playgrounds/src/main/scala/org/ergoplatform/playgrounds/examples/AssetsAtomicExchangePlayground.scala

@@ -138,16 +138,16 @@ object AssetsAtomicExchangePlayground {
 
     val sellerOutBox =
       Box(
-        value    = sellerAskNanoErgs,
-        register = (R4 -> sellOrderTransactionSigned.outputs(0).id),
-        script   = contract(sellerParty.wallet.getAddress.pubKey)
+        value     = sellerAskNanoErgs,
+        registers = (R4 -> sellOrderTransactionSigned.outputs(0).id),
+        script    = contract(sellerParty.wallet.getAddress.pubKey)
       )
 
     val buyerOutBox = Box(
-      value    = buyerSwapBoxValue,
-      token    = (token -> buyerBidTokenAmount),
-      register = (R4 -> buyOrderTransactionSigned.outputs(0).id),
-      script   = contract(buyerParty.wallet.getAddress.pubKey)
+      value     = buyerSwapBoxValue,
+      token     = (token -> buyerBidTokenAmount),
+      registers = (R4 -> buyOrderTransactionSigned.outputs(0).id),
+      script    = contract(buyerParty.wallet.getAddress.pubKey)
     )
 
     val dexParty = blockchainSim.newParty("DEX")