Change display of coin from 'dvpn' to 'p2p'

Author: freQniK

src/cli/wallet.py

@@ -406,8 +406,8 @@ def send_2plan_wallet(self, KEYNAME, plan_id, DENOM, amount_required, tax: bool=
         amount_required = int(amount_required)  # Just in case was passed as str
 
         # F***ck we have always a unit issue ...
-        if DENOM == "dvpn":
-            print(f"Denom is a dvpn, convert as udvpn, amount_required: {amount_required}dvpn")
+        if DENOM == "p2p":
+            print(f"Denom is a p2p, convert as udvpn, amount_required: {amount_required}p2p")
             DENOM = "udvpn"
             ubalance = balance.get("dvpn", 0) * IBCTokens.SATOSHI
         else:

src/kv/meile.kv

@@ -2116,7 +2116,7 @@ WindowManager:
         MDDropDownItem:
             id: drop_item
             pos_hint: {'center_x': .5, 'center_y': .5}
-            text: "dvpn"
+            text: "p2p"
             on_release: root.menu.open()
 
         MDLabel:
@@ -2175,7 +2175,7 @@ WindowManager:
                     font_size: sp(12)
                 TooltipMDIconButton:
                     icon: "help-circle"
-                    tooltip_text: "Pay with Wallet in DVPN or IBC enabled coins"
+                    tooltip_text: "Pay with Wallet in P2P or IBC enabled coins"
 
             MDBoxLayout:
                 orientation: "horizontal"
@@ -2258,7 +2258,7 @@ WindowManager:
         MDDropDownItem:
             id: drop_item
             pos_hint: {'center_x': .5, 'center_y': .5}
-            text: "dvpn"
+            text: "p2p"
             on_release: root.menu.open()
 
         MDLabel:
@@ -2450,7 +2450,7 @@ WindowManager:
                     text_color: get_color_from_hex(MeileColors.MEILE)
                 MDLabel:
                     font_name: "DejaVuSans"
-                    text: "There are two primary ways to receive tokens to purchase dVPN (the currency) subscriptions and utilize the network. 1.) You get the DVPN token on a exchange and send it to your wallet address. Current exchanges are KuCoin, HotBit, Polarity and Osmosis. Once you purchase the tokens on the exchange, you need to withdraw them to your address listed in the wallet section of this app. The tokens should appear within minutes after a withdrawal and you can begin purchasing and subscribing to Sentinel dVPN nodes through Meile. 2.) You can purchase the currency used for Meile dVPN right in our app via the 'RE-FUEL' button within the wallet. These funds will be handled by our servers and the payment processing is handled by Stripe. Once you successfully complete a purchase, your funds should appear in your wallet within minutes of a successful purchase through our app. This is the easiest method to using Meile dVPN."
+                    text: "There are two primary ways to receive coins to purchase P2P (the currency) subscriptions and utilize the network. 1.) You get the P2P coin on a exchange and send it to your wallet address. Current exchanges are KuCoin, HotBit, Polarity and Osmosis. Once you purchase the tokens on the exchange, you need to withdraw them to your address listed in the wallet section of this app. The tokens should appear within minutes after a withdrawal and you can begin purchasing and subscribing to Sentinel dVPN nodes through Meile. 2.) You can purchase the currency used for Meile dVPN right in our app via the 'RE-FUEL' button within the wallet. These funds will be handled by our servers and the payment processing is handled by Stripe. Once you successfully complete a purchase, your funds should appear in your wallet within minutes of a successful purchase through our app. This is the easiest method to using Meile dVPN."
                     size_hint_y: None
                     height: self.texture_size[1]
                     size_hint_x: 1
@@ -2593,7 +2593,7 @@ WindowManager:
 
                 MDLabel:
                     font_name: "DejaVuSans"
-                    text: "Sentinel is a Layer-1 blockchain within the Cosmos ecosystem. It was founded in 2017, and provides privacy services, such as decentralized VPN to users both of traditional commerce and blockchain enthusiasts. It's native coin ticker is $DVPN. "
+                    text: "Sentinel is a Layer-1 blockchain within the Cosmos ecosystem. It was founded in 2017, and provides privacy services, such as decentralized VPN to users both of traditional commerce and blockchain enthusiasts. It's native coin ticker is $P2P. "
                     size_hint_y: None
                     height: self.texture_size[1]
                     size_hint_x: 1
@@ -2722,7 +2722,7 @@ WindowManager:
                 id: token
                 pos_hint: {"x": .355, "center_y": .60}
                 text_color: get_color_from_hex(MeileColors.MEILE)
-                text: 'dvpn'
+                text: 'p2p'
                 on_release: root.menu_token.open()
 
             MDDropDownItem:
@@ -2748,7 +2748,7 @@ WindowManager:
 
             MDLabel:
                 id: dvpn_price
-                text: "DVPN: $" + str(root.get_token_price('dvpn'))
+                text: "P2P: $" + str(root.get_token_price('dvpn'))
                 theme_text_color: "Custom"
                 text_color: get_color_from_hex(MeileColors.MEILE)
                 pos_hint: {"x": .40, "center_y": .48}
@@ -2763,7 +2763,7 @@ WindowManager:
                 font_size: "16sp"
             MDLabel:
                 id: coin_qty
-                text:"QTY: " + str(root.DVPNOptions[root.idvpn]) + " dvpn"
+                text:"QTY: " + str(root.DVPNOptions[root.idvpn]) + " p2p"
                 theme_text_color: "Custom"
                 text_color: get_color_from_hex(MeileColors.MEILE)
                 pos_hint: {"x": .40, "center_y": .38}

src/typedef/konstants.py

@@ -555,20 +555,24 @@ class IBCTokens():
     ZANO_WALLET = "ZxDEXCMwvpwirJujwjZExHfKFEqNjMWdjLw5MGYXa5KxScvcsr2BNGm8TFyk4mvFAhAPtWh54tadWNgS5CxPAqXX1fpoQLkJJ"
 
     IBCCOINS     = [{'uscrt' : IBCSCRT}, {'uatom' : IBCATOM}, {'uosmo' : IBCOSMO}, {'uknwn' :IBCUNKWN}, {'unam' : IBCNAM}]
-    UNITTOKEN    = {'uscrt' : 'scrt', 'uatom' : 'atom' , 'uosmo' : 'osmo', 'udvpn' : 'dvpn', 'unam' : 'nam', 'tsent' : 'tsent'}
+    UNITTOKEN    = {'uscrt' : 'scrt', 'uatom' : 'atom' , 'uosmo' : 'osmo', 'udvpn' : 'p2p', 'unam' : 'nam', 'tsent' : 'tsent'}
     IBCUNITTOKEN = {'uscrt' : IBCSCRT, 'uatom' : IBCATOM , 'uosmo' : IBCOSMO, 'unam' : IBCNAM, 'udvpn' : 'udvpn', 'tsent' : 'tsent'}
     mu_coins     = ["udvpn", "uscrt", "uosmo", "uatom", "unam"]
-    ibc_coins    = ["dvpn", "scrt", "osmo", "atom", "nam"]
+    ibc_coins    = ["p2p", "scrt", "osmo", "atom", "nam"]
+    COIN_DISPLAY = {'dvpn': 'P2P'}
     ibc_mu_coins  = {"tsent" : "tsent", 
                      "dvpn"  : "udvpn", 
                      "scrt"  : "uscrt", 
                      "osmo"  : "uosmo", 
                      "atom"  : "uatom", 
-                     "nam"   : "unam"}
+                     "nam"   : "unam",
+                     "p2p"   : "udvpn"}
+    
     CSAPPMAP     = {'atom' : 'cosmos', 
                     'scrt' : 'secret', 
                     'osmo' : 'osmosis', 
                     'dvpn' : 'sentinel', 
+                    'p2p'  : 'sentinel',
                     'beam' : 'beam', 
                     'firo' : 'zcoin',
                     'pivx' : 'pivx',
@@ -604,7 +608,7 @@ class IBCTokens():
     #mu_coins     = ["tsent", "udvpn", "uscrt", "uosmo", "uatom", "udec"]
 class TextStrings():
     dash = "-"
-    VERSION = "v2.5.4"
+    VERSION = "v2.5.5"
     BUILD   = "17748518213"
     RootTag = "SENTINEL"
     GITHUB_API_URL = "https://api.github.com/repos/MathNodes/meile-gui/releases/latest"

src/ui/screens.py

@@ -22,10 +22,11 @@
 from helpers.v2ray import generate_v2ray_uri
 from helpers.update_checker import UpdateChecker, format_update_message
 from ui.update_dialog import UpdateDialog
+from coin_api.get_price import GetPriceAPI
 
 from kivy.properties import BooleanProperty, StringProperty, ColorProperty,ObjectProperty, NumericProperty
 from kivy.uix.screenmanager import Screen, SlideTransition
-from kivymd.uix.button import MDFlatButton, MDRaisedButton,MDTextButton, MDFillRoundFlatButton
+from kivymd.uix.button import MDFlatButton, MDRaisedButton
 from kivymd.uix.dialog import MDDialog
 from kivy.clock import Clock, mainthread
 from kivyoav.delayed import delayable
@@ -36,18 +37,15 @@
 from kivymd.uix.behaviors import HoverBehavior
 #from kivymd.theming import ThemableBehavior
 from kivy.core.window import Window
-#from kivymd.uix.behaviors.elevation import RectangularElevationBehavior
 from kivy_garden.mapview import MapMarkerPopup, MapView, MapSource
 from kivymd.toast import toast
 from kivy.uix.carousel import Carousel
 from kivymd.uix.boxlayout import MDBoxLayout
 from kivy.uix.floatlayout import FloatLayout
-from kivymd.uix.anchorlayout import MDAnchorLayout
 from kivymd.uix.label.label import MDLabel
 from kivy.animation import Animation
 from kivy.app import App
 
-import requests
 from requests.auth import HTTPBasicAuth
 import sys
 import copy
@@ -58,7 +56,6 @@
 from shutil import rmtree
 from os import path,geteuid, chdir, remove
 from threading import Thread
-import threading
 from unidecode import unidecode
 from datetime import datetime, timedelta
 import json
@@ -1720,7 +1717,7 @@ def __init__(self, ADDRESS,  **kwargs):
                                    width_mult=3,
                                    position="center",
                                    max_height=max_height,
-                                   background_color=get_color_from_hex(MeileColors.BLACK))
+                                   md_bg_color=get_color_from_hex(MeileColors.BLACK))
         Clock.schedule_once(self.build)
 
     def build(self, dt):
