t* Make patches apply to bitcoin's git head. - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 2669f2dc2ec32d354ac8c2a6a0bf7c143450920f
DIR parent 2979598989659601ed2c711d1ffa2034d44e2a2d
HTML Author: Ovidiu Constantin <ovidiu@mybox.ro>
Date: Wed, 28 Dec 2011 21:26:16 +0200
* Make patches apply to bitcoin's git head.
Diffstat:
M server/patches/bitcoinrpc.cpp.diff | 24 ++++++++++--------------
M server/patches/main.cpp.diff | 29 +++++++++++++++++------------
2 files changed, 27 insertions(+), 26 deletions(-)
---
DIR diff --git a/server/patches/bitcoinrpc.cpp.diff b/server/patches/bitcoinrpc.cpp.diff
t@@ -1,8 +1,7 @@
-diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
-index 6e2eac5..8b60ebf 100644
---- a/src/bitcoinrpc.cpp
-+++ b/src/bitcoinrpc.cpp
-@@ -1355,7 +1355,43 @@ Value gettransaction(const Array& params, bool fHelp)
+diff -u -r bitcoin/src/bitcoinrpc.cpp bitcoin-electrum/src/bitcoinrpc.cpp
+--- bitcoin/src/bitcoinrpc.cpp 2011-12-28 21:23:40.844812872 +0200
++++ bitcoin-electrum/src/bitcoinrpc.cpp 2011-12-28 17:31:24.000000000 +0200
+@@ -1437,6 +1437,38 @@
return entry;
}
t@@ -37,20 +36,17 @@ index 6e2eac5..8b60ebf 100644
+ {
+ throw JSONRPCError(-4, "Exception while parsing the transaction data.");
+ }
-+
+}
-+
-+
-+
Value backupwallet(const Array& params, bool fHelp)
{
- if (fHelp || params.size() != 1)
-@@ -1850,6 +1886,7 @@ pair<string, rpcfn_type> pCallTable[] =
- make_pair("settxfee", &settxfee),
+@@ -1950,7 +1982,8 @@
make_pair("getmemorypool", &getmemorypool),
- make_pair("listsinceblock", &listsinceblock),
-+ make_pair("importtransaction", &importtransaction),
+ make_pair("listsinceblock", &listsinceblock),
+ 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]));
DIR diff --git a/server/patches/main.cpp.diff b/server/patches/main.cpp.diff
t@@ -1,8 +1,7 @@
-diff --git a/src/main.cpp b/src/main.cpp
-index 45de76a..8a9002f 100644
---- a/src/main.cpp
-+++ b/src/main.cpp
-@@ -2787,16 +2787,19 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
+diff -u -r bitcoin/src/main.cpp bitcoin-electrum/src/main.cpp
+--- bitcoin/src/main.cpp 2011-12-28 21:23:40.844812872 +0200
++++ bitcoin-electrum/src/main.cpp 2011-12-28 17:47:27.000000000 +0200
+@@ -2965,13 +2965,16 @@
// Size limits
unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK);
t@@ -10,19 +9,25 @@ index 45de76a..8a9002f 100644
- continue;
+ //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;
// Transaction fee required depends on block size
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;
+
// Connecting shouldn't fail due to dependency on other memory pool transactions
// because we're already processing them in order of dependency
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