1 --- main.cpp 2012-05-24 01:24:54.000000000 +0400
2 +++ main.cpp.orig 2012-05-08 21:34:24.000000000 +0400
3 @@ -3222,21 +3222,18 @@
6 unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK, PROTOCOL_VERSION);
7 - //if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN)
9 + if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN)
12 // Legacy limits on sigOps:
13 unsigned int nTxSigOps = tx.GetLegacySigOpCount();
14 - //if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
16 + if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
19 // Transaction fee required depends on block size
20 bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority));
21 int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, GMF_BLOCK);
23 - // Electrum server: do not check fees
26 // Connecting shouldn't fail due to dependency on other memory pool transactions
27 // because we're already processing them in order of dependency
28 map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool);
29 --- bitcoinrpc.cpp 2012-06-10 20:54:28.000000000 +0400
30 +++ bitcoinrpc.cpp.orig 2012-05-08 21:34:23.000000000 +0400
31 @@ -1496,45 +1496,7 @@
35 -Value importtransaction(const Array& params, bool fHelp)
38 - if (fHelp || params.size() != 1 || (hexdump=params[0].get_str()).size()&1)
39 - throw runtime_error(
40 - "importtransaction <hexdata>\n"
41 - "Import an offline transaction to announce it into the network");
43 - std::vector<unsigned char> rawtx;
44 - for (int i=0; i<hexdump.size(); i+=2)
47 - if (sscanf(hexdump.substr(i,2).c_str(), "%x", &v)!=1)
48 - throw JSONRPCError(-4, "Error in hex data.");
49 - rawtx.push_back((unsigned char)v);
53 - CDataStream ss(rawtx, SER_NETWORK, PROTOCOL_VERSION);
56 - CInv inv(MSG_TX, tx.GetHash());
59 - if(! tx.AcceptToMemoryPool(txdb, true)) throw JSONRPCError(-4, "Transaction not accepted to memory pool.");
60 - CDataStream msg(rawtx, SER_NETWORK, PROTOCOL_VERSION);
61 - RelayMessage(inv, msg);
62 - return tx.GetHash().GetHex();
64 - catch (std::exception& e)
66 - throw JSONRPCError(-4, "Exception while parsing the transaction data.");
74 Value backupwallet(const Array& params, bool fHelp)
76 if (fHelp || params.size() != 1)
78 { "listsinceblock", &listsinceblock, false },
79 { "dumpprivkey", &dumpprivkey, false },
80 { "importprivkey", &importprivkey, false },
81 - { "importtransaction", &importtransaction, false },
84 CRPCTable::CRPCTable()