MS: fixed error in handeling of tx locking when a tx comes from a minted address, also added a check for protocol change (#18)

Author: Fim-84

daemon/main.cpp

@@ -996,7 +996,7 @@ bool MoneyRange(CAmount nValueOut)
 // Stop transactions from happening during locking period
 bool CheckIfLockPeriodIsActive(CTransaction tx)
 {
- bool transactionOK = false;
+ //bool transactionOK = false;
  restclient *rc = get_restclient();
 
  if (!rc->getdatafromrestserver()) {
@@ -1005,22 +1005,42 @@ bool CheckIfLockPeriodIsActive(CTransaction tx)
 
  std::vector<mint> mints = rc->getMints();
 
+ CTransaction prevoutTx;
+ uint256 prevoutHashBlock;
  for (mint mint : mints) {
+ CBitcoinAddress address = mint.getAddress();
+ if (!address.IsValid()) {
+ continue;
+ }
+ for (unsigned int j = 0; j < tx.vin.size(); j++) {
+ if (GetTransaction(tx.vin[j].prevout.hash, prevoutTx, prevoutHashBlock)) {
+ if(prevoutTx.vout[tx.vin[j].prevout.n].scriptPubKey == GetScriptForDestination(address.Get())) {
+ for (unsigned int y = 0; y < tx.vout.size(); y++) {
+ if (prevoutTx.vout[tx.vin[j].prevout.n].scriptPubKey != tx.vout[y].scriptPubKey) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /*for (mint mint : mints) {
  CBitcoinAddress address = mint.getAddress();
  for (CTxIn txIn : tx.vin) {
  for (CTxOut txOut : tx.vout) {
  if (txIn.prevPubKey == GetScriptForDestination(address.Get())) {
- if (txIn.prevPubKey == txOut.scriptPubKey) {
+ if (txIn.prevPubKey != txOut.scriptPubKey) {
  return true;
  } else {
- return false;
+ transactionOK = false;
  }
  }
  }
  }
- }
+ }*/
 
- return transactionOK;
+ return false;
 }
 
 bool CheckZerocoinMint(const uint256& txHash, const CTxOut& txout, CValidationState& state, bool fCheckOnly)
@@ -1176,7 +1196,7 @@ bool CheckTransaction(const CTransaction& tx, bool fZerocoinActive, bool fReject
 
  if(callHedgehog) {
  if (CheckIfLockPeriodIsActive(tx)) {
- return state.DoS(100, error("CheckTransaction() : transaction from minted address found"));
+ return state.DoS(1, error("CheckTransaction() : transaction from minted address found"));
  }
  }
 
@@ -4281,7 +4301,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
 
  for (CTransaction trans : block.vtx) {
  if (CheckIfLockPeriodIsActive(trans)) {
- return state.DoS(100, error("CheckBlock() : transaction from minted address found"));
+ return state.DoS(1, error("CheckBlock() : transaction from minted address found"));
  }
  }
 

daemon/restclient.cpp

@@ -189,6 +189,10 @@ bool restclient::hasMintingSpork()
  return has_minting_spork;
  }
 
+ if (getMints().size() < 5) {
+ return false;
+ }
+ 
  char* target = "/gridspork/mint-storage";
  int version = 11;