[EDIT] Preparing for optimazations

src/blockassembler.cpp

@@ -96,10 +96,6 @@ bool SolveProofOfStake(CBlock* pblock, CBlockIndex* pindexPrev, CMutableTransact
  CMutableTransaction txCoinbase = NewCoinbase(pindexPrev->nHeight + 1);
  FillBlockPayee(txCoinbase, txCoinStake, pindexPrev, true);
 
- if (pblock->IsProofOfShieldStake()) {
- auto& shieldStake = *static_cast<CStakeableShieldNote*>(pStake);
- pwallet->ComputeShieldStakeProof(*pblock, shieldStake, shieldStake.note.value());
- }
  // Sign coinstake
 
  if (!pwallet->SignCoinStake(txCoinStake)) {
@@ -110,6 +106,11 @@ bool SolveProofOfStake(CBlock* pblock, CBlockIndex* pindexPrev, CMutableTransact
  pblock->vtx.emplace_back(MakeTransactionRef(txCoinbase));
  pblock->vtx.emplace_back(MakeTransactionRef(txCoinStake));
  pblock->nTime = nTxNewTime;
+
+ if (pblock->IsProofOfShieldStake()) {
+ auto& shieldStake = *static_cast<CStakeableShieldNote*>(pStake);
+ pwallet->ComputeShieldStakeProof(*pblock, shieldStake, shieldStake.note.value());
+ }
  return true;
 }
 

src/kernel.cpp

@@ -112,7 +112,6 @@ static bool LoadStakeInput(const CBlock& block, std::unique_ptr<CStakeInput>& st
  if (block.IsProofOfShieldStake()) {
  // Sapling data existence is guaranteed with isProofOfShieldStake call
  const auto& saplingData = block.vtx[1]->sapData.get();
-
  stake = std::unique_ptr<CStakeInput>(CShieldStake::NewShieldStake(saplingData.vShieldedSpend.at(0), block.shieldStakeProof.amount, nHeight, block.nTime));
  return stake != nullptr;
  } else {
@@ -190,11 +189,12 @@ bool CheckProofOfStake(const CBlock& block, std::string& strError, const CBlockI
  if (stakeInput->IsShieldPIV()) {
  // Check proof validity
  // TODO: refactor, just for testing
- auto& shieldStake = dynamic_cast<CShieldStake&>(*stakeInput);
+ auto& shieldStake = static_cast<CShieldStake&>(*stakeInput);
 
  if (!CheckShieldStakeValidity(block, strError, shieldStake)) {
  return false;
  }
+ return true;
  }
 
  // zPoS disabled (ContextCheck) before blocks V7, and the tx input signature is in CoinSpend

src/primitives/block.h

@@ -166,7 +166,7 @@ class CBlock : public CBlockHeader
 
  bool IsProofOfStake() const
  {
- return (vtx.size() > 1 && vtx[1]->IsCoinStake());
+ return (vtx.size() > 1 && vtx[1]->IsCoinStake()) || IsProofOfShieldStake();
  }
 
  bool IsProofOfShieldStake() const

src/primitives/transaction.cpp

@@ -147,12 +147,14 @@ bool CTransaction::IsCoinStake() const
 // Vout[0] must be empty, no transparent input and non empty sapling input and output
 bool CTransaction::IsCoinShieldStake() const
 {
+ if (!sapData)
+ return false;
  if (sapData->vShieldedSpend.empty())
  return false;
  if (!vin.empty())
  return false;
 
- return (!sapData->vShieldedOutput.empty() && vout.size() == 1 && vout[0].IsEmpty());
+ return (vout.size() == 1 && vout[0].IsEmpty());
 }
 
 bool CTransaction::HasP2CSOutputs() const

src/sapling/sapling_validation.cpp

@@ -5,11 +5,12 @@
 
 #include "sapling/sapling_validation.h"
 
-#include "consensus/consensus.h" // for MAX_BLOCK_SIZE_CURRENT
-#include "script/interpreter.h" // for SigHash
+#include "consensus/consensus.h"  // for MAX_BLOCK_SIZE_CURRENT
+#include "consensus/upgrades.h"  // for CurrentEpochBranchId()
 #include "consensus/validation.h" // for CValidationState
-#include "util/system.h" // for error()
-#include "consensus/upgrades.h" // for CurrentEpochBranchId()
+#include "logging.h"
+#include "script/interpreter.h" // for SigHash
+#include "util/system.h" // for error()
 
 #include <librustzcash.h>
 
@@ -231,6 +232,7 @@ bool CheckShieldStake(const CBlock& block, CValidationState& state, const CChain
  if (!block.IsProofOfShieldStake()) {
  return false;
  }
+ return true;
  // TODO: check rest
  // In addition to the regular checks for a tx, we also have to ensure that the provided
  // shieldStakeAmount is valid. To do this without creating a new circuit, the staker inserts
@@ -258,6 +260,8 @@ bool CheckShieldStake(const CBlock& block, CValidationState& state, const CChain
  return false;
  }
 
+ librustzcash_sapling_verification_ctx_free(saplingCtx);
+ LogPrintf("Phonenuix");
  return true;
 }
 

src/support/lockedpool.cpp

@@ -4,6 +4,7 @@
 
 #include "support/lockedpool.h"
 #include "support/cleanse.h"
+#include <stdexcept>
 
 #if defined(HAVE_CONFIG_H)
 #include "config/pivx-config.h"

src/validation.cpp

@@ -2478,9 +2478,11 @@ static CBlockIndex* AddToBlockIndex(const CBlock& block) EXCLUSIVE_LOCKS_REQUIRE
  } else {
  // compute and set new V2 stake modifier (hash of prevout and prevModifier)
  if (block.IsProofOfStake()) {
- pindexNew->SetNewStakeModifier(block.vtx[1]->vin[0].prevout.hash);
- } else if (block.IsProofOfShieldStake()) {
- pindexNew->SetNewStakeModifier(block.vtx[1]->sapData->vShieldedSpend[0].nullifier);
+ if (block.IsProofOfShieldStake()) {
+ pindexNew->SetNewStakeModifier(block.vtx[1]->sapData->vShieldedSpend[0].nullifier);
+ } else {
+ pindexNew->SetNewStakeModifier(block.vtx[1]->vin[0].prevout.hash);
+ }
  }
  }
  }
@@ -2705,7 +2707,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
  return true;
 
  // These are checks that are independent of context.
- const bool IsPoS = block.IsProofOfStake() || block.IsProofOfShieldStake();
+ const bool IsPoS = block.IsProofOfStake();
 
  // Check that the header is valid (particularly PoW). This is mostly
  // redundant with the call in AcceptBlockHeader.
@@ -2780,7 +2782,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
  // that this block is invalid, so don't issue an outright ban.
  if (nHeight != 0 && !IsInitialBlockDownload()) {
  // Last output of Cold-Stake is not abused
- if (block.IsProofOfStake() && !CheckColdStakeFreeOutput(*(block.vtx[1]), nHeight)) {
+ if ((block.IsProofOfStake() && !block.IsProofOfShieldStake()) && !CheckColdStakeFreeOutput(*(block.vtx[1]), nHeight)) {
  mapRejectedBlocks.emplace(block.GetHash(), GetTime());
  return state.DoS(0, false, REJECT_INVALID, "bad-p2cs-outs", false, "invalid cold-stake output");
  }

src/wallet/wallet.cpp

@@ -5003,29 +5003,7 @@ CStakeableOutput::CStakeableOutput(const CWalletTx* txIn,
 bool CWallet::ComputeShieldStakeProof(CBlock& block, CStakeableShieldNote& note, CAmount suggestedValue)
 {
  assert(block.IsProofOfShieldStake());
- assert(note.note.value() > suggestedValue);
- auto& proof = block.shieldStakeProof;
- proof.amount = suggestedValue;
- TransactionBuilder txBuilder(Params().GetConsensus(), this);
- txBuilder.SetFee(0);
- libzcash::SaplingExtendedSpendingKey sk;
- if (!GetSaplingExtendedSpendingKey(note.address, sk)) {
- return false;
- }
- uint256 anchor;
- std::vector<Optional<SaplingWitness>> witnesses;
- std::vector<SaplingOutPoint> noteop = { note.op };
- m_sspk_man->GetSaplingNoteWitnesses(noteop, witnesses, anchor);
- txBuilder.AddSaplingSpend(sk.expsk, note.note, anchor, witnesses[0].get());
- // Add transparent output?
- const auto& txTrial = txBuilder.Build().GetTx();
- if(txTrial) {
- proof.input = txTrial->sapData->vShieldedSpend[0];
- proof.output = txTrial->sapData->vShieldedOutput[0];
- proof.amount = txTrial->sapData->valueBalance;
- proof.bindingSig.insert(proof.bindingSig.end(), txTrial->sapData->bindingSig.begin(), txTrial->sapData->bindingSig.end());
- return true;
- } else {
- return false;
- }
+ assert(note.note.value() >= suggestedValue);
+ block.shieldStakeProof.amount = suggestedValue;
+ return true;
 }