Skip to content

Commit

Permalink
Pip release v0.10.3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
MathNodes committed Oct 18, 2022
1 parent d07076d commit 2fddbe3
Show file tree
Hide file tree
Showing 9 changed files with 183 additions and 77 deletions.
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
CHANGELOG
========================
# v0.10.3-pip (17/10/2022)
* NEW: Clickable Pin map with total node listings
* NEW: Refresh button in wallet screen
* NEW: Copy button for seed phrase on wallet restore/create
* NEW: Visible and draggable scrollbar on nodes
* CHANGE: Removed elevation from node cards as shadow rendering is broken in Kivy 1.1.1
* CHANGE: Padding on "wallet" in the fiat interface (binary release only)
* CHANGE: Using rpc.mathnodes.com:443 for subs fixing country block of port 4444
* FIX: Connection switch bug that displayed random on in nodes when refreshing leading to confusion
* FIX: Poor resize of screen with node cards. Resizes fast and clean
* FIX: Offline node consumed/allocated data progress bar and status text
* FIX: Divide by 0 bug and convert 0.00B to float


# v0.10.2-pip (11/10/2022)
* FIX: Python 3.8 kivy_garden error

# v0.10.1-pip (09/10/2022)
* FIX: Minor bug fixes

# v0.10.0-pip (09/10/2022)
* NEW: Meile Pin map of country nodes
* NEW: Clickable pins
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

setup(
name='meile-gui',
version='0.10.2',
version='0.10.3.2',
description='Meile dVPN powered by the Sentinel Network',
long_description=readme,
long_description_content_type="text/markdown",
Expand Down
6 changes: 3 additions & 3 deletions src/cli/sentinel.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ def get_subscriptions(self, ADDRESS):
SubsNodesInfo = []
SubsFinalResult = []
print("Geting Subscriptions... %s" % ADDRESS)
subsCMD = [sentinelcli, "query", "subscriptions", "--node", "https://rpc.mathnodes.com:4444", "--status", "Active", "--limit", "100", "--address" ,ADDRESS]
subsCMD = [sentinelcli, "query", "subscriptions", "--node", "https://rpc.mathnodes.com:443", "--status", "Active", "--limit", "100", "--address" ,ADDRESS]
proc = Popen(subsCMD, stdout=PIPE)

k=1
Expand Down Expand Up @@ -171,8 +171,8 @@ def get_subscriptions(self, ADDRESS):
FinalSubsKeys[3] : SubsResult[SubsInfoKeys[6]][k],
FinalSubsKeys[4] : SubsResult[SubsInfoKeys[7]][k],
FinalSubsKeys[5] : None,
FinalSubsKeys[6] : "0B",
FinalSubsKeys[7] : "0B"
FinalSubsKeys[6] : "0.00GB",
FinalSubsKeys[7] : "0.00B"
})
print("Sub not found in list")
k += 1
Expand Down
29 changes: 17 additions & 12 deletions src/cli/wallet.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def create(self, wallet_name, keyring_passphrase, seed_phrase):
else:
WalletDict['address'] = addy_seed[1].split(":")[-1].lstrip().rstrip()
WalletDict['seed'] = lines[-1].lstrip().rstrip().replace('\n', '')
remove(WALLETINFO)
#remove(WALLETINFO)
return WalletDict

else:
Expand All @@ -95,19 +95,24 @@ def subscribe(self, KEYNAME, NODE, DEPOSIT):
CONFIG = MeileGuiConfig.read_configuration(MeileGuiConfig, MeileGuiConfig.CONFFILE)
PASSWORD = CONFIG['wallet'].get('password', '')

ofile = open(SUBSCRIBEINFO, "wb")
ofile = open(SUBSCRIBEINFO, "wb")

if not KEYNAME:
return (False, 1337)

