From 40a731c65e24e93786d313279da95a023856da8c Mon Sep 17 00:00:00 2001 From: Omid Shahsavarzadeh Date: Sat, 5 Feb 2022 22:23:30 +0330 Subject: [PATCH 1/7] add basic validation functions --- defillama/defillama.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/defillama/defillama.py b/defillama/defillama.py index 1d96ccc..b2dbbb9 100644 --- a/defillama/defillama.py +++ b/defillama/defillama.py @@ -96,3 +96,36 @@ def get_protocol_tvl(self, name): path = f'/tvl/{name}' return self._get(path) + + + @staticmethod + def _organize_validation_data(response,input_type:str = 'symbol'): + output_dict = {} + if input_type == 'symbol': + for item in response: + output_dict[item['name']] = item['symbol'] + elif input_type == 'name': + for item in response: + output_dict[item['symbol']] = item['name'] + + return output_dict + + def _get_validation_data(self,input_type:str = 'symbol'): + + path = '/protocols' + response = self._get(path) + + return DefiLlama._get_validation_data(response,input_type) + + + + def validate_symbol(self, symbol): + self._get_validation_data('symbol') + + def validate_name(self, name): + self._get_validation_data('name') + + + + + From 75556bea71344f265a386248dfa564bb6f99354c Mon Sep 17 00:00:00 2001 From: Omid Shahsavarzadeh Date: Sat, 5 Feb 2022 22:39:15 +0330 Subject: [PATCH 2/7] complete Implement of validate symbol and name --- defillama/defillama.py | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/defillama/defillama.py b/defillama/defillama.py index b2dbbb9..96dd69f 100644 --- a/defillama/defillama.py +++ b/defillama/defillama.py @@ -100,15 +100,11 @@ def get_protocol_tvl(self, name): @staticmethod def _organize_validation_data(response,input_type:str = 'symbol'): - output_dict = {} - if input_type == 'symbol': - for item in response: - output_dict[item['name']] = item['symbol'] - elif input_type == 'name': - for item in response: - output_dict[item['symbol']] = item['name'] + output_list = [] + for item in response: + output_list.append(item[input_type]) - return output_dict + return output_list def _get_validation_data(self,input_type:str = 'symbol'): @@ -117,13 +113,20 @@ def _get_validation_data(self,input_type:str = 'symbol'): return DefiLlama._get_validation_data(response,input_type) - - def validate_symbol(self, symbol): - self._get_validation_data('symbol') + symbol_list = self._get_validation_data('symbol') + if symbol in symbol_list: + return True + else: + return False def validate_name(self, name): - self._get_validation_data('name') + name_list = self._get_validation_data('name') + if name in name_list: + return True + else: + return False + From 128de3b027444172929a8fd545ef5b0dd040a8f8 Mon Sep 17 00:00:00 2001 From: Omid Shahsavarzadeh Date: Wed, 9 Feb 2022 17:38:29 +0330 Subject: [PATCH 3/7] add get_protocols_name_list() upgrade to 1.1.2 --- .gitignore | 158 +++++++++++++++++++++++++++++++++++++++ defillama/__version__.py | 6 +- defillama/defillama.py | 5 +- pyproject.toml | 7 ++ 4 files changed, 172 insertions(+), 4 deletions(-) create mode 100644 .gitignore create mode 100644 pyproject.toml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7a67e62 --- /dev/null +++ b/.gitignore @@ -0,0 +1,158 @@ +# Created by https://www.toptal.com/developers/gitignore/api/python +# Edit at https://www.toptal.com/developers/gitignore?templates=python + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintainted in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +# End of https://www.toptal.com/developers/gitignore/api/python \ No newline at end of file diff --git a/defillama/__version__.py b/defillama/__version__.py index 2b8df98..a831c68 100644 --- a/defillama/__version__.py +++ b/defillama/__version__.py @@ -2,9 +2,9 @@ __title__ = 'DeFiLlama' __description__ = 'Unofficial DeFi Llama API client.' __url__ = 'https://github.com/itzmestar/DeFiLlama' -__version__ = '1.1.0' +__version__ = '1.1.1' __build__ = 0x010001 -__author__ = 'Tarique Anwer' -__author_email__ = 'itzmetariq@gmail.com' +__author__ = 'Omid Sha' +__author_email__ = 'omidsha@protonmail.com' __license__ = 'Apache License 2.0' __copyright__ = 'Copyright 2021 Tarique Anwer' diff --git a/defillama/defillama.py b/defillama/defillama.py index 96dd69f..6adfcac 100644 --- a/defillama/defillama.py +++ b/defillama/defillama.py @@ -111,7 +111,7 @@ def _get_validation_data(self,input_type:str = 'symbol'): path = '/protocols' response = self._get(path) - return DefiLlama._get_validation_data(response,input_type) + return DefiLlama._organize_validation_data(response,input_type) def validate_symbol(self, symbol): symbol_list = self._get_validation_data('symbol') @@ -126,6 +126,9 @@ def validate_name(self, name): return True else: return False + + def get_protocols_name_list(self): + return DefiLlama._get_validation_data('symbol') diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..e21cf6d --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,7 @@ +[build-system] +requires = [ + "setuptools>=42", + "wheel", + "requests>=2.18.4" +] +build-backend = "setuptools.build_meta" \ No newline at end of file From 4bc19cc24bf80a22a5437e65c4aad32f431fa5fd Mon Sep 17 00:00:00 2001 From: Omid Shahsavarzadeh Date: Wed, 9 Feb 2022 17:49:24 +0330 Subject: [PATCH 4/7] add get_symbols_name_dict upgrade to 1.1.2 --- .gitignore | 158 +++++++++++++++++++++++++++++++++++++++ defillama/__version__.py | 6 +- defillama/defillama.py | 5 +- pyproject.toml | 7 ++ 4 files changed, 172 insertions(+), 4 deletions(-) create mode 100644 .gitignore create mode 100644 pyproject.toml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7a67e62 --- /dev/null +++ b/.gitignore @@ -0,0 +1,158 @@ +# Created by https://www.toptal.com/developers/gitignore/api/python +# Edit at https://www.toptal.com/developers/gitignore?templates=python + +### Python ### +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintainted in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ + +# End of https://www.toptal.com/developers/gitignore/api/python \ No newline at end of file diff --git a/defillama/__version__.py b/defillama/__version__.py index 2b8df98..a831c68 100644 --- a/defillama/__version__.py +++ b/defillama/__version__.py @@ -2,9 +2,9 @@ __title__ = 'DeFiLlama' __description__ = 'Unofficial DeFi Llama API client.' __url__ = 'https://github.com/itzmestar/DeFiLlama' -__version__ = '1.1.0' +__version__ = '1.1.1' __build__ = 0x010001 -__author__ = 'Tarique Anwer' -__author_email__ = 'itzmetariq@gmail.com' +__author__ = 'Omid Sha' +__author_email__ = 'omidsha@protonmail.com' __license__ = 'Apache License 2.0' __copyright__ = 'Copyright 2021 Tarique Anwer' diff --git a/defillama/defillama.py b/defillama/defillama.py index 96dd69f..6adfcac 100644 --- a/defillama/defillama.py +++ b/defillama/defillama.py @@ -111,7 +111,7 @@ def _get_validation_data(self,input_type:str = 'symbol'): path = '/protocols' response = self._get(path) - return DefiLlama._get_validation_data(response,input_type) + return DefiLlama._organize_validation_data(response,input_type) def validate_symbol(self, symbol): symbol_list = self._get_validation_data('symbol') @@ -126,6 +126,9 @@ def validate_name(self, name): return True else: return False + + def get_protocols_name_list(self): + return DefiLlama._get_validation_data('symbol') diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..e21cf6d --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,7 @@ +[build-system] +requires = [ + "setuptools>=42", + "wheel", + "requests>=2.18.4" +] +build-backend = "setuptools.build_meta" \ No newline at end of file From 79d3d3ee8deccb6a424799993ff7ffd3cfbaf9be Mon Sep 17 00:00:00 2001 From: Omid Shahsavarzadeh Date: Wed, 9 Feb 2022 17:50:37 +0330 Subject: [PATCH 5/7] undo last commit and add get_symbols_name_dict upgrade to 1.1.3 --- defillama/defillama.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/defillama/defillama.py b/defillama/defillama.py index 6adfcac..6d177b1 100644 --- a/defillama/defillama.py +++ b/defillama/defillama.py @@ -127,9 +127,14 @@ def validate_name(self, name): else: return False - def get_protocols_name_list(self): - return DefiLlama._get_validation_data('symbol') + def get_symbols_name_dict(self): + all_protocols_list = self.get_all_protocols() + symbols_name_dict = {} + for protocol in all_protocols_list: + symbols_name_dict[protocol['symbol']] = protocol['name'] + + return symbols_name_dict From 2d06944471f913382fe5552cb0038fd9d5616702 Mon Sep 17 00:00:00 2001 From: Omid Shahsavarzadeh Date: Wed, 9 Feb 2022 17:54:55 +0330 Subject: [PATCH 6/7] update version --- defillama/__version__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/defillama/__version__.py b/defillama/__version__.py index a831c68..58726a4 100644 --- a/defillama/__version__.py +++ b/defillama/__version__.py @@ -2,7 +2,7 @@ __title__ = 'DeFiLlama' __description__ = 'Unofficial DeFi Llama API client.' __url__ = 'https://github.com/itzmestar/DeFiLlama' -__version__ = '1.1.1' +__version__ = '1.1.3' __build__ = 0x010001 __author__ = 'Omid Sha' __author_email__ = 'omidsha@protonmail.com' From 586a8cf919b4ba529e674054a01d764df14622b9 Mon Sep 17 00:00:00 2001 From: Omid Shahsavarzadeh Date: Wed, 16 Feb 2022 19:10:35 +0330 Subject: [PATCH 7/7] add new functions --- .gitignore | 3 ++- defillama/defillama.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7a67e62..a608cc0 100644 --- a/.gitignore +++ b/.gitignore @@ -155,4 +155,5 @@ cython_debug/ # option (not recommended) you can uncomment the following to ignore the entire idea folder. #.idea/ -# End of https://www.toptal.com/developers/gitignore/api/python \ No newline at end of file +# End of https://www.toptal.com/developers/gitignore/api/python +defillama/mytest.py diff --git a/defillama/defillama.py b/defillama/defillama.py index 6d177b1..fd63a89 100644 --- a/defillama/defillama.py +++ b/defillama/defillama.py @@ -127,7 +127,7 @@ def validate_name(self, name): else: return False - def get_symbols_name_dict(self): + def get_protocols_symbols_name_dict(self): all_protocols_list = self.get_all_protocols() symbols_name_dict = {}