* Make patches apply to bitcoin's git head.

[electrum-server.git] / patches / bitcoinrpc.cpp.diff

diff --git a/patches/bitcoinrpc.cpp.diff b/patches/bitcoinrpc.cpp.diff
index ac1705a..187b1b4 100644 (file)
--- a/patches/bitcoinrpc.cpp.diff
+++ b/patches/bitcoinrpc.cpp.diff
@@ -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;
  }
  
@@ -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]));