SCMD = "%s tx subscription subscribe-to-node --yes --keyring-backend file --keyring-dir %s --gas-prices 0.1udvpn --chain-id sentinelhub-2 --node https://rpc.mathnodes.com:443 --from '%s' '%s' %s" % (sentinelcli, KEYRINGDIR, KEYNAME, NODE, DEPOSIT)

child = pexpect.spawn(SCMD)
child.logfile = ofile

child.expect(".*")
child.sendline(PASSWORD)
child.expect(pexpect.EOF)

ofile.flush()
ofile.close()
try:
child = pexpect.spawn(SCMD)
child.logfile = ofile

child.expect(".*")
child.sendline(PASSWORD)
child.expect(pexpect.EOF)

ofile.flush()
ofile.close()
except pexpect.exceptions.TIMEOUT:
return (False, 1415)

return self.ParseSubscribe(self)

Expand Down
51 changes: 35 additions & 16 deletions src/kv/meile.kv
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,10 @@ WindowManager:
normal_color: app.theme_cls.accent_color

MDFloatLayout:

MDRaisedButton:
pos_hint: {'x' : .1 , 'top': .9 }
text: "REFRESH"
on_release: root.refresh_wallet()
Image:
source: root.get_qr_code_address()
pos_hint: {'x': 0, 'top': 1}
Expand Down Expand Up @@ -308,6 +311,7 @@ WindowManager:
pos_hint: {"center_x": .5, "center_y": .80}

MDLabel:
id: seed_hint
text: "Leave blank if creating a new wallet"
theme_text_color: "Custom"
text_color: get_color_from_hex("#4a4545")
Expand Down Expand Up @@ -351,14 +355,16 @@ WindowManager:

MDRaisedButton:
id: restore_wallet_button
text: "Restore"
text: "Create"
pos_hint: {"center_x": .5, "center_y": .4}
on_press: root.restore_wallet_from_seed_phrase()



<NodeRV>:
key_viewclass: "viewclass"
bar_width: dp(12)
scroll_type: ["bars", "content"]
canvas.before:
Color:
rgba: get_color_from_hex("#fccf62")
Expand All @@ -376,6 +382,7 @@ WindowManager:
spacing: 15
padding: 4,4,4,4





Expand Down Expand Up @@ -408,8 +415,6 @@ WindowManager:
padding: 10,10
border_radius: 20
radius: [10]
shadow_pos: 0,0
elevation: 42
num_text: ""
country_text: " "
source_image: " "
Expand Down Expand Up @@ -455,8 +460,6 @@ WindowManager:
padding: 10,10
border_radius: 20
radius: [10]
shadow_pos: 0,0
elevation: 42
md_bg_color: get_color_from_hex("#0d021b")
moniker_text: "."
country_text: "."
Expand Down Expand Up @@ -542,8 +545,6 @@ WindowManager:
padding: 10,10
border_radius: 20
radius: [10]
shadow_pos: 0,0
elevation: 42
md_bg_color: get_color_from_hex("#0d021b")
moniker_text: "."
sub_id_text: " "
Expand All @@ -563,7 +564,7 @@ WindowManager:
font_style: "H6"
font_size: "24sp"
text_color: get_color_from_hex("#fcb711")
width: "300dp"
width: "350dp"
pos_hint: {"x" : 0, "top" : 1.45}
size_hint_x: None
Image:
Expand Down Expand Up @@ -635,7 +636,7 @@ WindowManager:
text_color: 1,1,1,1
pos_hint: {"x" : 0.2, "top" : 1.03 }
MDProgressBar:
value: root.get_data_used(root.allocated_text, root.consumed_text)
value: root.get_data_used(root.allocated_text, root.consumed_text, root.address_text)
color: app.theme_cls.accent_color
#back_color: get_color_from_hex("#ffffff")
pos_hint: {"x" : 0, "top" : .475 }
Expand All @@ -650,6 +651,7 @@ WindowManager:
text_color: 1,1,1,1
pos_hint: {"x" : .5, "top" : 1.03 }
Switch:
id: node_switch
canvas.after:
Color:
rgb: get_color_from_hex("#fab40c")
Expand Down Expand Up @@ -702,9 +704,10 @@ WindowManager:

