From 74add837c7f1587984eb522e3296e3403f1d2832 Mon Sep 17 00:00:00 2001 From: Satoshi Nakamoto <65907137+Satosh1Nakamot0@users.noreply.github.com> Date: Wed, 3 Nov 2021 21:21:39 +0100 Subject: [PATCH 1/6] Update PyBlock.py --- PyBlock.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/PyBlock.py b/PyBlock.py index d8da5e1..b7337f4 100644 --- a/PyBlock.py +++ b/PyBlock.py @@ -790,6 +790,7 @@ def APIMenuLOCAL(): \033[1;32;40mK.\033[0;37;40m Weather FREE \033[1;32;40mL.\033[0;37;40m Arcade FREE \033[1;32;40mM.\033[0;37;40m WhaleAlert FREE + \033[1;32;40mN.\033[0;37;40m Zebedee FREE \u001b[31;1mR.\033[0;37;40m Return \n\n\x1b[?25h""".format(n if path['bitcoincli'] else a , alias['alias'], d['blocks'], version, checkupdate(),lnbitspaid = "PAID" if os.path.isfile("lnbitSN.conf") else "PREMIUM", lnpaypaid = "PAID" if os.path.isfile("lnpaySN.conf") else "PREMIUM", opennodepaid = "PAID" if os.path.isfile("opennodeSN.conf") else "PREMIUM")) platfformsLOCALcontrol(input("\033[1;32;40mSelect option: \033[0;37;40m")) @@ -1466,6 +1467,45 @@ def WhaleApi(): \u001b[31;1mR.\033[0;37;40m Return \n\n\x1b[?25h""".format(n if path['bitcoincli'] else a , alias['alias'], d['blocks'], version, checkupdate())) menuWhaleA(input("\033[1;32;40mSelect option: \033[0;37;40m")) + +def ZebedeeApi(): + clear() + blogo() + sysinfo() + if path['bitcoincli']: + n = "Local" if path['bitcoincli'] else "Remote" + bitcoincli = " getblockchaininfo" + a = os.popen(path['bitcoincli'] + bitcoincli).read() + b = json.loads(a) + d = b + + lncli = " getinfo" + lsd = os.popen(lndconnectload['ln'] + lncli).read() + lsd0 = str(lsd) + alias = json.loads(lsd0) + else: + a = "Local" if path['bitcoincli'] else "Remote" + blk = rpc('getblockchaininfo') + d = blk + + cert_path = lndconnectload["tls"] + macaroon = codecs.encode(open(lndconnectload["macaroon"], 'rb').read(), 'hex') + headers = {'Grpc-Metadata-macaroon': macaroon} + url = 'https://{}/v1/getinfo'.format(lndconnectload["ip_port"]) + r = requests.get(url, headers=headers, verify=cert_path) + alias = r.json() + print("""\t\t + \033[1;37;40m{}\033[0;37;40m: \033[1;31;40mPyBLOCK\033[0;37;40m + \033[1;37;40mNode\033[0;37;40m: \033[1;33;40m{}\033[0;37;40m + \033[1;37;40mBlock\033[0;37;40m: \033[1;32;40m{}\033[0;37;40m + \033[1;37;40mVersion\033[0;37;40m: {} + \033[0;37;40mWhaleAlert + \033[1;32;40mA.\033[0;37;40m Wallet Balance + \033[1;32;40mB.\033[0;37;40m New invoice + \033[1;32;40mC.\033[0;37;40m Pay invoice + \u001b[31;1mR.\033[0;37;40m Return + \n\n\x1b[?25h""".format(n if path['bitcoincli'] else a , alias['alias'], d['blocks'], version, checkupdate())) + menuZebeD(input("\033[1;32;40mSelect option: \033[0;37;40m")) #-------------------------------- SETTINGS ----------------------------------------------- @@ -3202,6 +3242,14 @@ def menuWhaleAlert(menuWD): whalDataV2() elif menuWD in ["C", "c"]: whalDataV3() + +def menuZebedee(menuWD): + if menuWD in ["A", "a"]: + zebeDataV1() + elif menuWD in ["B", "b"]: + zebeDataV2() + elif menuWD in ["C", "c"]: + zebeDataV3() def mainmenuLOCALcontrol(menuS): #Execution of the Main Menu options if menuS in ["A", "a"]: From 6ed59987848b46f72a2b152f9a32b3e0e3f6f423 Mon Sep 17 00:00:00 2001 From: Satoshi Nakamoto <65907137+Satosh1Nakamot0@users.noreply.github.com> Date: Thu, 4 Nov 2021 01:08:54 +0100 Subject: [PATCH 2/6] Update PyBlock.py --- PyBlock.py | 1 + 1 file changed, 1 insertion(+) diff --git a/PyBlock.py b/PyBlock.py index b7337f4..6a05409 100644 --- a/PyBlock.py +++ b/PyBlock.py @@ -856,6 +856,7 @@ def miscellaneousLOCAL(): \u001b[38;5;202mA.\033[0;37;40m FunB \u001b[38;5;202mB.\033[0;37;40m Sysinfo + \u001b[38;5;202mC.\033[0;37;40m Bitcoin Fun \u001b[31;1mR.\033[0;37;40m Return \n\n\x1b[?25h""".format(n if path['bitcoincli'] else a , alias['alias'], d['blocks'], version, checkupdate())) miscellaneousLOCALmenu(input("\033[1;32;40mSelect option: \033[0;37;40m")) From 4c3e2014a522946fbb12485064fbfc9747e55fe2 Mon Sep 17 00:00:00 2001 From: Satoshi Nakamoto <65907137+Satosh1Nakamot0@users.noreply.github.com> Date: Thu, 4 Nov 2021 17:34:43 +0100 Subject: [PATCH 3/6] Update PyBlock.py --- PyBlock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyBlock.py b/PyBlock.py index 6a05409..f5f34b6 100644 --- a/PyBlock.py +++ b/PyBlock.py @@ -854,7 +854,7 @@ def miscellaneousLOCAL(): \033[1;37;40mBlock\033[0;37;40m: \033[1;32;40m{}\033[0;37;40m \033[1;37;40mVersion\033[0;37;40m: {} - \u001b[38;5;202mA.\033[0;37;40m FunB + \u001b[38;5;202mA.\033[0;37;40m Fun ₿ \u001b[38;5;202mB.\033[0;37;40m Sysinfo \u001b[38;5;202mC.\033[0;37;40m Bitcoin Fun \u001b[31;1mR.\033[0;37;40m Return From 1a1844cd4021bf001d1a0cfee8f6a79f74c7810b Mon Sep 17 00:00:00 2001 From: Satoshi Nakamoto <65907137+Satosh1Nakamot0@users.noreply.github.com> Date: Thu, 4 Nov 2021 23:36:09 +0100 Subject: [PATCH 4/6] Update PyBlock.py --- PyBlock.py | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/PyBlock.py b/PyBlock.py index f5f34b6..6c41ada 100644 --- a/PyBlock.py +++ b/PyBlock.py @@ -791,9 +791,49 @@ def APIMenuLOCAL(): \033[1;32;40mL.\033[0;37;40m Arcade FREE \033[1;32;40mM.\033[0;37;40m WhaleAlert FREE \033[1;32;40mN.\033[0;37;40m Zebedee FREE + \033[1;32;40mO.\033[0;37;40m LNMarkets FREE \u001b[31;1mR.\033[0;37;40m Return \n\n\x1b[?25h""".format(n if path['bitcoincli'] else a , alias['alias'], d['blocks'], version, checkupdate(),lnbitspaid = "PAID" if os.path.isfile("lnbitSN.conf") else "PREMIUM", lnpaypaid = "PAID" if os.path.isfile("lnpaySN.conf") else "PREMIUM", opennodepaid = "PAID" if os.path.isfile("opennodeSN.conf") else "PREMIUM")) platfformsLOCALcontrol(input("\033[1;32;40mSelect option: \033[0;37;40m")) + +def LNMAMenuLOCAL(): + clear() + blogo() + sysinfo() + if path['bitcoincli']: + n = "Local" if path['bitcoincli'] else "Remote" + bitcoincli = " getblockchaininfo" + a = os.popen(path['bitcoincli'] + bitcoincli).read() + b = json.loads(a) + d = b + + lncli = " getinfo" + lsd = os.popen(lndconnectload['ln'] + lncli).read() + lsd0 = str(lsd) + alias = json.loads(lsd0) + else: + a = "Local" if path['bitcoincli'] else "Remote" + blk = rpc('getblockchaininfo') + d = blk + + cert_path = lndconnectload["tls"] + macaroon = codecs.encode(open(lndconnectload["macaroon"], 'rb').read(), 'hex') + headers = {'Grpc-Metadata-macaroon': macaroon} + url = 'https://{}/v1/getinfo'.format(lndconnectload["ip_port"]) + r = requests.get(url, headers=headers, verify=cert_path) + alias = r.json() + print("""\t\t + \033[1;37;40m{}\033[0;37;40m: \033[1;31;40mPyBLOCK\033[0;37;40m + \033[1;37;40mNode\033[0;37;40m: \033[1;33;40m{}\033[0;37;40m + \033[1;37;40mBlock\033[0;37;40m: \033[1;32;40m{}\033[0;37;40m + \033[1;37;40mVersion\033[0;37;40m: {} + + \033[1;32;40mA.\033[0;37;40m Login + \033[1;32;40mB.\033[0;37;40m Withdraw + \033[1;32;40mC.\033[0;37;40m Deposit + \u001b[31;1mR.\033[0;37;40m Return + \n\n\x1b[?25h""".format(n if path['bitcoincli'] else a , alias['alias'], d['blocks'], version, checkupdate(),lnbitspaid = "PAID" if os.path.isfile("lnbitSN.conf") else "PREMIUM", lnpaypaid = "PAID" if os.path.isfile("lnpaySN.conf") else "PREMIUM", opennodepaid = "PAID" if os.path.isfile("opennodeSN.conf") else "PREMIUM")) + platfformsLOCALcontrol(input("\033[1;32;40mSelect option: \033[0;37;40m")) def decodeHex(): clear() From 5742da3bd2ac09e7c7b97d030683fdc9ec5476c1 Mon Sep 17 00:00:00 2001 From: Satoshi Nakamoto <65907137+SatoshiNakamotoBitcoin@users.noreply.github.com> Date: Fri, 5 Nov 2021 18:29:20 +0100 Subject: [PATCH 5/6] Update PyBlock.py --- PyBlock.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/PyBlock.py b/PyBlock.py index 6c41ada..57201e4 100644 --- a/PyBlock.py +++ b/PyBlock.py @@ -448,6 +448,14 @@ def callGitWardenTerminal(): git = "git clone https://github.com/pxsocs/warden_terminal.git" os.system(git) os.system("cd warden_terminal && python3 node_warden.py") + +#---------------------------------SatSale---------------------------------- +def callGitSatSale(): + if not os.path.isdir('satsale'): + git = "git clone https://github.com/nickfarrow/SatSale.git" + os.system(git) + os.system("cd satsale && python3 node_warden.py") + #---------------------------------ColdCore----------------------------------------- def callColdCore(): @@ -792,6 +800,7 @@ def APIMenuLOCAL(): \033[1;32;40mM.\033[0;37;40m WhaleAlert FREE \033[1;32;40mN.\033[0;37;40m Zebedee FREE \033[1;32;40mO.\033[0;37;40m LNMarkets FREE + \033[1;32;40mP.\033[0;37;40m SatSale FREE \u001b[31;1mR.\033[0;37;40m Return \n\n\x1b[?25h""".format(n if path['bitcoincli'] else a , alias['alias'], d['blocks'], version, checkupdate(),lnbitspaid = "PAID" if os.path.isfile("lnbitSN.conf") else "PREMIUM", lnpaypaid = "PAID" if os.path.isfile("lnpaySN.conf") else "PREMIUM", opennodepaid = "PAID" if os.path.isfile("opennodeSN.conf") else "PREMIUM")) platfformsLOCALcontrol(input("\033[1;32;40mSelect option: \033[0;37;40m")) From 50e6b9a2c51e2781b41ef4c0c2b126a0fe770e61 Mon Sep 17 00:00:00 2001 From: Satoshi Nakamoto <65907137+SatoshiNakamotoBitcoin@users.noreply.github.com> Date: Fri, 5 Nov 2021 18:30:46 +0100 Subject: [PATCH 6/6] Update PyBlock.py --- PyBlock.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PyBlock.py b/PyBlock.py index 57201e4..1a918b5 100644 --- a/PyBlock.py +++ b/PyBlock.py @@ -454,7 +454,7 @@ def callGitSatSale(): if not os.path.isdir('satsale'): git = "git clone https://github.com/nickfarrow/SatSale.git" os.system(git) - os.system("cd satsale && python3 node_warden.py") + os.system("cd satsale && python3 satsale.py") #---------------------------------ColdCore-----------------------------------------