From 3ad3a6082ba237485ba410cb62b9642aea93a84c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sa=C5=82aban?= <michal@salaban.info>
Date: Mon, 13 Apr 2020 11:43:01 +0200
Subject: [PATCH] Fix encoding errors on send_transaction()

---
 monero/backends/jsonrpc.py                    |   3 ++-
 ...8fb8e94272c16a8a58b6fe7cf3b4327158e3a44.tx | Bin 0 -> 2598 bytes
 .../test_send_transaction.json                |  18 ++++++++++++++++++
 tests/test_jsonrpcdaemon.py                   |  18 ++++++++++++++++++
 utils/pushtx.py                               |   5 +++--
 utils/transfer.py                             |   2 +-
 6 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 tests/data/test_jsonrpcdaemon/0e8fa9202e0773333360e5b9e8fb8e94272c16a8a58b6fe7cf3b4327158e3a44.tx
 create mode 100644 tests/data/test_jsonrpcdaemon/test_send_transaction.json

diff --git a/monero/backends/jsonrpc.py b/monero/backends/jsonrpc.py
index 7203ae4..4247a4d 100644
--- a/monero/backends/jsonrpc.py
+++ b/monero/backends/jsonrpc.py
@@ -5,6 +5,7 @@ import operator
 import json
 import logging
 import requests
+import six
 
 from .. import exceptions
 from ..account import Account
@@ -67,7 +68,7 @@ class JSONRPCDaemon(object):
 
     def send_transaction(self, blob, relay=True):
         res = self.raw_request('/sendrawtransaction', {
-            'tx_as_hex': binascii.hexlify(blob),
+            'tx_as_hex': six.ensure_text(binascii.hexlify(blob)),
             'do_not_relay': not relay})
         if res['status'] == 'OK':
             return res
diff --git a/tests/data/test_jsonrpcdaemon/0e8fa9202e0773333360e5b9e8fb8e94272c16a8a58b6fe7cf3b4327158e3a44.tx b/tests/data/test_jsonrpcdaemon/0e8fa9202e0773333360e5b9e8fb8e94272c16a8a58b6fe7cf3b4327158e3a44.tx
new file mode 100644
index 0000000000000000000000000000000000000000..6e4ad39b310a2eb0b3b9aee5040a8b4c0ba3dd0b
GIT binary patch
literal 2598
zcmV+>3fc7n00II43*DC~$**CRuL;)~zcH-`(gA<U2bcq7gaI0XYEy5A3PJaIQwKQu
z*i#j}h$fH5DSK1CjdSkR0ssr$(|(Mj4);RQvjOY50<9&TcE_>-#vIccnjlD}0!cUu
z`YSz+{nUf|LdiJtTpmnb$#SK|QbJK`(Tf5A0&V&j$q*z?`5PLKx2H@zPiJd;eYF0d
zpVl7D+e!u3rT_wPu1FAiTnn>O+$9%3_3);VxX<<E5nhVd=eFSta~+&40qo+GhRnJc
ztXX_LH^$sy{!GI1RDtG<#KSjI+qD)aVFC#O5dL&F>M8C11fY}AgamH+vXFr+vh1oO
zUnZedd;m-fugP!kral5Z1@+JmT~-x_AYpuI&tjR4Y85Wqpq-!Vym8~`VpunG^3+Ij
z6)Fx`<EL$!^#~=5p}BXh69oa%UfE{1A}VBOfUGxEFUjbj+7X2uQmmKYauWfLJd_Mp
zG4)IlP}PKjhEf668=v6R9xN-;-AcI(W-%TLK-V(5aAeIhK*^zidxwQTbHzZDBd{9i
zE#*S<*U8}ZurC#fd}k2)8m9aDXlnLj%U4i;AGf8^7R8xPI`sv(1=E8$SRAtAVY~_>
zmoRqzSws}xCleRs@!E(5E0W-b-`@mIjbWfeI6>nm4E@@Tzcsgh!p_O0vbGa|n1SoE
zfk6icykfly9l8jmCFkRFRVtQQh@{wsazhaWk5&H1=EEAO_(a)c22IhQ6=znF{`M3`
z?9ha50wT!6=Yw2#UpR`L$U2S@M?iH@;~E*<)!lWxm1LJlBg>bEXqd_NzWY`V59Ha|
z<8!bhqd}2~3c6?7m_qOy5LjXQ<yYRAzF;RJe2vhtq_kTC(S{>^te?vf5`~3&k>9^}
zFO4L<O@(H0o=6{TY|{{XeYk}0x|C>DCyz&^Q46`ehSPY>%c%w*&huI|4efC%mDgS4
zFp9Zz`a_S!WUF3%Y7>v!?s;f)2cB*0P9T}8z1&iQxDU|O8!rq}rCA<7N^Q*6WvI^(
ziWOSi42+6tmhg`#Jm2%qD};+@Y8sBvC8e>pVW@`3<`P)GW%tSj@K_%rq|wR<Js~T+
zSy8e=k}PU%XSiPHqRF%Skkw?U&TPX{26_xPj__ic7DUva2iQCniXNWF8ECO12;7Z0
zojo4!!0|3Fs3AFlX)_i+sqIN~H<A6_O1vVA?h1NW4L8h3g%txkrkLATr#-jrF^v`}
ziVc*}mohzesIjkxm=sKSX$(dcoF##25wF<(+h1Vf-RwPaCUaWpqx^^IwoUS{;Jv#R
zddzxtb9L2AB4$TCDFh^p07@gM;l!$g2{qweW2^T~Do&U8A0II{b{1>oVVmsR0C^S$
zeJ?#P@PwnCUR|b3<rvZVQ?sQ|jzP^fi**d?3=uBX5!ViVJ^IuHwj+b~M!Qj<imrZE
zfu7?u%?x7x3`1Pyh?1~nV88TO7&arSfV$%hnCq0N&D@dJ`DzXI3Bk79%n{2I|MkQC
zG8D39R4voX0{j{Q?#-IxSF1^~3EH1pK1=~36E|jjMK(2nIqeA(DI^?Vq5N^$`9O^u
z0>q_teA+&s{UM;09_Fvx+H1&M;Y)@nEnXMBDr6E)57?b+;G<e>W3_I_+~6J1zDfSU
zvjcO6A^~|$q^mh)4~e+^jYe8p@7MwWHLNCLD3GAMArM&N;sn(Kp#ZM10koAf|HJG?
z>)OuxHkgpY<z+fAkkB+4r<d*>uHg!@3kv%>)mL;FKp10<@r2t}Epg%_I8`A$v4X->
z^n*WY3%Ko;1_$$9XnMs)X+RUm(OaSru0Y@~60(+!N2vOu4Ev%k|IDz5y<&}to5Ms|
zmO-|i9YZLI;TA<$*j2@P4rFc>2`Y7^uP?M*5di~804l0CRH~FcMxg#WUb%{E3M0L*
ze<Xw+mgM}YrW9Jo-`NH5qwiB;1K+;wS=`s~2GM^?$Xh9THkTp9#;*T^5v6@0{%}rV
z{{4|NM0v{61g>5qUA?q=M~Yff7Elr(W)Uy9*l~t)Qz1K3??Uwb3Y`Lv^t4_pc$?BR
zajTIfiIES~cde88ln}>?_j+3T3(yFjX%=CN1PKcqea7u2+7A0W>pkd7r7fZp>Dw%#
z2@@Cs(=mEz(pM&+8`MIfC*sLteb2@gtd1;usqWbH0+Wo6=!!zJt&`r_RsZrh-kHBC
zqTfz^Z`G1q%YkDO1H0zlkq4GI>btW!(I61dV#=139!f&QzX!k3S=RQ}4aukgZi|W^
zMV7a8n8Az67TFm|`5-s)zyIrMq)Kih3L$z<Riz0?19|i)w$=8!NO_AefA-|kB!&Wm
z1J_eh2uo7AoRGp$caXx1!|ZuGaz_-wA=?ltD9BH;sh{BJ4h?!uHolE<B8(2B>PawM
z9-RQc*9!8tr^=KNpb}0r4_NI-nhw~M;T~f5gYEXzDoIFT0<<Ek-8?5+ixXnf0$#{l
zl1Pp63|N86$@Ec87^f!c?ZN=^cwS9?^|22_3azGmLkyCl{C8v=ZfC}cPjjYqlg@yv
zmhBUqXB#9g0*_y7^ZsfH#(o(-ubTqY@xrmmb3`CyWw3lu9{LuW4Q4+W0dhfzc%pI^
zMd+FO<&-d50(eR3y?Pw)kBPY82l)F+6>^dOth~%(%?MAKgqbh6P5^I{V+587A3Xi@
z0QMw3WL#}K?A<n+C<?j4d)m1QHRLl}@iy;f^3~Z11jBvAry@8;u>2Q!{!#ETu>tS1
zZLkm)s}~kv)-LLk2OPS1`>JbRHmIQAhX;gkso1x3%UB#m*p3O5J6Ff{2(?3GJ%9JR
zFf+Z7iw=fxnj~S7WHjl_Q-=Q@>v9-Q3v?=*-HFyg6)lxOp6rbhv`mx$bRk}jTz3>g
z(=Kjd0zyFh9n>L3?&Zb{DCZ?T!H5T1r3oAojq-P;PzD^M3DzX(xm$ghwj+RQD~Ejw
zw9agHT#t^AzCv}VZS7Xf4Qoudw#9Uq$l}B$tuSiXtKGd<946|<-Nib;uN^cb2$P9_
z8qMj1wnbIL<<R0d=Q><Ro<)><B><4(e~)TP1yZRoG-xtMP}{JKj*=BHTVrzxR%9g)
z*Zbj+XGbf|0=3rPkO^bH!?)!(6nELgVptGkD7Am;11>P>8GnVd2IlQq7Tqv=oc>bH
zNdfS&vzQWj&R)<p;$dF>>j|AW1&}9K+#hyT04FkD&CcF!&Yv!I;XQqlV+Ylp_DUn1
z3<@?54B>@v=<wYi_BF^HEL3SE>;cDBXY(?JiP$x#0aM}e2Y_a@JFkpH+@ui#iew=t
z`u!aLTbN~a$uFAO1`QhgO!_U;<$~~=N{eaZQK0RND~dkjDC<w9+Epp~4^Utvz1T7r
zwU-<(uDE=Lah^IqVJQIEInrtlMLP>2<i=#im(X6Rh3YZ^8pwCbU+#!Z{Lu{x@RTMw
I`#kN8hMIif761SM

literal 0
HcmV?d00001

diff --git a/tests/data/test_jsonrpcdaemon/test_send_transaction.json b/tests/data/test_jsonrpcdaemon/test_send_transaction.json
new file mode 100644
index 0000000..5388e75
--- /dev/null
+++ b/tests/data/test_jsonrpcdaemon/test_send_transaction.json
@@ -0,0 +1,18 @@
+{
+  "credits": 0,
+  "double_spend": false,
+  "fee_too_low": false,
+  "invalid_input": false,
+  "invalid_output": false,
+  "low_mixin": false,
+  "not_rct": false,
+  "not_relayed": false,
+  "overspend": false,
+  "reason": "",
+  "sanity_check_failed": false,
+  "status": "OK",
+  "too_big": false,
+  "too_few_outputs": false,
+  "top_hash": "",
+  "untrusted": false
+}
diff --git a/tests/test_jsonrpcdaemon.py b/tests/test_jsonrpcdaemon.py
index 4e0e065..f8dd6dd 100644
--- a/tests/test_jsonrpcdaemon.py
+++ b/tests/test_jsonrpcdaemon.py
@@ -1,9 +1,11 @@
 import decimal
+import os
 import responses
 
 from monero.const import NET_STAGE
 from monero.daemon import Daemon
 from monero.backends.jsonrpc import JSONRPCDaemon
+from monero.transaction import Transaction
 
 from .base import JSONTestCase
 
@@ -11,6 +13,7 @@ class JSONRPCDaemonTestCase(JSONTestCase):
     jsonrpc_url = 'http://127.0.0.1:18081/json_rpc'
     mempool_url = 'http://127.0.0.1:18081/get_transaction_pool'
     transactions_url = 'http://127.0.0.1:18081/get_transactions'
+    sendrawtransaction_url = 'http://127.0.0.1:18081/sendrawtransaction'
     data_subdir = 'test_jsonrpcdaemon'
 
     def setUp(self):
@@ -110,3 +113,18 @@ class JSONRPCDaemonTestCase(JSONTestCase):
                 "035a1cfadd2f80124998f5af8c7bb6703743a4f322d0a20b7f7b502956ada59d")
         self.assertIsNone(txs[3].height)
         self.assertEqual(txs[3].size, 2724)
+
+    @responses.activate
+    def test_send_transaction(self):
+        path = os.path.join(
+            os.path.dirname(__file__),
+            "data",
+            self.data_subdir,
+            "0e8fa9202e0773333360e5b9e8fb8e94272c16a8a58b6fe7cf3b4327158e3a44.tx")
+        responses.add(responses.POST, self.sendrawtransaction_url,
+            json=self._read('test_send_transaction.json'),
+            status=200)
+        tx = Transaction(
+            blob=open(path, "rb").read())
+        rsp = self.daemon.send_transaction(tx)
+        self.assertEqual(rsp["status"], "OK")
diff --git a/utils/pushtx.py b/utils/pushtx.py
index 0a1419a..5374d50 100755
--- a/utils/pushtx.py
+++ b/utils/pushtx.py
@@ -4,6 +4,7 @@ import logging
 import operator
 import re
 import sys
+import six
 
 from monero.backends.jsonrpc import JSONRPCDaemon
 from monero.daemon import Daemon
@@ -36,9 +37,9 @@ elif args.verbosity > 1:
     level = logging.DEBUG
 logging.basicConfig(level=level, format="%(asctime)-15s %(message)s")
 if args.tx_filenames:
-    blobs = [(f, open(f, 'r').read()) for f in args.tx_filenames]
+    blobs = [(f, open(f, 'rb').read()) for f in args.tx_filenames]
 else:
-    blobs = [('transaction', sys.stdin.read())]
+    blobs = [('transaction', sys.stdin.buffer.read() if six.PY3 else sys.stdin.read())]
 d = Daemon(JSONRPCDaemon(timeout=args.timeout, proxy_url=args.proxy_url, **args.daemon_rpc_url))
 for name, blob in blobs:
     logging.debug("Sending {}".format(name))
diff --git a/utils/transfer.py b/utils/transfer.py
index 9847e2c..6487711 100755
--- a/utils/transfer.py
+++ b/utils/transfer.py
@@ -63,6 +63,6 @@ for tx in txns:
     if args.outdir:
         outname = os.path.join(args.outdir, tx.hash + '.tx')
         outfile = open(outname, 'wb')
-        outfile.write(tx.blob.encode())
+        outfile.write(tx.blob)
         outfile.close()
         print(u"Transaction saved to {}".format(outname))