From 090ef0c9845ad8c1da7edc6c57fd858963e096b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sa=C5=82aban?= <michal@salaban.info>
Date: Sun, 28 Jan 2018 13:04:47 +0100
Subject: [PATCH] Update to recent Monero project state

---
 monero/backends/jsonrpc.py | 6 +++++-
 monero/wallet.py           | 6 ++++++
 utils/walletdump.py        | 2 ++
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/monero/backends/jsonrpc.py b/monero/backends/jsonrpc.py
index 5ed0544..83710b4 100644
--- a/monero/backends/jsonrpc.py
+++ b/monero/backends/jsonrpc.py
@@ -116,6 +116,10 @@ class JSONRPCWallet(object):
     def get_height(self):
         return self.raw_request('getheight')['height']
 
+    def get_spend_key(self):
+        # NOTE: This will fail on 0.11.x, the method was missing
+        return self.raw_request('query_key', {'key_type': 'spend_key'})['key']
+
     def get_view_key(self):
         return self.raw_request('query_key', {'key_type': 'view_key'})['key']
 
@@ -305,11 +309,11 @@ class MethodNotFound(RPCError):
 
 _err2exc = {
     -2: exceptions.WrongAddress,
-    -4: exceptions.NotEnoughUnlockedMoney,
     -5: exceptions.WrongPaymentId,
     -8: exceptions.TransactionNotFound,
     -16: exceptions.TransactionNotPossible,
     -17: exceptions.NotEnoughMoney,
     -20: exceptions.AmountIsZero,
+    -37: exceptions.NotEnoughUnlockedMoney, # PR pending: https://github.com/monero-project/monero/pull/3197
     -32601: MethodNotFound,
 }
diff --git a/monero/wallet.py b/monero/wallet.py
index 39a9bb9..20fb159 100644
--- a/monero/wallet.py
+++ b/monero/wallet.py
@@ -28,6 +28,12 @@ class Wallet(object):
         """
         return self._backend.get_height()
 
+    def get_spend_key(self):
+        """
+        Returns private spend key.
+        """
+        return self._backend.get_spend_key()
+
     def get_view_key(self):
         """
         Returns private view key.
diff --git a/utils/walletdump.py b/utils/walletdump.py
index d977921..64c4415 100644
--- a/utils/walletdump.py
+++ b/utils/walletdump.py
@@ -60,10 +60,12 @@ print(
         unlocked=w.get_balance(unlocked=True)))
 print(
     "Keys:\n" \
+    "  private spend: {ssk}\n" \
     "  private view:  {svk}\n" \
     "  public spend:  {psk}\n" \
     "  public view:   {pvk}\n\n" \
     "Seed:\n{seed}".format(
+        ssk=w.get_spend_key(),
         svk=w.get_view_key(),
         psk=masteraddr.get_spend_key(),
         pvk=masteraddr.get_view_key(),