@@ -1894,11 +1891,11 @@ def SetBalances(self, CoinDict):
             self.scrt_text = str(CoinDict['scrt']) + " scrt"
             self.atom_text = str(CoinDict['atom']) + " atom"
             self.osmo_text = str(CoinDict['osmo']) + " osmo"
-            self.dvpn_text = str(CoinDict['dvpn']) + " dvpn"
+            self.dvpn_text = str(CoinDict['dvpn']) + " p2p"
             self.nam_text  = str(CoinDict['nam'])  + " nam"
             #self.dvpn_text = str(CoinDict['tsent']) + " tsent"
             data = [ 
-                { "logo" : self.return_coin_logo("dvpn"), "text" : self.dvpn_text },
+                { "logo" : self.return_coin_logo("p2p"), "text" : self.dvpn_text },
                 { "logo" : self.return_coin_logo("scrt"), "text" : self.scrt_text },
                 { "logo" : self.return_coin_logo("atom"), "text" : self.atom_text },
                 { "logo" : self.return_coin_logo("osmo"), "text" : self.osmo_text },
@@ -1912,7 +1909,7 @@ def SetBalances(self, CoinDict):
             self.scrt_text = str("0.0") + " scrt"
             self.atom_text = str("0.0") + " atom"
             self.osmo_text = str("0.0") + " osmo"
-            self.dvpn_text = str("0.0") + " dvpn"
+            self.dvpn_text = str("0.0") + " p2p"
             self.nam_text = str("0.0") + " nam"
             #self.dvpn_text = str("0.0") + " tsent"
 
@@ -1945,7 +1942,7 @@ def set_previous_screen(self):
         Meile.app.root.transistion = SlideTransition(direction="down")
         Meile.app.root.current = WindowNames.MAIN_WINDOW
 
-
+# deprecated
 class SubscriptionScreen(MDBoxLayout):
 
     def __init__(self, node_tree,  **kwargs):
@@ -2293,11 +2290,13 @@ def build(self):
         for pd in plan_data:
             req3 = http.get(HTTParams.PLAN_API + HTTParams.API_PLANS_NODES % pd['uuid'], auth=HTTPBasicAuth(scrtsxx.PLANUSERNAME, scrtsxx.PLANPASSWORD))
             plan_nodes = req3.json() if req3.ok and req3.status_code != 404 else []
-            no_of_nodes = len(plan_nodes)
+            no_of_nodes = 0
             countries = []
             no_of_countries = 0
             for node in plan_nodes:
                 node_data = self.mw.NodeTree.NodeTree.get_node(node)
+                if node_data:
+                    no_of_nodes += 1
                 try: 
                     if node_data.data['Country'] in countries:
                         continue
@@ -2311,9 +2310,10 @@ def build(self):
             self.PlanData.append(pd)
             self.TotalCountries.append(no_of_countries)
             self.TotalNodes.append(no_of_nodes)
-            #self.build_plans( pd, user_enrolled_plans, no_of_nodes, no_of_countries)
-        
-        #self.finish_loading()
+            
+        price_api = GetPriceAPI()
+        self.p2p_price = price_api.get_usd("p2p")['price']
+
         Clock.schedule_once(self.finished)
 
     def build_plans(self, data, plans, no_of_nodes, no_of_countries):
@@ -2326,12 +2326,15 @@ def build_plans(self, data, plans, no_of_nodes, no_of_countries):
 
         # In the future cost should be both in dvpn and euro (fuck usd)
         # Can use coin_api to get dvpn price and translate cost
+        
+        plancost = int(data['plan_price'] / IBCTokens.SATOSHI)
+        plancost_usd = round(float(plancost * self.p2p_price),2)
         item = PlanAccordion(
             node=PlanRow(
                 plan_name=data['plan_name'],
                 num_of_nodes=str(no_of_nodes),
                 num_of_countries=str(no_of_countries),
-                cost=str(round(float(data['plan_price'] / IBCTokens.SATOSHI),2)) + data['plan_denom'],
+                cost=str(plancost) + data['plan_denom'] + f"[color=fcb711]    ${plancost_usd}[/color]",
                 logo_image=data['logo'],
                 uuid=data['uuid'],
                 id=str(plan['subscription_id']) if plan else str(0),

src/ui/widgets.py

@@ -418,7 +418,7 @@ def return_sub_type(self):
         except AttributeError:
             return " GB"   
 
-    def refresh_price_async(self, mu_coin="dvpn", cache=30, callback=None):
+    def refresh_price_async(self, mu_coin="p2p", cache=30, callback=None):
         def fetch_price():
             try:
                 if mu_coin not in self.price_cache or time.time() - self.price_cache[mu_coin]["time"] > cache:
@@ -483,7 +483,7 @@ def __init__ (self, price, white_label, nnodes, logo_image):
         self.price_cache = {}
 
         self.price_text = price
-        self.parse_coin_deposit("dvpn")
+        self.parse_coin_deposit("p2p")
 
         self.white_label = white_label
         self.nnodes = str(nnodes)
@@ -561,7 +561,7 @@ def on_checkbox_active(self, pay_with: str, checkbox, value):
                 self.set_item("arrr")
 
             else:
-                self.ids.drop_item.text = "dvpn"
+                self.ids.drop_item.text = "p2p"
                 menu_items = [
                     {
                         "viewclass": "IconListItem",
@@ -595,27 +595,28 @@ def parse_coin_deposit(self, mu_coin, callback=None):
         self.deposit_callback = callback
 
         def after_dvpn_fetched(dt):
-            if mu_coin != "dvpn":
+            if mu_coin != "p2p":
                 self.refresh_price_async(mu_coin, cache=30, callback=self.after_both_prices_fetched)
             else:
                 self.after_both_prices_fetched(None)
 
-        self.refresh_price_async("dvpn", cache=30, callback=after_dvpn_fetched)
+        self.refresh_price_async("p2p", cache=30, callback=after_dvpn_fetched)
 
 
 
     def after_both_prices_fetched(self, dt):
         mu_coin = self.selected_mu_coin
         price_text = self.price_text_copy
         month = int(self.ids.slider1.value)
+        price = price_text.split("p2p")[0]
 
         try:
-            if mu_coin == "dvpn":
-                value = float(price_text.rstrip(mu_coin).strip())
+            if mu_coin == "p2p":
+                value = float(price.strip())
             else:
                 value = round(
-                    float(price_text.rstrip("dvpn").strip()) *
-                    self.price_cache["dvpn"]["price"] /
+                    float(price.strip()) *
+                    self.price_cache["p2p"]["price"] /
                     self.price_cache[mu_coin]["price"], 8
                 )
 
@@ -631,7 +632,7 @@ def after_both_prices_fetched(self, dt):
             if self.deposit_callback:
                 self.deposit_callback("Error")
 
-    def refresh_price_async(self, mu_coin="dvpn", cache=30, callback=None):
+    def refresh_price_async(self, mu_coin="p2p", cache=30, callback=None):
         def fetch_price():
             if mu_coin not in self.price_cache or time.time() - self.price_cache[mu_coin]["time"] > cache:
                 try:
@@ -720,7 +721,7 @@ def on_leave(self, *args):
         self.md_bg_color = get_color_from_hex("#fcb711")
         Window.set_system_cursor('arrow')
 
-
+# deprecated
 class NodeRow(MDGridLayout):
     moniker = StringProperty()
     location = StringProperty()
@@ -731,7 +732,8 @@ class NodeRow(MDGridLayout):
     def get_font(self):
         Config = MeileGuiConfig()
         return Config.resource_path(MeileColors.FONT_FACE)
-    
+
+# deprecated    
 class NodeDetails(MDGridLayout):
     sub_id = StringProperty()
     allocated = StringProperty()