From 50eebd236e6e37eba1adc2c6cc6282b3434676cd Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Wed, 31 Jul 2019 22:50:01 +0700 Subject: [PATCH 1/9] Minor fixes and TODOs --- qa/rpc-tests/{src => }/nspv_client_test.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) rename qa/rpc-tests/{src => }/nspv_client_test.py (89%) diff --git a/qa/rpc-tests/src/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py similarity index 89% rename from qa/rpc-tests/src/nspv_client_test.py rename to qa/rpc-tests/nspv_client_test.py index fbf0e5360..aecff3696 100644 --- a/qa/rpc-tests/src/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -3,19 +3,22 @@ sys.path.append('../../src/tui') from lib import tuilib import unittest +import time ''' specify chain ticker (daemon should be up), wif which will be imported and address to which you want to broadcast added 1 second sleep after each case to surely not face the nSPV server limitation (1 call/second) ''' -wif = '' -dest_address = 'RMjy5VkHFJkXTJDTJ3XX1zVzukP48sKyva' +wif = 'UsJgUBrmcsthJEGbyBBfD77tZ1FuRMkB68jqkP8E3PEE88eXesEH' +dest_address = 'RNvAWip4DuFrZf8WhqdTBEcAg1bWjd4rKr' amount = '0.1' chain = 'ILN' rpc_proxy = tuilib.def_credentials(chain) +# TODO: recheck nspv_login_timeout, nspv_notarizations +# TODO: add brand new methods, add one-utxo-only addr for test purpose class TestNspvClient(unittest.TestCase): @@ -31,14 +34,14 @@ class TestNspvClient(unittest.TestCase): result = rpc_proxy.nspv_notarizations("2000") self.assertEqual(result["result"], "success") self.assertEqual(result["prev"]["notarized_height"], 1998) - self.assertEqual(result["next"]["notarized_height"], 2002) + self.assertEqual(result["next"]["notarized_height"], 2008) # check suspicious behaviour time.sleep(1) def test_nspv_hdrsproof(self): print("testing nspv_hdrsproof") result = rpc_proxy.nspv_hdrsproof("2000", "2100") self.assertEqual(result["result"], "success") - self.assertEqual(result["numhdrs"], 101) + self.assertEqual(result["numhdrs"], 113) time.sleep(1) def test_nspv_login(self): @@ -54,7 +57,8 @@ class TestNspvClient(unittest.TestCase): self.assertEqual(result["result"], "success") time.sleep(1) result = rpc_proxy.nspv_listunspent("RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") - self.assertEqual(result["result"], "error") + self.assertEqual(result["result"], "success") + self.assertEqual(result["address"], "RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") def test_nspv_spend(self): print("testing nspv_spend") From f878c9e05ecf77e2ddaf3b9539489096e5c62b78 Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Wed, 31 Jul 2019 23:35:54 +0700 Subject: [PATCH 2/9] More fixes less TODOs --- qa/rpc-tests/nspv_client_test.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/qa/rpc-tests/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py index aecff3696..aecc05fb7 100644 --- a/qa/rpc-tests/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -17,8 +17,7 @@ chain = 'ILN' rpc_proxy = tuilib.def_credentials(chain) -# TODO: recheck nspv_login_timeout, nspv_notarizations -# TODO: add brand new methods, add one-utxo-only addr for test purpose +# TODO: add brand new methods, add one-utxo-only addr for test purpose, recheck test once more at least class TestNspvClient(unittest.TestCase): @@ -107,7 +106,7 @@ class TestNspvClient(unittest.TestCase): def test_nspv_login_timout(self): print("testing auto-logout in 777 seconds") rpc_proxy.nspv_login(wif) - time.sleep(777) + time.sleep(778) result = rpc_proxy.nspv_spend(dest_address, amount) self.assertEqual(result["result"], "error") self.assertEqual(result["error"], "wif expired") From aa1539afd08cd82afff4f5f7e78a1321f8fc4fb7 Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Thu, 1 Aug 2019 14:31:20 +0700 Subject: [PATCH 3/9] added nspv_listtransactions call test --- qa/rpc-tests/nspv_client_test.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/qa/rpc-tests/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py index aecc05fb7..d5d1e4bba 100644 --- a/qa/rpc-tests/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -21,6 +21,17 @@ rpc_proxy = tuilib.def_credentials(chain) class TestNspvClient(unittest.TestCase): + def test_nspv_listtransactions(self): + print("testing nspv_listtransactions") + rpc_proxy.nspv_login(wif) + result = rpc_proxy.nspv_listtransactions() + self.assertEqual(result["result"], "success") + time.sleep(1) + result = rpc_proxy.nspv_listtransactions("RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") + self.assertEqual(result["result"], "success") + self.assertEqual(result["address"], "RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") + rpc_proxy.nspv_logout() + def test_nspv_getinfo(self): print("testing nspv_getinfo") result = rpc_proxy.nspv_getinfo() @@ -36,6 +47,16 @@ class TestNspvClient(unittest.TestCase): self.assertEqual(result["next"]["notarized_height"], 2008) # check suspicious behaviour time.sleep(1) + def test_nspv_listtransactions(self): + print("testing nspv_listtransactions") + result = rpc_proxy.nspv_listtransactions() + self.assertEqual(result["result"], "success") + time.sleep(1) + result = rpc_proxy.nspv_listunspent("RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") + self.assertEqual(result["result"], "success") + self.assertEqual(result["address"], "RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") + + def test_nspv_hdrsproof(self): print("testing nspv_hdrsproof") result = rpc_proxy.nspv_hdrsproof("2000", "2100") From 887d54fd813d6093060c3a1d30a1ffd171595a17 Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Thu, 1 Aug 2019 16:13:30 +0700 Subject: [PATCH 4/9] cleanup and recheck --- qa/rpc-tests/nspv_client_test.py | 34 ++++++++++++++++---------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/qa/rpc-tests/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py index d5d1e4bba..e247a45a2 100644 --- a/qa/rpc-tests/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -10,26 +10,36 @@ specify chain ticker (daemon should be up), wif which will be imported and addre added 1 second sleep after each case to surely not face the nSPV server limitation (1 call/second) ''' -wif = 'UsJgUBrmcsthJEGbyBBfD77tZ1FuRMkB68jqkP8E3PEE88eXesEH' -dest_address = 'RNvAWip4DuFrZf8WhqdTBEcAg1bWjd4rKr' +wif = '' +dest_address = '' amount = '0.1' chain = 'ILN' +if not wif or not dest_address: + raise Exception("Please set test wif and address to send transactions to.") + rpc_proxy = tuilib.def_credentials(chain) -# TODO: add brand new methods, add one-utxo-only addr for test purpose, recheck test once more at least class TestNspvClient(unittest.TestCase): + def test_nspv_mempool(self): + print("testing nspv_mempool") + result = rpc_proxy.nspv_mempool("0", dest_address, "0") + self.assertEqual(result["result"], "success") + self.assertEqual(result["address"], dest_address) + self.assertEqual(result["isCC"], 0) + time.sleep(1) + def test_nspv_listtransactions(self): print("testing nspv_listtransactions") rpc_proxy.nspv_login(wif) result = rpc_proxy.nspv_listtransactions() self.assertEqual(result["result"], "success") time.sleep(1) - result = rpc_proxy.nspv_listtransactions("RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") + result = rpc_proxy.nspv_listtransactions("RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu") self.assertEqual(result["result"], "success") - self.assertEqual(result["address"], "RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") + self.assertEqual(result["address"], "RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu") rpc_proxy.nspv_logout() def test_nspv_getinfo(self): @@ -47,16 +57,6 @@ class TestNspvClient(unittest.TestCase): self.assertEqual(result["next"]["notarized_height"], 2008) # check suspicious behaviour time.sleep(1) - def test_nspv_listtransactions(self): - print("testing nspv_listtransactions") - result = rpc_proxy.nspv_listtransactions() - self.assertEqual(result["result"], "success") - time.sleep(1) - result = rpc_proxy.nspv_listunspent("RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") - self.assertEqual(result["result"], "success") - self.assertEqual(result["address"], "RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") - - def test_nspv_hdrsproof(self): print("testing nspv_hdrsproof") result = rpc_proxy.nspv_hdrsproof("2000", "2100") @@ -76,9 +76,9 @@ class TestNspvClient(unittest.TestCase): result = rpc_proxy.nspv_listunspent() self.assertEqual(result["result"], "success") time.sleep(1) - result = rpc_proxy.nspv_listunspent("RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") + result = rpc_proxy.nspv_listunspent("RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu") self.assertEqual(result["result"], "success") - self.assertEqual(result["address"], "RQ1mvCUcziWzRwE8Ugtex29VjoFjRzxQJT") + self.assertEqual(result["address"], "RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu") def test_nspv_spend(self): print("testing nspv_spend") From ad6f142a92e20442a48505fb22c0d3bf0d995490 Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Thu, 1 Aug 2019 16:34:50 +0700 Subject: [PATCH 5/9] final cleanup lowered coins amount --- qa/rpc-tests/nspv_client_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qa/rpc-tests/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py index e247a45a2..63b7f78d1 100644 --- a/qa/rpc-tests/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -12,11 +12,11 @@ added 1 second sleep after each case to surely not face the nSPV server limitati wif = '' dest_address = '' -amount = '0.1' +amount = '0.01' chain = 'ILN' if not wif or not dest_address: - raise Exception("Please set test wif and address to send transactions to.") + raise Exception("Please set test wif and address to send transactions to") rpc_proxy = tuilib.def_credentials(chain) @@ -54,7 +54,7 @@ class TestNspvClient(unittest.TestCase): result = rpc_proxy.nspv_notarizations("2000") self.assertEqual(result["result"], "success") self.assertEqual(result["prev"]["notarized_height"], 1998) - self.assertEqual(result["next"]["notarized_height"], 2008) # check suspicious behaviour + self.assertEqual(result["next"]["notarized_height"], 2008) time.sleep(1) def test_nspv_hdrsproof(self): @@ -85,7 +85,7 @@ class TestNspvClient(unittest.TestCase): result = rpc_proxy.nspv_login(wif) result = rpc_proxy.nspv_spend(dest_address, amount) self.assertEqual(result["result"], "success") - self.assertEqual(result["vout"][0]["valueZat"], 10000000) + self.assertEqual(result["vout"][0]["valueZat"], 1000000) time.sleep(1) def test_nspv_broadcast(self): From 7a4f8b3401a67e505eaa68fa74974b585a08e23e Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Fri, 2 Aug 2019 03:05:47 +0700 Subject: [PATCH 6/9] Prolonged Proxy timeout Added support for multiple test chains --- qa/rpc-tests/nspv_client_test.py | 77 ++++++++++++++++++++++---------- src/tui/lib/tuilib.py | 20 ++++++++- 2 files changed, 73 insertions(+), 24 deletions(-) mode change 100644 => 100755 qa/rpc-tests/nspv_client_test.py diff --git a/qa/rpc-tests/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py old mode 100644 new mode 100755 index 63b7f78d1..ddc1d8093 --- a/qa/rpc-tests/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -7,19 +7,48 @@ import time ''' specify chain ticker (daemon should be up), wif which will be imported and address to which you want to broadcast +change chain parameters if needed or add a new chain to test below added 1 second sleep after each case to surely not face the nSPV server limitation (1 call/second) ''' wif = '' dest_address = '' amount = '0.01' -chain = 'ILN' +chain = 'KMD' if not wif or not dest_address: raise Exception("Please set test wif and address to send transactions to") rpc_proxy = tuilib.def_credentials(chain) +chain_params = {"KMD": { + 'tx_list_address': 'RGShWG446Pv24CKzzxjA23obrzYwNbs1kA', + 'min_chain_height': 1468080, + 'notarization_height': '1468000', + 'prev_notarization_h': 1467980, + 'next_notarization_h': 1468020, + 'hdrs_proof_low': '1468100', + 'hdrs_proof_high': '1468200', + 'numhdrs_expected': 151, + 'tx_proof_id': 'f7beb36a65bc5bcbc9c8f398345aab7948160493955eb4a1f05da08c4ac3784f', + 'tx_spent_height': 1456212, + 'tx_proof_height': '1468520', + }, + "ILN": { + 'tx_list_address': 'RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu', + 'min_chain_height': 3689, + 'notarization_height': '2000', + 'prev_notarization_h': 1998, + 'next_notarization_h': 2008, + 'hdrs_proof_low': '2000', + 'hdrs_proof_high': '2100', + 'numhdrs_expected': 113, + 'tx_proof_id': '67ffe0eaecd6081de04675c492a59090b573ee78955c4e8a85b8ac0be0e8e418', + 'tx_spent_height': 2681, + 'tx_proof_height': '2690', + } + } + class TestNspvClient(unittest.TestCase): @@ -37,31 +66,32 @@ class TestNspvClient(unittest.TestCase): result = rpc_proxy.nspv_listtransactions() self.assertEqual(result["result"], "success") time.sleep(1) - result = rpc_proxy.nspv_listtransactions("RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu") + result = rpc_proxy.nspv_listtransactions(chain_params.get(chain).get("tx_list_address")) self.assertEqual(result["result"], "success") - self.assertEqual(result["address"], "RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu") + self.assertEqual(result["address"], chain_params.get(chain).get("tx_list_address")) rpc_proxy.nspv_logout() def test_nspv_getinfo(self): print("testing nspv_getinfo") result = rpc_proxy.nspv_getinfo() self.assertEqual(result["result"], "success") - self.assertGreater(result["height"], 2689) + self.assertGreater(result["height"], chain_params.get(chain).get("min_chain_height")) time.sleep(1) def test_nspv_notarizations(self): print("testing nspv_notarizations") - result = rpc_proxy.nspv_notarizations("2000") + result = rpc_proxy.nspv_notarizations(chain_params.get(chain).get("notarization_height")) self.assertEqual(result["result"], "success") - self.assertEqual(result["prev"]["notarized_height"], 1998) - self.assertEqual(result["next"]["notarized_height"], 2008) + self.assertEqual(result["prev"]["notarized_height"], chain_params.get(chain).get("prev_notarization_h")) + self.assertEqual(result["next"]["notarized_height"], chain_params.get(chain).get("next_notarization_h")) time.sleep(1) def test_nspv_hdrsproof(self): print("testing nspv_hdrsproof") - result = rpc_proxy.nspv_hdrsproof("2000", "2100") + result = rpc_proxy.nspv_hdrsproof(chain_params.get(chain).get("hdrs_proof_low"), + chain_params.get(chain).get("hdrs_proof_high")) self.assertEqual(result["result"], "success") - self.assertEqual(result["numhdrs"], 113) + self.assertEqual(result["numhdrs"], chain_params.get(chain).get("numhdrs_expected")) time.sleep(1) def test_nspv_login(self): @@ -76,9 +106,9 @@ class TestNspvClient(unittest.TestCase): result = rpc_proxy.nspv_listunspent() self.assertEqual(result["result"], "success") time.sleep(1) - result = rpc_proxy.nspv_listunspent("RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu") + result = rpc_proxy.nspv_listunspent(chain_params.get(chain).get("tx_list_address")) self.assertEqual(result["result"], "success") - self.assertEqual(result["address"], "RUp3xudmdTtxvaRnt3oq78FJBjotXy55uu") + self.assertEqual(result["address"], chain_params.get(chain).get("tx_list_address")) def test_nspv_spend(self): print("testing nspv_spend") @@ -113,25 +143,26 @@ class TestNspvClient(unittest.TestCase): def test_nspv_spentinfo(self): print("testing nspv_spent_info") - result = rpc_proxy.nspv_spentinfo("67ffe0eaecd6081de04675c492a59090b573ee78955c4e8a85b8ac0be0e8e418", "1") + result = rpc_proxy.nspv_spentinfo(chain_params.get(chain).get("tx_proof_id"), "1") self.assertEqual(result["result"], "success") - self.assertEqual(result["spentheight"], 2681) + self.assertEqual(result["spentheight"], chain_params.get(chain).get("tx_spent_height")) time.sleep(1) def test_nspv_txproof(self): print("testing nspv_txproof") - result = rpc_proxy.nspv_txproof("67ffe0eaecd6081de04675c492a59090b573ee78955c4e8a85b8ac0be0e8e418", "2673") - self.assertEqual(result["txid"], "67ffe0eaecd6081de04675c492a59090b573ee78955c4e8a85b8ac0be0e8e418") + result = rpc_proxy.nspv_txproof(chain_params.get(chain).get("tx_proof_id"), + chain_params.get(chain).get("tx_proof_height")) + self.assertEqual(result["txid"], chain_params.get(chain).get("tx_proof_id")) time.sleep(1) - def test_nspv_login_timout(self): - print("testing auto-logout in 777 seconds") - rpc_proxy.nspv_login(wif) - time.sleep(778) - result = rpc_proxy.nspv_spend(dest_address, amount) - self.assertEqual(result["result"], "error") - self.assertEqual(result["error"], "wif expired") - time.sleep(1) + def test_nspv_login_timout(self): + print("testing auto-logout in 777 seconds") + rpc_proxy.nspv_login(wif) + time.sleep(778) + result = rpc_proxy.nspv_spend(dest_address, amount) + self.assertEqual(result["result"], "error") + self.assertEqual(result["error"], "wif expired") + time.sleep(1) if __name__ == '__main__': diff --git a/src/tui/lib/tuilib.py b/src/tui/lib/tuilib.py index 9a2fed639..afb4fad63 100755 --- a/src/tui/lib/tuilib.py +++ b/src/tui/lib/tuilib.py @@ -21,6 +21,24 @@ if operating_system != 'Win64' and operating_system != 'Windows': import readline +class CustomProxy(Proxy): + def __init__(self, + service_url=None, + service_port=None, + conf_file=None, + timeout=3000): + config = dict() + if conf_file: + config = slickrpc.ConfigObj(conf_file) + if service_url: + config.update(self.url_to_conf(service_url)) + if service_port: + config.update(rpcport=service_port) + elif not config.get('rpcport'): + config['rpcport'] = 7771 + self.conn = self.prepare_connection(config, timeout=timeout) + + def colorize(string, color): colors = { @@ -97,7 +115,7 @@ def def_credentials(chain): print("check "+coin_config_file) exit(1) - return(Proxy("http://%s:%s@127.0.0.1:%d"%(rpcuser, rpcpassword, int(rpcport)))) + return(CustomProxy("http://%s:%s@127.0.0.1:%d"%(rpcuser, rpcpassword, int(rpcport)))) def getinfo_tui(rpc_connection): From 1108c4cb32b8c5537ac9cbd73363867c6666d297 Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Fri, 2 Aug 2019 03:06:38 +0700 Subject: [PATCH 7/9] typo fix --- qa/rpc-tests/nspv_client_test.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/qa/rpc-tests/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py index ddc1d8093..5611e1e31 100755 --- a/qa/rpc-tests/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -155,14 +155,14 @@ class TestNspvClient(unittest.TestCase): self.assertEqual(result["txid"], chain_params.get(chain).get("tx_proof_id")) time.sleep(1) - def test_nspv_login_timout(self): - print("testing auto-logout in 777 seconds") - rpc_proxy.nspv_login(wif) - time.sleep(778) - result = rpc_proxy.nspv_spend(dest_address, amount) - self.assertEqual(result["result"], "error") - self.assertEqual(result["error"], "wif expired") - time.sleep(1) + def test_nspv_login_timout(self): + print("testing auto-logout in 777 seconds") + rpc_proxy.nspv_login(wif) + time.sleep(778) + result = rpc_proxy.nspv_spend(dest_address, amount) + self.assertEqual(result["result"], "error") + self.assertEqual(result["error"], "wif expired") + time.sleep(1) if __name__ == '__main__': From c07f73e217304ae6ee6b005648224699cafdb585 Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Sun, 4 Aug 2019 01:29:20 +0700 Subject: [PATCH 8/9] change default chain to ILN --- qa/rpc-tests/nspv_client_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qa/rpc-tests/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py index 5611e1e31..8487105ff 100755 --- a/qa/rpc-tests/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -13,8 +13,8 @@ added 1 second sleep after each case to surely not face the nSPV server limitati wif = '' dest_address = '' -amount = '0.01' -chain = 'KMD' +amount = '0.001' +chain = 'ILN' if not wif or not dest_address: raise Exception("Please set test wif and address to send transactions to") From cf844ce5a49318dbb1e4fb2ffe9f0c34c7e7df56 Mon Sep 17 00:00:00 2001 From: SirSevenG Date: Sun, 4 Aug 2019 01:29:50 +0700 Subject: [PATCH 9/9] def amount change --- qa/rpc-tests/nspv_client_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/rpc-tests/nspv_client_test.py b/qa/rpc-tests/nspv_client_test.py index 8487105ff..26f88cf5a 100755 --- a/qa/rpc-tests/nspv_client_test.py +++ b/qa/rpc-tests/nspv_client_test.py @@ -13,7 +13,7 @@ added 1 second sleep after each case to surely not face the nSPV server limitati wif = '' dest_address = '' -amount = '0.001' +amount = '0.01' chain = 'ILN' if not wif or not dest_address: