devnet params fix

ergoplatform · Feb 3, 2025 · 07438c6 · 07438c6
1 parent 3ea673d
commit 07438c6
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 4 deletions.
diff --git a/ergo-core/src/main/scala/org/ergoplatform/settings/Parameters.scala b/ergo-core/src/main/scala/org/ergoplatform/settings/Parameters.scala
@@ -419,7 +419,7 @@ object Parameters {
         if (p1.height != p2.height) {
           throw new Exception(s"Different height in parameters, p1 = $p1, p2 = $p2")
         }
-        if (p1.parametersTable.size <= p2.parametersTable.size) { // the only difference from matchParameters
+        if (!(p1.parametersTable.size <= p2.parametersTable.size)) { // the only difference from matchParameters
           throw new Exception(s"Parameters differ in size, p1 = $p1, p2 = $p2")
         }
         if (p1.proposedUpdate != p2.proposedUpdate) {

diff --git a/src/main/resources/devnet.conf b/src/main/resources/devnet.conf
@@ -53,7 +53,6 @@ ergo {
 
   voting {
     120 = 1
-    "rulesToDisable" = [215]
   }
 }
 scorex {

diff --git a/src/main/scala/org/ergoplatform/mining/CandidateGenerator.scala b/src/main/scala/org/ergoplatform/mining/CandidateGenerator.scala
@@ -22,7 +22,6 @@ import org.ergoplatform.nodeView.mempool.ErgoMemPoolReader
 import org.ergoplatform.nodeView.state.{ErgoState, ErgoStateContext, StateType, UtxoStateReader}
 import org.ergoplatform.settings.{ErgoSettings, ErgoValidationSettingsUpdate, Parameters}
 import org.ergoplatform.sdk.wallet.Constants.MaxAssetsPerBox
-import org.ergoplatform.settings.NetworkType.{DevNet, TestNet}
 import org.ergoplatform.wallet.interpreter.ErgoInterpreter
 import org.ergoplatform.{ErgoBox, ErgoBoxCandidate, ErgoTreePredef, Input}
 import scorex.crypto.hash.Digest32

diff --git a/src/main/scala/org/ergoplatform/settings/NetworkType.scala b/src/main/scala/org/ergoplatform/settings/NetworkType.scala
@@ -25,7 +25,7 @@ object NetworkType {
   case object TestNet extends NetworkType {
     override val verboseName: String = "testnet"
     override val isMainNet: Boolean = false
-    override val isTrstNet: Boolean = true
+    override val isTestNet: Boolean = true
     override val addressPrefix: Byte = ErgoAddressEncoder.TestnetNetworkPrefix
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -53,7 +53,6 @@ ergo { @@
       voting {
 = 1
-        "rulesToDisable" = [215]
       }
     }
     scorex {
@@ Expand Down @@