Skip to content

Commit

Permalink
Merge pull request #5
Browse files Browse the repository at this point in the history 
f70fc3b Fix dialog to cancel meta DEx offers (dexX7)
d92ac7c METADEX: remove assert bypasses - no longer needed (zathras-crypto)
e92dee2 UI: only show disclaimer for mainnet (thanks @dexX7) (zathras-crypto)
4baf808 INIT: add line break after txindex directive is added to conf (zathras-crypto)
808b3b1 UI: Fix pending trade rows get bad updates from UpdateData() (zathras-crypto)
c171e02 UI: Fix for pending transactions not updating trade or tx history PendingAdd not called until sent dialog acknowledged, but signal for BTC balance change fires immediately thus the tx is not yet in the pending map & doesn't get added to history (zathras-crypto)
6503b60 UI: Metadex fix available balances not updated on new pending trade (zathras-crypto)
b903929 PENDING: Use json_spirit to format tx description for pending object (zathras-crypto)
d5eca15 UI: Trade history - fix for loss of formatting on UpdateData() (zathras-crypto)
f0b9fe7 UI: remove old trade history update function Note - old function inefficient in that it reparsed all wallet transactions every update (zathras-crypto)
033b6ce UI: Further work to move trade history to cached map (zathras-crypto)
c0d7654 Refine omnicore_pending includes (dexX7)
bffaeb0 Refine TXHistoryDialog includes (dexX7)
52c9d0f Refine SendMPDialog includes (dexX7)
555a0c2 Refine OverviewPage includes (dexX7)
89de359 Refine MetaDExDialog includes (dexX7)
745bbb0 Refine LookupTXDialog includes (dexX7)
2e2ede3 Refine LookupSPDialog includes (dexX7)
cd18197 Refine LookupAddressDialog includes (dexX7)
825f512 Refine BalancesDialog includes (dexX7)
72d6e30 Refine MetaDExCancelDialog includes (dexX7)
ebfbc0e Refine TradeHistoryDialog includes (dexX7)
01287ef Set client and wallet models in any case (dexX7)
ef6f121 Remove unused headers in omnicore_qtutils (dexX7)
8f4904d Remove moc include of Omni Core QT init and utils (dexX7)
9fdce21 Initialize members of HistoryTXObject (dexX7)
70b085f Test Commit - Ignore Migrate dev systems from spindle to ssd based storage New environment setup, test commit to ensure all working (zathras-crypto)
aff7717 UI: move TradeHistoryDialog to cache map (non-final) commit to transfer remaining changes from old dev to new dev systems (zathras-crypto)
25b6cb4 Replace global balance arrays with std::map (dexX7)
32b445f UI: use json_spirit for formatting showDetails() (zathras-crypto)
55b309d UI: fix metadex cancels following move to rational (zathras-crypto)
cb57e5a UI: fix pricing (zathras-crypto)
d078fc9 UI: add new override to fix up column sizing on trade history (zathras-crypto)
e602ac4 UI: fix missing include on metadexcanceldialog (zathras-crypto)
ce002d5 UI: activate metadex cancels following class C merge (zathras-crypto)
916cd06 UI: metadex cancel dialog - fix lack of update when address changed (zathras-crypto)
040ddb6 UI: metadex pricing to 8 decimal places (zathras-crypto)
cfdae0d UI: fix metadex totals recalc (zathras-crypto)
9418362 UI: metadex - blank user fields on market switch (zathras-crypto)
4464917 UI: metadex - populate fields on row clicks (zathras-crypto)
470938e UI: Disable 'selecting' price points (zathras-crypto)
4615360 UI: Add 'TruncateString' to override UI truncation if needed (zathras-crypto)
ebd4322 UI: Improve metadex handling (zathras-crypto)
66ab1d4 UI: minor fixes to MetaDEx dialog (zathras-crypto)
cdb919f UI: enable send dialog to create a pending object on successful send (zathras-crypto)
0e110bb PENDING: Extract and simplify pending functions so can be used by UI (zathras-crypto)
7a07f4a UI: clean up send dialog and enable Class C (zathras-crypto)
9020a3d UI: refine updateProperty() for send dialog (zathras-crypto)
aad2620 UI: improve fee warning in send dialog (zathras-crypto)
4719f4f UI: remove hardcoded property limit in send dialog (zathras-crypto)
9dd79ed MetaDEx UI: clean up after merge (zathras-crypto)
85afbfc MetaDEx UI: commit missing files (zathras-crypto)
8eee9a5 MetaDEx UI: rename orderhistory to tradehistory (zathras-crypto)
f3cf4c3 MetaDEx UI: Fix includes after dex/mdex split (zathras-crypto)
5987063 Persistence : fix hang when SP watermark cannot be located (zathras-crypto)
5f09ebd orderhistorydialog : WIP first part of rewrite (zathras-crypto)
78b5fe2 txhistorydialog : add missing formatting case (zathras-crypto)
dc0d4ac txhistorydialog : clean up showDetails() & make use of PopulateSimpleDialog (zathras-crypto)
fe49ade Prep UI for Class C, remove dup code, minor metaDEx UI fixes (zathras-crypto)
8a19404 omnicore_qtutils : add PopulateTXSentDialog() (zathras-crypto)
0346243 omnicore_qtutils : move StripTrailingZeros() & add PopulateSimpleDialog() (zathras-crypto)
b14074f metadexcanceldialog - add wallet model (zathras-crypto)
3dc13cc fix QT4 section resize (thanks @dexX7) (zathras-crypto)
1d92463 metadexcanceldialog - support sending cancel transactions - not final TODO: add wallet model back in (d'oh) TODO: swap out commented sections when Class C & encoding is merged (zathras-crypto)
c80fa84 lookupspdialog : fix unsupported QT attrib (thanks travis-ci/dexX7) (zathras-crypto)
4c69da7 makefile : fix missing build ref to sendmpdialog.h (travis-ci) (zathras-crypto)
d5ab091 metadexcanceldialog : rewrite to correct math & buy/sell UI concepts (zathras-crypto)
2c719df metadexcanceldialog : redo models, add refresh function & signal (zathras-crypto)
9c68602 metadexcanceldialog : add UpdateCancelCombo() (zathras-crypto)
fde070b metadexcanceldialog : add address selector population (zathras-crypto)
0e0e9a5 metadexdialog.cpp : consolidate buy/sellRecalc() & add overflow protection (zathras-crypto)
64b6084 metadexcanceldialog.ui : add missing field for address (zathras-crypto)
0f5baed metadexdialog.cpp : further fix divisibility display (zathras-crypto)
731970a metadexdialog.cpp : clean up label assignment (zathras-crypto)
da2d33d metadexdialog.cpp : fix number display in various places (zathras-crypto)
d482e77 metadexdialog.cpp - consolidate update[Sell/Buy]Offers() into updateOffers() (zathras-crypto)
a78f6a0 metadexdialog.cpp - clean up UpdateBuy/SellOffers() (zathras-crypto)
3439f37 metadexdialog.cpp : fix switch market check (zathras-crypto)
a6f92fa metadexdialog.cpp : clean up updateBuy/SellAddressBalance (zathras-crypto)
9b54505 metadexdialog.cpp : improve checks and user feedback for SwitchMarket() (zathras-crypto)
0d742a6 metadexdialog.cpp : clean up FullRefresh() and optimize address population (zathras-crypto)
2358b6e [BALANCES TAB REWRITE] Reset transactiontablemodel back to original bitcoin code (zathras-crypto)
f642a43 [BALANCES TAB REWRITE] Update makefile (zathras-crypto)
d6cb0cc [BALANCES TAB REWRITE] Rename balance files (zathras-crypto)
c39ec65 [BALANCES TAB REWRITE] Update walletview to use new balances dialog (zathras-crypto)
135aeb0 [BALANCES TAB REWRITE] Add back in overrides for column resizing (zathras-crypto)
dfd5a0d [BALANCES TAB REWRITE] New balances tab code (zathras-crypto)
137e1e2 [BALANCES TAB REWRITE] Use a form for the UI (zathras-crypto)
b8bef40 Improve readability (add alternating row colors) (zathras-crypto)
2ef2849 Fix balanceChanged signal (was updated with 0.10) (zathras-crypto)
23c87b6 Fix build warning for unused var following change to new overview property list (zathras-crypto)
a762905 Add the signal for an Omni state change to the client model (zathras-crypto)
a72250f Replace icons (zathras-crypto)
2755c2b Makefile update (zathras-crypto)
60afef0 Bitcoin code changes to enable the exchange UI components (zathras-crypto)
f6f7eb0 Add MetaDEx main dialog to UI and fix issues related to 0.10 move (zathras-crypto)
3c6780c Add MetaDEx order cancellation to UI and fix issues related to 0.10 move (zathras-crypto)
5125064 Add MetaDEx order history to UI and fix issues related to 0.10 move (zathras-crypto)
9da5b47 Add MetaDEx UI forms (zathras-crypto)
f75b41e PortUI-0.0.10 - omnicore_init code (zathras-crypto)
d799e35 PortUI-0.0.10 - update resources (zathras-crypto)
62ebf4c PortUI-0.0.10 - updated makefile (zathras-crypto)
a916431 PortUI-0.0.10 - splashscreen code & images (zathras-crypto)
5fd331e PortUI-0.0.10 - bitcoin code (zathras-crypto)
1089c95 PortUI-0.0.10 - bitcoingui code (zathras-crypto)
a2b5d39 PortUI-0.0.10 - walletview code (zathras-crypto)
22b13cb PortUI-0.0.10 - walletframe code (zathras-crypto)
a56e3e5 PortUI-0.0.10 - txhistorydialog code (zathras-crypto)
f3f5148 PortUI-0.0.10 - sendmpdialog code (zathras-crypto)
04f6a43 PortUI-0.0.10 - transactiontablemodel code (zathras-crypto)
7febcad PortUI-0.0.10 - overviewpage code (zathras-crypto)
4e7108f PortUI-0.0.10 - lookuptxdialog code (zathras-crypto)
e5d9e3b PortUI-0.0.10 - lookupspdialog code (zathras-crypto)
cc97364 PortUI-0.0.10 - lookupaddressdialog code (zathras-crypto)
ea15626 PortUI-0.0.10 - balancesview code (zathras-crypto)
29d8fd1 PortUI-0.0.10 - QT Forms (zathras-crypto)
3b37d70 PortUI-0.0.10 - Icons (zathras-crypto)
b5167c3 Fix version (zathras-crypto)
2c137f3 Add GetNextPropertyId function (zathras-crypto)
  • Loading branch information
@dexX7
dexX7 committed May 20, 2015
2 parents 0dcd7f2 + 0eeb8e8 commit abac370
Show file tree
Hide file tree
Showing 86 changed files with 8,365 additions and 529 deletions.
6 changes: 4 additions & 2 deletions src/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,8 @@ OMNICORE_H = \
omnicore_encoding.h \
omnicore_createpayload.h \
omnicore_rpctx.h \
omnicore_utils.h
omnicore_utils.h \
omnicore_pending.h

OMNICORE_CPP = \
mastercore.cpp \
Expand All @@ -188,7 +189,8 @@ OMNICORE_CPP = \
omnicore_encoding.cpp \
omnicore_createpayload.cpp \
omnicore_rpctx.cpp \
omnicore_utils.cpp
omnicore_utils.cpp \
omnicore_pending.cpp

BITCOIN_CORE_H += \
$(OMNICORE_H)
Expand Down
67 changes: 62 additions & 5 deletions src/Makefile.qt.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,16 @@ QT_FORMS_UI = \
qt/forms/sendcoinsdialog.ui \
qt/forms/sendcoinsentry.ui \
qt/forms/signverifymessagedialog.ui \
qt/forms/transactiondescdialog.ui
qt/forms/transactiondescdialog.ui \
qt/forms/sendmpdialog.ui \
qt/forms/lookupaddressdialog.ui \
qt/forms/lookupspdialog.ui \
qt/forms/lookuptxdialog.ui \
qt/forms/txhistorydialog.ui \
qt/forms/metadexcanceldialog.ui \
qt/forms/metadexdialog.ui \
qt/forms/tradehistorydialog.ui \
qt/forms/balancesdialog.ui

QT_MOC_CPP = \
qt/moc_addressbookpage.cpp \
Expand Down Expand Up @@ -136,7 +145,16 @@ QT_MOC_CPP = \
qt/moc_utilitydialog.cpp \
qt/moc_walletframe.cpp \
qt/moc_walletmodel.cpp \
qt/moc_walletview.cpp
qt/moc_walletview.cpp \
qt/moc_sendmpdialog.cpp \
qt/moc_lookupaddressdialog.cpp \
qt/moc_lookupspdialog.cpp \
qt/moc_lookuptxdialog.cpp \
qt/moc_txhistorydialog.cpp \
qt/moc_balancesdialog.cpp \
qt/moc_metadexdialog.cpp \
qt/moc_metadexcanceldialog.cpp \
qt/moc_tradehistorydialog.cpp

BITCOIN_MM = \
qt/macdockiconhandler.mm \
Expand Down Expand Up @@ -207,7 +225,18 @@ BITCOIN_QT_H = \
qt/walletmodel.h \
qt/walletmodeltransaction.h \
qt/walletview.h \
qt/winshutdownmonitor.h
qt/winshutdownmonitor.h \
qt/lookupaddressdialog.h \
qt/lookupspdialog.h \
qt/lookuptxdialog.h \
qt/txhistorydialog.h \
qt/balancesdialog.h \
qt/omnicore_init.h \
qt/metadexdialog.h \
qt/metadexcanceldialog.h \
qt/tradehistorydialog.h \
qt/sendmpdialog.h \
qt/omnicore_qtutils.h

RES_ICONS = \
qt/res/icons/add.png \
Expand Down Expand Up @@ -256,7 +285,24 @@ RES_ICONS = \
qt/res/icons/tx_mined.png \
qt/res/icons/unit_btc.png \
qt/res/icons/unit_mbtc.png \
qt/res/icons/unit_ubtc.png
qt/res/icons/unit_ubtc.png \
qt/res/icons/token_msc.png \
qt/res/icons/token_btc.png \
qt/res/icons/mp_balances.png \
qt/res/icons/mp_exchange.png \
qt/res/icons/mp_history.png \
qt/res/icons/mp_home.png \
qt/res/icons/mp_meta_cancelled.png \
qt/res/icons/mp_meta_filled.png \
qt/res/icons/mp_meta_open.png \
qt/res/icons/mp_meta_partial.png \
qt/res/icons/mp_meta_partialclosed.png \
qt/res/icons/mp_meta_pending.png \
qt/res/icons/mp_receive.png \
qt/res/icons/mp_send.png \
qt/res/icons/mp_sp.png \
qt/res/icons/mp_toolbox.png \
qt/res/icons/transaction_invalid.png

BITCOIN_QT_CPP = \
qt/bitcoinaddressvalidator.cpp \
Expand Down Expand Up @@ -307,7 +353,18 @@ BITCOIN_QT_CPP += \
qt/walletframe.cpp \
qt/walletmodel.cpp \
qt/walletmodeltransaction.cpp \
qt/walletview.cpp
qt/walletview.cpp \
qt/sendmpdialog.cpp \
qt/lookupaddressdialog.cpp \
qt/lookupspdialog.cpp \
qt/lookuptxdialog.cpp \
qt/txhistorydialog.cpp \
qt/balancesdialog.cpp \
qt/omnicore_init.cpp \
qt/metadexdialog.cpp \
qt/metadexcanceldialog.cpp \
qt/tradehistorydialog.cpp \
qt/omnicore_qtutils.cpp
endif

RES_IMAGES = \
Expand Down
2 changes: 1 addition & 1 deletion src/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1140,7 +1140,7 @@ bool AppInit2(boost::thread_group& threadGroup)
failMsg += _("Please add txindex=1 to your configuration file manually.\n\nOmni Core will now shutdown.");
return InitError(failMsg);
}
fprintf(fp, "\ntxindex=1");
fprintf(fp, "\ntxindex=1\n");
fflush(fp);
fclose(fp);
return InitError(_("Your configuration file has been updated.\n\n"
Expand Down
83 changes: 22 additions & 61 deletions src/mastercore.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "mastercore_version.h"
#include "omnicore_encoding.h"
#include "omnicore_utils.h"
#include "omnicore_pending.h"

#include "base58.h"
#include "chainparams.h"
Expand Down Expand Up @@ -106,10 +107,14 @@ static const int nBlockTop = 0;
static int nWaterlineBlock = 0; //

uint64_t global_metadex_market;
uint64_t global_balance_money_maineco[100000];
uint64_t global_balance_reserved_maineco[100000];
uint64_t global_balance_money_testeco[100000];
uint64_t global_balance_reserved_testeco[100000];
//! Available balances of wallet properties in the main ecosystem
std::map<uint32_t, int64_t> global_balance_money_maineco;
//! Reserved balances of wallet properties in the main ecosystem
std::map<uint32_t, int64_t> global_balance_reserved_maineco;
//! Available balances of wallet properties in the test ecosystem
std::map<uint32_t, int64_t> global_balance_money_testeco;
//! Reserved balances of wallet properties in the test ecosystem
std::map<uint32_t, int64_t> global_balance_reserved_testeco;

/**
* Used to indicate, whether to automatically commit created transactions.
Expand Down Expand Up @@ -308,59 +313,6 @@ CrowdMap mastercore::my_crowds;

PendingMap mastercore::my_pending;

static CMPPending *pendingDelete(const uint256 txid, bool bErase = false)
{
if (msc_debug_verbose3) file_log("%s(%s)\n", __FUNCTION__, txid.GetHex().c_str());

PendingMap::iterator it = my_pending.find(txid);

if (it != my_pending.end())
{
// display
CMPPending *p_pending = &(it->second);

int64_t src_amount = getMPbalance(p_pending->src, p_pending->prop, PENDING);

if (msc_debug_verbose3) file_log("%s()src= %ld, line %d, file: %s\n", __FUNCTION__, src_amount, __LINE__, __FILE__);

if (src_amount)
{
update_tally_map(p_pending->src, p_pending->prop, p_pending->amount, PENDING);
}

if (bErase)
{
my_pending.erase(it);
}
else
{
return &(it->second);
}
}

return (CMPPending *) NULL;
}

int pendingAdd(const uint256 &txid, const string &FromAddress, unsigned int propId, int64_t Amount, int64_t type, const string &txDesc)
{
CMPPending pending;

if (msc_debug_verbose3) file_log("%s(%s,%s,%u,%ld,%d, %s), line %d, file: %s\n", __FUNCTION__, txid.GetHex().c_str(), FromAddress.c_str(), propId, Amount, type, txDesc,__LINE__, __FILE__);

// support for pending, 0-confirm
if (update_tally_map(FromAddress, propId, -Amount, PENDING))
{
pending.src = FromAddress;
pending.amount = Amount;
pending.prop = propId;
pending.desc = txDesc;
pending.type = type;
my_pending.insert(std::make_pair(txid, pending));
}

return 0;
}

// this is the master list of all amounts for all addresses for all properties, map is sorted by Bitcoin address
std::map<std::string, CMPTally> mastercore::mp_tally_map;

Expand Down Expand Up @@ -663,7 +615,7 @@ int64_t prev = 0, owners = 0;
bool mastercore::update_tally_map(string who, unsigned int which_property, int64_t amount, TallyType ttype)
{
bool bRet = false;
uint64_t before, after;
int64_t before, after;

if (0 == amount)
{
Expand Down Expand Up @@ -693,7 +645,7 @@ uint64_t before, after;
{
if ((exodus_address != who) || (exodus_address == who && msc_debug_exo))
{
file_log("%s(%s, %u=0x%X, %+ld, ttype=%d); before=%lu, after=%lu\n",
file_log("%s(%s, %u=0x%X, %+ld, ttype=%d); before=%ld, after=%ld\n",
__FUNCTION__, who.c_str(), which_property, which_property, amount, ttype, before, after);
}
}
Expand Down Expand Up @@ -848,6 +800,15 @@ const double available_reward=all_reward * part_available;
return devmsc;
}

uint32_t mastercore::GetNextPropertyId(bool maineco)
{
if(maineco) {
return _my_sps->peekNextSPID(1);
} else {
return _my_sps->peekNextSPID(2);
}
}

// TODO: optimize efficiency -- iterate only over wallet's addresses in the future
// NOTE: if we loop over wallet addresses we miss tokens that may be in change addresses (since mapAddressBook does not
// include change addresses). with current transaction load, about 0.02 - 0.06 seconds is spent on this function
Expand Down Expand Up @@ -2356,7 +2317,7 @@ int mastercore_handler_tx(const CTransaction &tx, int nBlock, unsigned int idx,
// NOTE1: Every incoming TX is checked, not just MP-ones because:
// if for some reason the incoming TX doesn't pass our parser validation steps successfuly, I'd still want to clear pending amounts for that TX.
// NOTE2: Plus I wanna clear the amount before that TX is parsed by our protocol, in case we ever consider pending amounts in internal calculations.
(void) pendingDelete(tx.GetHash(), true);
(void) PendingDelete(tx.GetHash());

CMPTransaction mp_obj;
// save the augmented offer or accept amount into the database as well (expecting them to be numerically lower than that in the blockchain)
Expand Down Expand Up @@ -3285,7 +3246,7 @@ int CMPSTOList::deleteAboveBlock(int blockNum)
}

// MPTradeList here
bool CMPTradeList::getMatchingTrades(const uint256 txid, unsigned int propertyId, Array *tradeArray, uint64_t *totalSold, uint64_t *totalBought)
bool CMPTradeList::getMatchingTrades(const uint256 txid, unsigned int propertyId, Array *tradeArray, int64_t *totalSold, int64_t *totalBought)
{
if (!pdb) return false;
leveldb::Slice skey, svalue;
Expand Down
17 changes: 10 additions & 7 deletions src/mastercore.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,7 +338,7 @@ class CMPTradeList : public CDBBase
bool exists(const uint256 &txid);
void printStats();
void printAll();
bool getMatchingTrades(const uint256 txid, unsigned int propertyId, Array *tradeArray, uint64_t *totalSold, uint64_t *totalBought);
bool getMatchingTrades(const uint256 txid, unsigned int propertyId, Array *tradeArray, int64_t *totalSold, int64_t *totalBought);
int getMPTradeCountTotal();
};

Expand Down Expand Up @@ -397,13 +397,15 @@ class CMPPending

};

//temp - only supporting 100,000 properties per eco here, research best way to expand array
//these 4 arrays use about 3MB total memory with 100K properties limit (100000*8*4 bytes)
extern uint64_t global_metadex_market;
extern uint64_t global_balance_money_maineco[100000];
extern uint64_t global_balance_reserved_maineco[100000];
extern uint64_t global_balance_money_testeco[100000];
extern uint64_t global_balance_reserved_testeco[100000];
//! Available balances of wallet properties in the main ecosystem
extern std::map<uint32_t, int64_t> global_balance_money_maineco;
//! Reserved balances of wallet properties in the main ecosystem
extern std::map<uint32_t, int64_t> global_balance_reserved_maineco;
//! Available balances of wallet properties in the test ecosystem
extern std::map<uint32_t, int64_t> global_balance_money_testeco;
//! Reserved balances of wallet properties in the test ecosystem
extern std::map<uint32_t, int64_t> global_balance_reserved_testeco;

int64_t getMPbalance(const string &Address, unsigned int property, TallyType ttype);
int64_t getUserAvailableMPbalance(const string &Address, unsigned int property);
Expand Down Expand Up @@ -452,6 +454,7 @@ int ClassAgnosticWalletTXBuilder(const string &senderAddress, const string &rece

bool isTestEcosystemProperty(unsigned int property);
bool isMainEcosystemProperty(unsigned int property);
uint32_t GetNextPropertyId(bool maineco);

CMPTally *getTally(const string & address);

Expand Down
8 changes: 4 additions & 4 deletions src/mastercore_errors.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ enum MPRPCErrorCode
MP_INSUF_FUNDS_BPENDI = -1, // balance before pending
MP_INSUF_FUNDS_APENDI = -2, // balance after pending
MP_INPUT_NOT_IN_RANGE = -11, // input value larger than supported
//ClassAgnostic_send

//ClassAgnosticWalletTXBuilder(
MP_INPUTS_INVALID = -212,
MP_ENCODING_ERROR = -250,
MP_REDEMP_ILLEGAL = -233,
Expand All @@ -22,7 +22,7 @@ enum MPRPCErrorCode
MP_ERR_INPUTSELECT_FAIL = -206,
MP_ERR_CREATE_TX = -211,
MP_ERR_COMMIT_TX = -213,

//gettransaction_MP, listtransactions_MP
MP_TX_NOT_FOUND = -3331, // No information available about transaction. (GetTransaction failed)
MP_TX_UNCONFIRMED = -3332, // Unconfirmed transactions are not supported. (blockHash is 0)
Expand All @@ -34,7 +34,7 @@ enum MPRPCErrorCode

inline std::string error_str(int ec) {
std::string ec_str;

switch (ec)
{
case MP_INSUF_FUNDS_BPENDI:
Expand Down
1 change: 1 addition & 0 deletions src/mastercore_log.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ bool msc_debug_txdb = 0;
bool msc_debug_tradedb = 1;
bool msc_debug_persistence = 0;
bool msc_debug_ui = 0;
bool msc_debug_pending = 1;
bool msc_debug_metadex1 = 0;
bool msc_debug_metadex2 = 0;
//! Print orderbook before and after each trade
Expand Down
1 change: 1 addition & 0 deletions src/mastercore_log.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ extern bool msc_debug_txdb;
extern bool msc_debug_tradedb;
extern bool msc_debug_persistence;
extern bool msc_debug_ui;
extern bool msc_debug_pending;
extern bool msc_debug_metadex1;
extern bool msc_debug_metadex2;
extern bool msc_debug_metadex3;
Expand Down
Loading

0 comments on commit abac370

Please sign in to comment.