Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge into Tkd-Alex/2.0/sdk #88

Merged
merged 5 commits into from
Feb 4, 2024
Merged

Merge into Tkd-Alex/2.0/sdk #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3c0756
Handle Unsubscription Errors and Process Accordingly, fix: https://gi…
Tkd-Alex Jan 25, 2024
3292494
Merge branch '2.0/sdk' of github.com:Tkd-Alex/meile-gui into 2.0/sdk
Tkd-Alex Jan 25, 2024
cd92ee2
Directly import RpcError from grpc
Tkd-Alex Jan 25, 2024
7795118
ulrparse instead of strip and replace for grpc
Tkd-Alex Feb 2, 2024
bfd4025
merge conflict
Tkd-Alex Feb 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/cli/sentinel.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from subprocess import Popen, PIPE, STDOUT
from datetime import datetime,timedelta
import time

from urllib.parse import urlparse
from treelib import Tree

from geography.continents import OurWorld
Expand Down Expand Up @@ -258,8 +258,8 @@ def get_subscriptions(self, ADDRESS):
self.RPC = CONFIG['network'].get('rpc', HTTParams.RPC)

self.GRPC = CONFIG['network'].get('grpc', HTTParams.GRPC)
grpc = self.GRPC.replace("grpc+http://", "").replace("/", "") # TODO: why const is grpc is saved as ... (?)
grpcaddr, grpcport = grpc.split(":")

grpcaddr, grpcport = urlparse(self.GRPC).netloc.split(":")
sdk = SDKInstance(grpcaddr, int(grpcport))
subscriptions = sdk.subscriptions.QuerySubscriptionsForAccount(ADDRESS, pagination=PageRequest(limit=1000))

Expand Down Expand Up @@ -337,8 +337,8 @@ def GetQuota(self, id):
CONFIG = MeileConfig.read_configuration(MeileConfig.CONFFILE)

self.GRPC = CONFIG['network'].get('grpc', HTTParams.GRPC)
grpc = self.GRPC.replace("grpc+http://", "").replace("/", "") # TODO: why const is grpc is saved as ... (?)
grpcaddr, grpcport = grpc.split(":")

grpcaddr, grpcport = urlparse(self.GRPC).netloc.split(":")
sdk = SDKInstance(grpcaddr, int(grpcport))
allocations = sdk.subscriptions.QueryAllocations(subscription_id=int(id))

Expand Down
34 changes: 27 additions & 7 deletions src/cli/wallet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
import psutil
import binascii
import random
import re
from time import sleep
from os import path, remove
from urllib.parse import urlparse
from grpc import RpcError

from json.decoder import JSONDecodeError

Expand Down Expand Up @@ -103,8 +106,8 @@ def subscribe(self, KEYNAME, NODE, DEPOSIT, GB, hourly):
self.RPC = CONFIG['network'].get('rpc', HTTParams.RPC)
self.GRPC = CONFIG['network'].get('grpc', HTTParams.GRPC)

grpc = self.GRPC.replace("grpc+http://", "").replace("/", "") # TODO: why const is grpc is saved as ... (?)
grpcaddr, grpcport = grpc.split(":")

grpcaddr, grpcport = urlparse(self.GRPC).netloc.split(":")

kr = self.__keyring(PASSWORD)
private_key = kr.get_password("meile-gui", KEYNAME) # TODO: very ungly
Expand Down Expand Up @@ -183,8 +186,8 @@ def unsubscribe(self, subId):

self.GRPC = CONFIG['network'].get('grpc', HTTParams.GRPC)

grpc = self.GRPC.replace("grpc+http://", "").replace("/", "") # TODO: why const is grpc is saved as ... (?)
grpcaddr, grpcport = grpc.split(":")

grpcaddr, grpcport = urlparse(self.GRPC).netloc.split(":")

kr = self.__keyring(PASSWORD)
private_key = kr.get_password("meile-gui", KEYNAME) # TODO: very ungly
Expand All @@ -204,8 +207,25 @@ def unsubscribe(self, subId):
# gas=ConfParams.GAS,
gas_multiplier=ConfParams.GASADJUSTMENT
)
tx = sdk.subscriptions.Cancel(subId, tx_params=tx_params)
tx_height = 0

try:
tx = sdk.subscriptions.Cancel(subId, tx_params=tx_params)
except RpcError as rpc_error:
details = rpc_error.details() # pylint: disable=no-member
# TODO: the following prints are only for debug
print("details", details)
print("code", rpc_error.code()) # pylint: disable=no-member
print("debug_error_string", rpc_error.debug_error_string()) # pylint: disable=no-member

search = f"invalid status inactive_pending for subscription {subId}"
if re.search(search, details, re.IGNORECASE):
message = "Cannot unsubscribe. Pending session still on blockchain. Try your request again later."
else:
message = "Error connecting to gRPC server. Try your request again later."

return {'hash' : None, 'success' : False, 'message' : message}

if tx.get("log", None) is None:
tx_response = sdk.nodes.wait_transaction(tx["hash"])
tx_height = tx_response.tx_response.height
Expand All @@ -222,8 +242,8 @@ def connect(self, ID, address, type):

self.GRPC = CONFIG['network'].get('grpc', HTTParams.GRPC)

grpc = self.GRPC.replace("grpc+http://", "").replace("/", "") # TODO: why const is grpc is saved as ... (?)
grpcaddr, grpcport = grpc.split(":")

grpcaddr, grpcport = urlparse(self.GRPC).netloc.split(":")

kr = self.__keyring(PASSWORD)
private_key = kr.get_password("meile-gui", KEYNAME) # TODO: very ungly
Expand Down