MDTextField:
id: seed_phrase
multiline: True
hint_text: root.hint_text
text: root.text
password: False
password: True
icon_left: "key-variant"
mode: "rectangle"

Expand Down Expand Up @@ -747,7 +750,7 @@ WindowManager:
id: wallet_password
hint_text: root.hint_text
text: root.text
password: False
password: True
icon_left: "key-variant"
mode: "rectangle"

Expand Down Expand Up @@ -788,19 +791,33 @@ WindowManager:

<WalletInfoContent>
orientation: "vertical"
spacing: "4dp"
spacing: "15dp"
size_hint_y: None
height: "260dp"
height: "300dp"
seed_phrase: ""
wallet_address: ""
wallet_password: ""
wallet_name: ""

padding: 0,10,0,10
MDTextField:
multiline: True
hint_text: "Mnemonic Seed"
text: root.seed_phrase
readonly: True
MDBoxLayout:
id: seed_box
orientation: "horizontal"
padding: 0,0,20,20
spacing: "20dp"
MDRaisedButton:
id: copy_seed_button
text: "COPY SEED"
font_size: dp(9)
pos_hint: {"center_x": .1, "center_y": .5}
on_press: root.copy_seed_phrase()
size_hint: None, None
size: 15,10

MDTextField:
hint_text: "Wallet"
mode: "rectangle"
Expand Down Expand Up @@ -934,7 +951,7 @@ WindowManager:
text_color: get_color_from_hex("#fcb711")
MDLabel:
font_name: "Roboto-Bold"
text: "v1.0.0"
text: "v1.1.1"
font_size: "16sp"
size_hint_y: .1
width: dp(500)
Expand Down Expand Up @@ -1073,6 +1090,8 @@ WindowManager:
md_bg_color: get_color_from_hex("#FFB908")
height: "70dp"
type: "top"
padding: 0,20,0,0


MDTextField:
hint_text: "Address"
Expand Down
9 changes: 5 additions & 4 deletions src/main/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
class MyMainApp(MDApp):
title = "Meile dVPN"
icon = MeileConfig.resource_path("../imgs/icon.png")
manager = None
def __init__(self,**kwargs):
super(MyMainApp,self).__init__(**kwargs)
from kivy.core.window import Window
Expand Down Expand Up @@ -48,18 +49,18 @@ def build(self):

kv = Builder.load_file(MeileConfig.resource_path("../kv/meile.kv"))

manager = WindowManager()
self.manager = WindowManager()
theme = ThemeManager()
self.theme_cls.primary_palette = "Amber"
self.theme_cls.theme_style = "Dark"
#self.theme_cls.disabled_primary_color = "Amber"
self.theme_cls.accent_palette = "DeepPurple"
#self.theme_cls.opposite_disabled_primary_color = "Amber"
manager.add_widget(PreLoadWindow(name=WindowNames.PRELOAD))
self.manager.add_widget(PreLoadWindow(name=WindowNames.PRELOAD))
#manager.add_widget(MainWindow(name=WindowNames.MAIN_WINDOW))
manager.add_widget(WalletRestore(name=WindowNames.WALLET_RESTORE))
#manager.add_widget(WalletRestore(name=WindowNames.WALLET_RESTORE))
#MeileConfig.read_configuration(MeileGuiConfig, MeileGuiConfig.CONFFILE)
return manager
return self.manager



Expand Down
2 changes: 1 addition & 1 deletion src/meile_gui.egg-info/PKG-INFO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Metadata-Version: 2.1
Name: meile-gui
Version: 0.10.2
Version: 0.10.3.2
Summary: Meile dVPN powered by the Sentinel Network
Home-page: https://meile.app
Author: MathNodes
Expand Down
Loading

0 comments on commit 2fddbe3

Please sign in to comment.