Merge pull request #82 from BlockMechanic/segwit

Segwit
Crowndev · Jul 5, 2022 · cf87cdf · cf87cdf
2 parents 5e9041d + 9f7d763
commit cf87cdf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
@@ -292,10 +292,10 @@ class CTestNetParams : public CChainParams {
         m_assumed_blockchain_size = 1;
         m_assumed_chain_state_size = 1;
 
-        genesis = CreateGenesisBlock(1656852332, 1374987, 0x1e0ffff0, 1, 10 * COIN, consensus);
+        genesis = CreateGenesisBlock(1657000537, 2343754, 0x1e0ffff0, 1, 10 * COIN, consensus);
         consensus.hashGenesisBlock = genesis.GetHash();
         //MineNewGenesisBlock(consensus,genesis);
-        assert(consensus.hashGenesisBlock == uint256S("0x000009b85fb179bc76b73c0b1d0f3e0959d6e6345bc4c90b9a7a78da4f561cf9"));
+        assert(consensus.hashGenesisBlock == uint256S("0x00000a145849947660e2a489b750c2cb779f5bc438597feb8f5c138a71313a62"));
         assert(genesis.hashMerkleRoot == uint256S("0x80ad356118a9ab8db192db66ef77146cc36d958f959251feace550e4ca3d1446"));
 
         vFixedSeeds.clear();

diff --git a/src/consensus/tx_check.cpp b/src/consensus/tx_check.cpp
@@ -137,8 +137,9 @@ bool CheckTransaction(const CTransaction& tx, TxValidationState& state)
 
     if(tx.nVersion >= TX_ELE_VERSION){
 		for (unsigned int k = 0; k < tx.vpout.size(); k++) {
-            if(tx.vpout[k].nAsset.IsEmpty())
-                return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-vout-not-explicit-asset", strprintf("%s: %s", __func__, tx.ToString()));
+		    if(!tx.vpout[k].IsEmpty())
+                if(tx.vpout[k].nAsset.IsEmpty())
+                    return state.Invalid(TxValidationResult::TX_CONSENSUS, "bad-txns-vout-not-explicit-asset", strprintf("%s: %s", __func__, tx.ToString()));
          }
      }