polishing #6

ergoplatform · Apr 25, 2022 · e0f72e5 · e0f72e5
1 parent db6f718
commit e0f72e5
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/papers/emission.md b/papers/emission.md
@@ -1,4 +1,4 @@
-Emission  Retargeting Soft-Fork Proposal
+Emission Retargeting Soft-Fork Proposal
 ========================================
 
 * Author: kushti

diff --git a/src/main/resources/api/openapi.yaml b/src/main/resources/api/openapi.yaml
@@ -4897,13 +4897,13 @@ paths:
 
   /emission/scripts:
     get:
-      summary: Get emission data for a given height
-      operationId: emissionAt
+      summary: Print emission-related scripts
+      operationId: emissionScripts
       tags:
         - emission
       responses:
         '200':
-          description: Emission data
+          description: Emission-related scripts
           content:
             application/json:
               schema:

diff --git a/src/main/scala/org/ergoplatform/http/api/EmissionApiRoute.scala b/src/main/scala/org/ergoplatform/http/api/EmissionApiRoute.scala
@@ -66,7 +66,7 @@ object EmissionApiRoute {
     EmissionInfo(minerReward, totalCoinsIssued, totalRemainCoins, reemissionAmt)
   }
 
-  // todo: add totalReemitted
+  // todo: add totalReemitted ?
   implicit val encoder: Encoder[EmissionInfo] = (ei: EmissionInfo) => Json.obj(
     "minerReward" -> Json.fromLong(ei.minerReward),
     "totalCoinsIssued" -> Json.fromLong(ei.totalCoinsIssued),

diff --git a/src/main/scala/org/ergoplatform/nodeView/wallet/ErgoWallet.scala b/src/main/scala/org/ergoplatform/nodeView/wallet/ErgoWallet.scala
@@ -26,6 +26,8 @@ class ErgoWallet(historyReader: ErgoHistoryReader, settings: ErgoSettings, param
   // and also optimal number of inputs(a selector is collecting dust if transaction has less inputs than optimal).
   private val maxInputs = walletSettings.maxInputs
   private val optimalInputs = walletSettings.optimalInputs
+
+  // if checkEIP27 flag is on, we pass re-emission parameters to box selector
   private val reemissionDataOpt = if (walletSettings.checkEIP27) {
     val rs = settings.chainSettings.reemission
     Some(ReemissionData(rs.reemissionNftId, rs.reemissionTokenId))

diff --git a/src/main/scala/org/ergoplatform/nodeView/wallet/ErgoWalletSupport.scala b/src/main/scala/org/ergoplatform/nodeView/wallet/ErgoWalletSupport.scala
@@ -31,7 +31,7 @@ import scala.util.{Failure, Success, Try}
 
 trait ErgoWalletSupport extends ScorexLogging {
 
-  val ergoSettings: ErgoSettings
+  def ergoSettings: ErgoSettings
 
   private def addressEncoder = ergoSettings.chainSettings.addressEncoder
 
@@ -224,7 +224,6 @@ trait ErgoWalletSupport extends ScorexLogging {
           candidate
         case changeBox: ErgoBoxAssets =>
           // todo: is this extra check needed ?
-
           val reemissionTokenId = ergoSettings.chainSettings.reemission.reemissionTokenId
           val assets = changeBox.tokens.filterKeys(_ != reemissionTokenId).map(t => Digest32 @@ idToBytes(t._1) -> t._2).toIndexedSeq