Merge branch 'mscore-0.0.9' of http://github.com/mastercoin-msc/maste…

…rcore into mscore-0.0.9 post-merge
mastercoin-MSC · Dec 8, 2014 · e812a88 · e812a88
2 parents 1467bab + 31836d7
commit e812a88
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/mastercore.cpp b/src/mastercore.cpp
@@ -846,16 +846,16 @@ void calculateFundraiser(unsigned short int propType, uint64_t amtTransfer, unsi
 // certain transaction types are not live on the network until some specific block height
 // certain transactions will be unknown to the client, i.e. "black holes" based on their version
 // the Restrictions array is as such: type, block-allowed-in, top-version-allowed
-bool mastercore::isTransactionTypeAllowed(int txBlock, unsigned int txProperty, unsigned int txType, unsigned short version)
+bool mastercore::isTransactionTypeAllowed(int txBlock, unsigned int txProperty, unsigned int txType, unsigned short version, bool bAllowNullProperty)
 {
 bool bAllowed = false;
 bool bBlackHole = false;
 unsigned int type;
 int block_FirstAllowed;
 unsigned short version_TopAllowed;
 
-  // BTC as property is never allowed
-  if (OMNI_PROPERTY_BTC == txProperty) return false;
+  // bitcoin as property is never allowed, unless explicitly stated otherwise
+  if ((OMNI_PROPERTY_BTC == txProperty) && !bAllowNullProperty) return false;
 
   // everything is always allowed on Bitcoin's TestNet or with TMSC/TestEcosystem on MainNet
   if ((isNonMainNet()) || isTestEcosystemProperty(txProperty))

diff --git a/src/mastercore.h b/src/mastercore.h
@@ -493,7 +493,7 @@ int set_wallet_totals();
 
 char *c_strMasterProtocolTXType(int i);
 
-bool isTransactionTypeAllowed(int txBlock, unsigned int txProperty, unsigned int txType, unsigned short version);
+bool isTransactionTypeAllowed(int txBlock, unsigned int txProperty, unsigned int txType, unsigned short version, bool bAllowNullProperty = false);
 
 bool getValidMPTX(const uint256 &txid, int *block = NULL, unsigned int *type = NULL, uint64_t *nAmended = NULL);