Skip to content

Commit

Permalink
Merge branch 'mscore-0.0.9' of http://github.com/mastercoin-msc/maste…
Browse files Browse the repository at this point in the history
…rcore into mscore-0.0.9

pulling in the PRs
  • Loading branch information
m21 committed Nov 25, 2014
2 parents 856a335 + 0f8b5c4 commit 4c3f204
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions src/mastercore_rpc.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1664,6 +1664,8 @@ static int populateRPCTransactionObject(uint256 txid, Object *txobj, string filt
txobj->push_back(Pair("confirmations", confirmations));
txobj->push_back(Pair("fee", ValueFromAmount(nFee)));
txobj->push_back(Pair("blocktime", blockTime));
txobj->push_back(Pair("version", (int64_t)mp_obj.getVersion()));
txobj->push_back(Pair("type_int", (int64_t)mp_obj.getType()));
txobj->push_back(Pair("type", MPTxType));
if (MSC_TYPE_METADEX != MPTxTypeInt) txobj->push_back(Pair("propertyid", propertyId));
if ((MSC_TYPE_CREATE_PROPERTY_VARIABLE == MPTxTypeInt) || (MSC_TYPE_CREATE_PROPERTY_FIXED == MPTxTypeInt) || (MSC_TYPE_CREATE_PROPERTY_MANUAL == MPTxTypeInt))
Expand Down

0 comments on commit 4c3f204

Please sign in to comment.