sponsored => merging renaming

ergoplatform · May 30, 2022 · ef04445 · ef04445 · Krishna60690 · Jun 13, 2022
1 parent 99a8b47
commit ef04445
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ergo-wallet/src/main/scala/org/ergoplatform/contracts/ReemissionContracts.scala b/ergo-wallet/src/main/scala/org/ergoplatform/contracts/ReemissionContracts.scala
@@ -97,7 +97,7 @@ trait ReemissionContracts {
     val correctCoinsIssued = EQ(reemissionRewardPerBlock, Minus(ExtractAmount(Self), ExtractAmount(reemissionOut)))
 
     // when reemission contract box got merged with other boxes
-    val sponsored = {
+    val merging = {
       val feeOut = secondOut
       AND(
         GT(ExtractAmount(reemissionOut), ExtractAmount(Self)),
@@ -110,7 +110,7 @@ trait ReemissionContracts {
       correctNftId,
       sameScriptRule,
       OR(
-        sponsored,
+        merging,
         AND(
           heightCorrect,
           correctMinerOutput,

diff --git a/papers/emission.md b/papers/emission.md
@@ -126,7 +126,7 @@ second one is to pay mining fee supposedly (its value can be 0.01 ERG at most)
     val correctCoinsIssued = EQ(reemissionRewardPerBlock, Minus(ExtractAmount(Self), ExtractAmount(reemissionOut)))
 
     // when reemission contract box got merged with other boxes
-    val sponsored = AND(
+    val merging = AND(
         GT(ExtractAmount(reemissionOut), ExtractAmount(Self)),
         LE(ExtractAmount(ByIndex(Outputs, IntConstant(1))), LongConstant(10000000)), // 0.01 ERG
         EQ(SizeOf(Outputs), 2)
@@ -136,7 +136,7 @@ second one is to pay mining fee supposedly (its value can be 0.01 ERG at most)
         correctNftId,
         sameScriptRule,
         OR(
-          sponsored,
+          merging,
           AND(
             heightCorrect,
             correctMinerOutput,