check wallet edits

texts_cli.py

@@ -100,10 +100,10 @@ def _ask_more_wallets():
 #     return msg
 
 
-def _display_wallet_check_result(z):
+def _display_wallet_check_result(key):
     """displays answer based on added data"""
     msg_0 = \
-        f"\nThis {z} already exists in your wallet dictionary."\
+        f"\nThis {key} already exists in your wallet dictionary."\
         f"\nDo you want to continue?\n1 - YES (keep it duplicate)"\
         f"\n2 - NO (change the item)"\
         f"{_menu_choice()}"
@@ -113,9 +113,9 @@ def _display_wallet_check_result(z):
     return (msg_0, msg_1)
 
 
-def _enter_new_info(y):
+def _enter_new_info(key):
     """Asks user for a correct information"""
-    msg = f"\nPlease write a correct {y}:\n\n"
+    msg = f"\nPlease write a correct {key}:\n\n"
     return msg
 
 def _save_wallet_confirm(addresses, new_wallet):

wallets_dict.json

@@ -1,505 +0,0 @@
-{
-    "evm_wallets": {
-        "@vitalik.eth": {
-            "twitter": "https://twitter.com/VitalikButerin",
-            "info": "ETH foundation, influencer, researcher, cult",
-            "ens": "vitalik.eth",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xd8da6bf26964af9d7eed9e03e53415d37aa96045",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "heco",
-                        "ftm",
-                        "avax",
-                        "optm",
-                        "arb"
-                    ]
-                },
-                "wallet_1": {
-                    "address": "0xc1e42f862d202b4a0ed552c1145735ee088f6ccf",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "ftm",
-                        "avax",
-                        "arb",
-                        "optm"
-                    ]
-                }
-            }
-        },
-
-        "@zhusu_3ac": {
-            "twitter": "https://twitter.com/zhusu",
-            "info": "3AC founder, enterpreteur, Deribit, uncommon core",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x4862733B5FdDFd35f35ea8CCf08F5045e57388B3",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "heco",
-                        "ftm",
-                        "avax"
-                    ]
-                },
-                "wallet_1": {
-                    "address": "0x4093fbe60ab50ab79a5bd32fa2adec255372f80e",
-                    "networks": [
-                        "erc"
-                    ]
-                },
-                "wallet_2": {
-                    "address": "0x3ba21b6477f48273f41d241aa3722ffb9e07e247",
-                    "networks": [
-                        "erc"
-                    ]
-                }
-            }
-        },
-        "alameda": {
-            "twitter": "https://twitter.com/SBF_Alameda",
-            "info": "ftx foundation",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xfa34bf9307f2f68a70b4369bb2f522b2b2bb222b",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "avax"
-                    ]
-                },
-                "wallet_1": {
-                    "address": "0x84d34f4f83a87596cd3fb6887cff8f17bf5a7b83",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "avax",
-                        "heco",
-                        "ftm",
-                        "optm",
-                        "arb"
-                    ]
-                }
-            }
-        },
-        "blocktower": {
-            "twitter": " ",
-            "info": "fund",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x43adde52c6c142912662d3e427709db5cac9b811",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "avax",
-                        "heco",
-                        "ftm"
-                    ]
-                }
-            }
-        },
-        "a16z": {
-            "twitter": " ",
-            "info": " VC fund",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x66b870ddf78c975af5cd8edc6de25eca81791de1",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "avax",
-                        "heco",
-                        "ftm",
-                        "optm",
-                        "arb"
-                    ]
-                }
-            }
-        },
-        "etherum_nickname": {
-            "twitter": " ",
-            "info": "#1 followers on debank.com",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xbdfa4f4492dd7b7cf211209c4791af8d52bf5c50",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "avax",
-                        "heco",
-                        "ftm",
-                        "optm",
-                        "arb",
-                        "gns",
-                        "aur"
-                    ]
-                }
-            }
-        },
-        "@Amelisa.eth": {
-            "twitter": " ",
-            "info": "small anon whale, sharp alt plays",
-            "ens": "amelisa.eth",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x3c9002cdb61c56b89467d94a2d93235dfd698089",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "avax",
-                        "ftm",
-                        "optm",
-                        "arb"
-                    ]
-                }
-            }
-        },
-        "tetranode": {
-            "twitter": " ",
-            "info": " ",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x9c5083dd4838e120dbeac44c052179692aa5dac5",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "heco",
-                        "ftm",
-                        "optm",
-                        "arb"
-                    ]
-                }
-            }
-        },
-        "alt_degen": {
-            "twitter": " ",
-            "info": "smaller alt degen play wallet, name is made up",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x1d3db45f912c74de554409c1ad0d27dbcb26b726",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "heco",
-                        "ftm",
-                        "avax",
-                        "arb"
-                    ]
-                }
-            }
-        },
-        "@obvio.eth": {
-            "twitter": " ",
-            "info": "whale on eth",
-            "ens": "obvio.eth",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x179456bf16752FE5Eb8789148E5C98Eb39D87Fe5",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "heco",
-                        "ftm",
-                        "avax",
-                        "arb"
-                    ]
-                }
-            }
-        },
-        "@wed.eth": {
-            "twitter": " ",
-            "info": "nft (eth) trader",
-            "ens": "wed.eth",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xAB6cA2017548A170699890214bFd66583A0C1754",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "poly",
-                        "heco",
-                        "avax"
-                    ]
-                }
-            }
-        },
-        "ftm_whale": {
-            "twitter": " ",
-            "info": "whale on fantom",
-            "ens": "",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xebf4fbb9c81b84dd5cf89bc75588e5d0018501b3",
-                    "networks": [
-                        "erc",
-                        "ftm"
-                    ]
-                }
-            }
-        },
-        "parafi": {
-            "twitter": " ",
-            "info": "fund",
-            "ens": "",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x4655b7ad0b5f5bacb9cf960bbffceb3f0e51f363",
-                    "networks": [
-                        "erc",
-                        "heco",
-                        "avax"
-                    ]
-                },
-
-                "wallet_1:": {
-                    "address": "0x59cee32f3ffaeabc0d4991ac7569ebad09e1a7d4",
-                    "networks": [
-                        "erc"
-                    ]
-                }
-            }
-        },
-        "gmx_degen": {
-            "twitter": " ",
-            "info": "degen who was early in gmx, active small cap investor",
-            "ens": "",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x1e7127c81c8a58661a0811f026b6be66533934be",
-                    "networks": [
-                        "erc"
-                    ]
-                }
-            }
-        },
-
-        "devmons.eth": {
-            "twitter": " ",
-            "info": "gOHM investor, NFT whale, nansen smart money",
-            "ens": "devmons.eth",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x5efb87c9ff9da9ba445dfef71f0446682352c15d",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "gns",
-                        "poly",
-                        "ftm",
-                        "avx",
-                        "arb",
-                        "optm"
-
-                    ]
-
-                }
-            }
-        },
-
-        "Arca": {
-            "twitter": " ",
-            "info": "whale",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0x23a5efe19aa966388e132077d733672cf5798c03",
-                    "networks": [
-                        "erc"
-                    ]
-                }
-            }
-        },
-
-        "Sigil fund": {
-            "twitter": " ",
-            "info": "gOHM investor",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xe2e4f2a725e42d0f0ef6291f46c430f963482001",
-                    "networks": [
-                        "erc",
-                        "optm",
-                        "avax",
-                        "bsc"
-                    ]
-                },
-                "wallet_1:": {
-                    "address": "0x0561a78021d8966ddd20c28c6c4318d8675ee1f0",
-                    "networks": [
-                        "erc",
-                        "arb",
-                        "avax",
-                        "poly"
-                    ]
-                }
-            }
-        },
-
-        "Stani Kulechov": {
-            "twitter": "https://twitter.com/StaniKulechov",
-            "info": "CEO and founder of Aave",
-            "ens": " " ,
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xf5fb27b912d987b5b6e02a1b1be0c1f0740e2c6f",
-                    "networks": [
-                        "erc",
-                        "avax",
-                        "bsc",
-                        "poly"
-                    ]
-                }
-            }
-        },
-
-        "punkify.eth": {
-            "twitter": " ",
-            "info": "whale",
-            "ens": "punkify.eth",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xaf297dec752c909092a117a932a8ca4aaaff9795",
-                    "networks": [
-                        "erc",
-                        "bsc",
-                        "arb",
-                        "optm",
-                        "poly",
-                        "ftm",
-                        "fuse",
-                        "one"
-                    ]
-                }
-            }
-        },
-
-        "analytico.eth": {
-            "twitter": " ",
-            "info": "algo trading firm",
-            "ens": "analytico.eth",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xa0f75491720835b36edc92d06ddc468d201e9b73",
-                    "networks": [
-                        "erc",
-                        "optm",
-                        "poly",
-                        "avax",
-                        "bsc",
-                        "arb",
-                        "ftm"
-                    ]
-                }
-            }
-        },
-
-        "XMON_wallet": {
-            "twitter": "https://twitter.com/<full_address>",
-            "info": "xmon investor",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xf6e2c94a609ca303964b65ec991a1a0d2991b961",
-                    "networks": [
-                        "erc",
-                        "aur",
-                        "ftm"
-                    ]
-                },
-                "wallet_1:": {
-                    "address": "0x39eea0258a5c3e3c5092b2f910371d124592a7fb",
-                    "networks": [
-                        "erc",
-                        "ftm"
-                    ]
-                }
-            }
-        },
-
-        "GMX_wallet": {
-            "twitter": " ",
-            "info": " ",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "<0x332a4fb9603ecd65f3a4e321e8c10826c46049af",
-                    "networks": [
-                        "arb",
-                        "erc",
-                        "ftm"
-                    ]
-                },
-                "wallet_1": {
-                    "address": "0x5058352e527694a554966154397af9ab79d75461",
-                    "networks": [
-                        "poly",
-                        "arb"
-                    ]
-                }
-            }
-        },
-
-        "JPEG_wallet": {
-            "twitter": " ",
-            "info": " ",
-            "ens": " ",
-            "wallets": {
-                "wallet_0": {
-                    "address": "0xb0dafc466871c29662e5cbf4227322c96a8ccbe9",
-                    "networks": [
-                        "erc",
-                        "poly",
-                        "avax",
-                        "arb"
-                    ]
-                },
-                "wallet_1": {
-                    "address": "0xf52bad5e97658f04b5228d58f428e98f9139d23f",
-                    "networks": [
-                        "erc"
-                    ]
-                }
-            }
-        }
-
-    },
-    "spl_wallets":
-    {
-        "@Cyrii": {
-            "twitter": "https://twitter.com/cyrii_MM",
-            "info": "$COPE - main dev/founder, main holder, cult",
-            "ens": " ",
-            "wallets": {
-                "spl_0": {
-                    "address": "13pHDZsFyuTJ9uMA8SbY8vjBs5TmZ3jJeiCwvEyax4tu",
-                    "networks": [
-                        "spl"
-                    ]
-                }
-            }
-        }
-    }
-}

