RanchiMall/flo-electrum
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Make patches apply to bitcoin's git head.

Browse Source
This commit is contained in:
Ovidiu Constantin 2011-12-28 21:26:16 +02:00
parent 2979598989
commit 2669f2dc2e
2 changed files with 27 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
server/patches/bitcoinrpc.cpp.diff
View File

@ -1,8 +1,7 @@
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp diff -u -r bitcoin/src/bitcoinrpc.cpp bitcoin-electrum/src/bitcoinrpc.cpp
index 6e2eac5..8b60ebf 100644 --- bitcoin/src/bitcoinrpc.cpp 2011-12-28 21:23:40.844812872 +0200
--- a/src/bitcoinrpc.cpp +++ bitcoin-electrum/src/bitcoinrpc.cpp 2011-12-28 17:31:24.000000000 +0200
+++ b/src/bitcoinrpc.cpp @@ -1437,6 +1437,38 @@
@@ -1355,7 +1355,43 @@ Value gettransaction(const Array& params, bool fHelp)
return entry; return entry;
} }
@ -37,20 +36,17 @@ index 6e2eac5..8b60ebf 100644
+ { + {
+ throw JSONRPCError(-4, "Exception while parsing the transaction data."); + throw JSONRPCError(-4, "Exception while parsing the transaction data.");
+ } + }
+
+} +}
+
+
+
Value backupwallet(const Array& params, bool fHelp) Value backupwallet(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 1) @@ -1950,7 +1982,8 @@
@@ -1850,6 +1886,7 @@ pair<string, rpcfn_type> pCallTable[] =
make_pair("settxfee", &settxfee),
make_pair("getmemorypool", &getmemorypool), make_pair("getmemorypool", &getmemorypool),
make_pair("listsinceblock", &listsinceblock), make_pair("listsinceblock", &listsinceblock),
+ make_pair("importtransaction", &importtransaction), make_pair("dumpprivkey", &dumpprivkey),
- make_pair("importprivkey", &importprivkey)
+ make_pair("importprivkey", &importprivkey),
+ make_pair("importtransaction", &importtransaction)
}; };
map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0])); map<string, rpcfn_type> mapCallTable(pCallTable, pCallTable + sizeof(pCallTable)/sizeof(pCallTable[0]));

29
server/patches/main.cpp.diff
View File

@ -1,28 +1,33 @@
diff --git a/src/main.cpp b/src/main.cpp diff -u -r bitcoin/src/main.cpp bitcoin-electrum/src/main.cpp
index 45de76a..8a9002f 100644 --- bitcoin/src/main.cpp 2011-12-28 21:23:40.844812872 +0200
--- a/src/main.cpp +++ bitcoin-electrum/src/main.cpp 2011-12-28 17:47:27.000000000 +0200
+++ b/src/main.cpp @@ -2965,13 +2965,16 @@
@@ -2787,16 +2787,19 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
// Size limits // Size limits
unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK); unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK);
- if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN) - if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN)
- continue; - continue;
+ //if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN) + //if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE_GEN)
+ // continue;
int nTxSigOps = tx.GetSigOpCount();
- if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
- continue;
+ //if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
+ // continue; + // continue;
// Transaction fee required depends on block size // Transaction fee required depends on block size
bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority)); bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority));
int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, true); int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, GMF_BLOCK);
+ // electrum server: do not check fees + // Electrum server: do not check fees
+ nMinFee = 0; + nMinFee = 0;
+ +
// Connecting shouldn't fail due to dependency on other memory pool transactions // Connecting shouldn't fail due to dependency on other memory pool transactions
// because we're already processing them in order of dependency // because we're already processing them in order of dependency
map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool); map<uint256, CTxIndex> mapTestPoolTmp(mapTestPool);
@@ -2981,8 +2984,8 @@
int nTxSigOps = 0;
if (!tx.ConnectInputs(mapInputs, mapTestPoolTmp, CDiskTxPos(1,1,1), pindexPrev, nFees, false, true, nTxSigOps, nMinFee))
continue;
- if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
- continue;
+ //if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
+ // continue;
swap(mapTestPool, mapTestPoolTmp);
// Added