diff --git a/gamestonk_terminal/cryptocurrency/due_diligence/dd_controller.py b/gamestonk_terminal/cryptocurrency/due_diligence/dd_controller.py index 93f8baa1d1e..1aab26ee13e 100644 --- a/gamestonk_terminal/cryptocurrency/due_diligence/dd_controller.py +++ b/gamestonk_terminal/cryptocurrency/due_diligence/dd_controller.py @@ -101,16 +101,25 @@ class DueDiligenceController(BaseController): if session and gtff.USE_PROMPT_TOOLKIT: choices: dict = {c: {} for c in self.controller_choices} choices["load"]["--source"] = {c: None for c in CRYPTO_SOURCES.keys()} - choices["active"]["-i"] = {c: None for c in glassnode_model.INTERVALS} + choices["active"]["-i"] = { + c: None for c in glassnode_model.INTERVALS_ACTIVE_ADDRESSES + } choices["change"] = { c: None for c in glassnode_model.GLASSNODE_SUPPORTED_EXCHANGES } - choices["change"]["-i"] = {c: None for c in glassnode_model.INTERVALS} - choices["nonzero"]["-i"] = {c: None for c in glassnode_model.INTERVALS} + choices["change"]["-i"] = { + c: None + for c in glassnode_model.INTERVALS_DISPLAY_EXCHANGE_NET_POSITION_CHANGE + } + choices["nonzero"]["-i"] = { + c: None for c in glassnode_model.INTERVALS_NON_ZERO_ADDRESSES + } choices["eb"] = { c: None for c in glassnode_model.GLASSNODE_SUPPORTED_EXCHANGES } - choices["eb"]["-i"] = {c: None for c in glassnode_model.INTERVALS} + choices["eb"]["-i"] = { + c: None for c in glassnode_model.INTERVALS_EXCHANGE_BALANCES + } choices["oi"]["-i"] = {c: None for c in coinglass_model.INTERVALS} choices["atl"]["--vs"] = {c: None for c in FILTERS_VS_USD_BTC} choices["ath"]["--vs"] = {c: None for c in FILTERS_VS_USD_BTC} @@ -247,7 +256,7 @@ Coinbase: type=str, help="Frequency interval. Default: 24h", default="24h", - choices=glassnode_model.INTERVALS, + choices=glassnode_model.INTERVALS_NON_ZERO_ADDRESSES, ) # TODO: tell users that free api key only data with 1y lag @@ -306,7 +315,7 @@ Coinbase: type=str, help="Frequency interval. Default: 24h", default="24h", - choices=glassnode_model.INTERVALS, + choices=glassnode_model.INTERVALS_ACTIVE_ADDRESSES, ) parser.add_argument( @@ -374,7 +383,7 @@ Coinbase: type=str, help="Frequency interval. Default: 24h", default="24h", - choices=glassnode_model.INTERVALS, + choices=glassnode_model.INTERVALS_DISPLAY_EXCHANGE_NET_POSITION_CHANGE, ) parser.add_argument( @@ -454,7 +463,7 @@ Coinbase: type=str, help="Frequency interval. Default: 24h", default="24h", - choices=glassnode_model.INTERVALS, + choices=glassnode_model.INTERVALS_EXCHANGE_BALANCES, ) parser.add_argument( diff --git a/gamestonk_terminal/cryptocurrency/due_diligence/glassnode_model.py b/gamestonk_terminal/cryptocurrency/due_diligence/glassnode_model.py index d75c3479fd8..f7e7b096fe9 100644 --- a/gamestonk_terminal/cryptocurrency/due_diligence/glassnode_model.py +++ b/gamestonk_terminal/cryptocurrency/due_diligence/glassnode_model.py @@ -160,7 +160,11 @@ GLASSNODE_SUPPORTED_ASSETS = [ "ZRX", ] -INTERVALS = ["1h", "24h", "10m", "1w", "1month"] +INTERVALS_HASHRATE = ["24h", "1w", "1month"] +INTERVALS_ACTIVE_ADDRESSES = ["24h", "1w", "1month"] +INTERVALS_NON_ZERO_ADDRESSES = ["24h"] +INTERVALS_DISPLAY_EXCHANGE_NET_POSITION_CHANGE = ["24h"] +INTERVALS_EXCHANGE_BALANCES = ["24h"] def get_non_zero_addresses( diff --git a/gamestonk_terminal/cryptocurrency/onchain/onchain_controller.py b/gamestonk_terminal/cryptocurrency/onchain/onchain_controller.py index 43bc248b60d..712fd60c948 100644 --- a/gamestonk_terminal/cryptocurrency/onchain/onchain_controller.py +++ b/gamestonk_terminal/cryptocurrency/onchain/onchain_controller.py @@ -14,7 +14,7 @@ from prompt_toolkit.completion import NestedCompleter from gamestonk_terminal.parent_classes import BaseController from gamestonk_terminal.cryptocurrency.due_diligence.glassnode_model import ( GLASSNODE_SUPPORTED_HASHRATE_ASSETS, - INTERVALS, + INTERVALS_HASHRATE, ) from gamestonk_terminal.cryptocurrency.due_diligence.glassnode_view import ( display_hashrate, @@ -95,7 +95,7 @@ class OnchainController(BaseController): choices["hr"]["--coin"] = { c: None for c in GLASSNODE_SUPPORTED_HASHRATE_ASSETS } - choices["hr"]["-i"] = {c: None for c in INTERVALS} + choices["hr"]["-i"] = {c: None for c in INTERVALS_HASHRATE} choices["ttcp"] = {c: None for c in bitquery_model.DECENTRALIZED_EXCHANGES} choices["baas"]["-c"] = {c: None for c in bitquery_model.POSSIBLE_CRYPTOS} choices["baas"]["--coin"] = { @@ -153,7 +153,7 @@ class OnchainController(BaseController): type=str, help="Frequency interval. Default: 24h", default="24h", - choices=INTERVALS, + choices=INTERVALS_HASHRATE, ) parser.add_argument(