whallets_cli.py

@@ -154,17 +154,17 @@ def get_inputs():
             "address": addresses
     }
 
-    for item, value in new_wallet.items():
-        x = input(tc._prompt_new_info(item))
-        new_item = check_wallet_item(ntw_i,x)
-        if item == 'address':
+    for key, value in new_wallet.items():
+        x = input(tc._prompt_new_info(key))
+        new_item = check_wallet_item(ntw_i,x,key,value)
+        if key == 'address':
             addresses.append(new_item)
             y = input(tc._ask_more_wallets()[0])
             while y == '1':
                 new_item = input(tc._ask_more_wallets()[1])
                 addresses.append(new_item)
                 y = input(tc._ask_more_wallets()[0])
-        new_wallet[item] = new_item
+        new_wallet[key] = new_item
 
     new_wallet["Network"] = network
 
@@ -181,48 +181,57 @@ def _check_network():
     else:
         return i
 
-def check_wallet_item(ntw_i,x):
+def check_wallet_item(ntw_i,x,key,value):
     """
     Scans through wallets to check if a new wallet is not already in the
     database
     """
-    dict = get_wallets()[ntw_i]
-    for key, value in dict.items():
-        username = key
-        wallets = value['wallets']
-        info = value['info']
-        twitter = value['twitter']
-        ens_saved = value['ens']
-
-        if x == username:
-            new_item = _correct_item(x,'username')
-        elif x in wallets.values():
-            new_item = _correct_item(x,'wallet address')
-        elif x == twitter:
-            new_item = _correct_item(x,'twitter address')
-        elif x == ens_saved:
-            new_item = _correct_item(x, 'ENS')
-        else:
-            new_item = x
+    # dict = get_wallets()[ntw_i]
+
+    if x == "" or x == " ":
+        new_item = x
+    elif x == value:
+        new_item = _correct_item(x, key)
+    else:
+        new_item = x
+
+    # for key, value in dict.items():
+    #     username = key
+    #     wallets = value['wallets']
+    #     info = value['info']
+    #     twitter = value['twitter']
+    #     ens_saved = value['ens']
+    #
+    #     if x == username:
+    #         new_item = _correct_item(x,'username')
+    #     elif x in wallets.values():
+    #         new_item = _correct_item(x,'wallet address')
+    #     elif x == twitter:
+    #         new_item = _correct_item(x,'twitter address')
+    #     elif x == ens_saved:
+    #         new_item = _correct_item(x, 'ENS')
+    #     else:
+    #         new_item = x
 
     return new_item
 
-def _correct_item(x,z):
+def _correct_item(x,key):
     """Allows user to rewrite an exisitng item in the wallet"""
     a = '2'
     while a == '2':
-        a = (input(tc._display_wallet_check_result(z)[0]))
+        a = (input(tc._display_wallet_check_result(key)[0]))
 
         if a == '1':
             new_item = x
 
         elif a == '2':
-            new_item = input(tc._enter_new_info(z))
+            new_item = input(tc._enter_new_info(key))
             if new_item == x:
                 a = '2'
             else:
                 new_item = x
-        break
+                break
+
     return new_item