Remove restriction that forced use of same addresses for payout and c…

…ollateral
dashpay · Nov 14, 2018 · 9adf8ad · 9adf8ad
1 parent 7c1f110
commit 9adf8ad
Showing 1 changed file with 0 additions and 11 deletions.
diff --git a/src/evo/providertx.cpp b/src/evo/providertx.cpp
@@ -101,12 +101,6 @@ bool CheckProRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CValid
         if (tx.vout[ptx.collateralOutpoint.n].nValue != 1000 * COIN) {
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-collateral");
         }
-
-        // This is a temporary restriction that will be lifted later
-        // It is required while we are transitioning from the old MN list to the deterministic list
-        if (tx.vout[ptx.collateralOutpoint.n].scriptPubKey != ptx.scriptPayout) {
-            return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
-        }
     }
     if (ptx.keyIDOwner.IsNull() || !ptx.pubKeyOperator.IsValid() || ptx.keyIDVoting.IsNull()) {
         return state.DoS(10, false, REJECT_INVALID, "bad-protx-key-null");
@@ -295,15 +289,10 @@ bool CheckProUpRegTx(const CTransaction& tx, const CBlockIndex* pindexPrev, CVal
             return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-reuse");
         }
 
-        // This is a temporary restriction that will be lifted later
-        // It is required while we are transitioning from the old MN list to the deterministic list
         Coin coin;
         if (!GetUTXOCoin(dmn->collateralOutpoint, coin)) {
             return state.DoS(100, false, REJECT_INVALID, "bad-protx-payee-collateral");
         }
-        if (coin.out.scriptPubKey != ptx.scriptPayout) {
-            return state.DoS(10, false, REJECT_INVALID, "bad-protx-payee-collateral");
-        }
 
         if (mnList.HasUniqueProperty(ptx.pubKeyOperator)) {
             auto otherDmn = mnList.GetUniquePropertyMN(ptx.pubKeyOperator);