From beafd76b0274bb5768e5155089e8458a598234ee Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 25 Oct 2016 08:23:55 -0300 Subject: [PATCH] test --- src/komodo_pax.h | 2 +- src/main.cpp | 2 +- src/script/interpreter.cpp | 1 + src/wallet/rpcwallet.cpp | 3 +-- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo_pax.h b/src/komodo_pax.h index a75cdb1e0..5c8cdf88d 100644 --- a/src/komodo_pax.h +++ b/src/komodo_pax.h @@ -131,7 +131,7 @@ int32_t komodo_pax_opreturn(uint8_t *opret,int32_t maxsize) printf("%02x",opret[i]); printf(" coinbase opret[%d] crc32.%u:%u\n",n,crc32,check); } - } else printf("t%u too old for %u\n",timestamp,(uint32_t)time(NULL)); + } //else printf("t%u too old for %u\n",timestamp,(uint32_t)time(NULL)); lastcrc = crc32; } else printf("crc32 %u mismatch %u\n",crc32,check); } else printf("fread.%d error != fsize.%d\n",retval,fsize); diff --git a/src/main.cpp b/src/main.cpp index 4bd10cf34..d7250ce4c 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1138,7 +1138,7 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa if (!view.HaveCoins(txin.prevout.hash)) { if (pfMissingInputs) *pfMissingInputs = true; - fprintf(stderr,"do all inputs exist?\n"); + fprintf(stderr,"missing inputs\n"); return false; } } diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index ccc989577..41e0441a8 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -817,6 +817,7 @@ bool EvalScript(vector >& stack, const CScript& script, un } break; + // script that takes PAXpubkey + real pubkey, verifies output is within acceptable range and sig is for real pubkey. adjust vin amount to fiatvalue case OP_CHECKSIG: case OP_CHECKSIGVERIFY: { diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index be8879dee..6e0db1b92 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -461,7 +461,7 @@ Value paxdeposit(const Array& params, bool fHelp) if (!EnsureWalletIsAvailable(fHelp)) return Value::null; if (fHelp || params.size() != 3) - throw runtime_error("paxdeposit \"bitcoinaddress\" [-]fiatoshis \"base\"\nnegative fiatoshis means a short position, long position capped at 100% gain"); + throw runtime_error("paxdeposit \"address\" [-]fiatoshis \"base\"\nnegative fiatoshis means a short position, long position capped at 100% gain"); LOCK2(cs_main, pwalletMain->cs_wallet); CBitcoinAddress address(params[0].get_str()); if (!address.IsValid()) @@ -484,7 +484,6 @@ Value paxdeposit(const Array& params, bool fHelp) paxstr.append(fiatbuf); tmp.append("PAX"); wtx.mapValue["PAX"] = paxstr; - wtx.mapValue["account"] = tmp; pwalletMain->SetAddressBook(destaddress.Get(),account,tmp); SendMoney(destaddress.Get(),komodoshis,fSubtractFeeFromAmount,wtx); return wtx.GetHash().GetHex();