1 --- main.cpp 2012-06-13 21:40:29.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 @@ -3295,13 +3292,6 @@
30 pblock->nBits = GetNextWorkRequired(pindexPrev, pblock.get());
35 - // Electrum: remove from mem pool
36 - BOOST_FOREACH(CTransaction& tx, pblock->vtx)
40 return pblock.release();
43 --- bitcoinrpc.cpp 2012-06-13 21:37:34.000000000 +0400
44 +++ bitcoinrpc.cpp.orig 2012-05-08 21:34:23.000000000 +0400
45 @@ -1496,45 +1496,7 @@
49 -Value importtransaction(const Array& params, bool fHelp)
52 - if (fHelp || params.size() != 1 || (hexdump=params[0].get_str()).size()&1)
53 - throw runtime_error(
54 - "importtransaction <hexdata>\n"
55 - "Import an offline transaction to announce it into the network");
57 - std::vector<unsigned char> rawtx;
58 - for (int i=0; i<hexdump.size(); i+=2)
61 - if (sscanf(hexdump.substr(i,2).c_str(), "%x", &v)!=1)
62 - throw JSONRPCError(-4, "Error in hex data.");
63 - rawtx.push_back((unsigned char)v);
67 - CDataStream ss(rawtx, SER_NETWORK, PROTOCOL_VERSION);
70 - CInv inv(MSG_TX, tx.GetHash());
73 - if(! tx.AcceptToMemoryPool(txdb, true)) throw JSONRPCError(-4, "Transaction not accepted to memory pool.");
74 - CDataStream msg(rawtx, SER_NETWORK, PROTOCOL_VERSION);
75 - RelayMessage(inv, msg);
76 - return tx.GetHash().GetHex();
78 - catch (std::exception& e)
80 - throw JSONRPCError(-4, "Exception while parsing the transaction data.");
88 Value backupwallet(const Array& params, bool fHelp)
90 if (fHelp || params.size() != 1)
92 { "listsinceblock", &listsinceblock, false },
93 { "dumpprivkey", &dumpprivkey, false },
94 { "importprivkey", &importprivkey, false },
95 - { "importtransaction", &importtransaction, false },
98 CRPCTable::CRPCTable()