From 5e07515002e67e195fa7f906a7af033e99f73ba9 Mon Sep 17 00:00:00 2001 From: adrianvrj Date: Sat, 15 Jun 2024 12:09:33 -0600 Subject: [PATCH 1/5] allow token selection --- app.py | 15 ++++++++++++--- src/settings.py | 9 ++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app.py b/app.py index 1e79c6c2..e70e9ca9 100644 --- a/app.py +++ b/app.py @@ -57,11 +57,20 @@ def main(): options=["zkLend", "Hashstack V0", "Hashstack V1", "Nostra Alpha", "Nostra Mainnet"], default=["zkLend", "Hashstack V0", "Hashstack V1", "Nostra Alpha", "Nostra Mainnet"], ) - current_pair = streamlit.selectbox( - label="Select collateral-loan pair:", - options=src.settings.PAIRS, + collateral_token = streamlit.selectbox( + label="Select collateral token:", + options=list(src.settings.COLLATERAL_TO_DEBT_TOKENS.keys()), index=0, ) + + debt_token_options = src.settings.COLLATERAL_TO_DEBT_TOKENS[collateral_token] + debt_token = streamlit.selectbox( + label="Select debt token:", + options=debt_token_options, + index=0, + ) + + current_pair = f"{collateral_token}-{debt_token}" main_chart_data = pandas.DataFrame() histogram_data = pandas.DataFrame() diff --git a/src/settings.py b/src/settings.py index 507494e4..14c431f3 100644 --- a/src/settings.py +++ b/src/settings.py @@ -67,4 +67,11 @@ class TokenSettings: "STRK-USDC", "STRK-USDT", "STRK-DAI", -] \ No newline at end of file +] + +COLLATERAL_TO_DEBT_TOKENS = {} +for pair in PAIRS: + collateral, debt = pair.split('-') + if collateral not in COLLATERAL_TO_DEBT_TOKENS: + COLLATERAL_TO_DEBT_TOKENS[collateral] = [] + COLLATERAL_TO_DEBT_TOKENS[collateral].append(debt) \ No newline at end of file From 31d70ef54e4a59326fd896f98ce703c60cced4a3 Mon Sep 17 00:00:00 2001 From: adrianvrj Date: Thu, 20 Jun 2024 08:41:46 -0600 Subject: [PATCH 2/5] [fix] splitted colateral and debt tokens declaration --- app.py | 5 +++-- src/settings.py | 9 +++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app.py b/app.py index e70e9ca9..50c37ae8 100644 --- a/app.py +++ b/app.py @@ -59,11 +59,12 @@ def main(): ) collateral_token = streamlit.selectbox( label="Select collateral token:", - options=list(src.settings.COLLATERAL_TO_DEBT_TOKENS.keys()), + options=list(src.settings.COLLATERAL_TOKENS), index=0, ) - debt_token_options = src.settings.COLLATERAL_TO_DEBT_TOKENS[collateral_token] + debt_token_options = src.settings.DEBT_TOKENS + debt_token = streamlit.selectbox( label="Select debt token:", options=debt_token_options, diff --git a/src/settings.py b/src/settings.py index 14c431f3..0bd8ea27 100644 --- a/src/settings.py +++ b/src/settings.py @@ -69,9 +69,6 @@ class TokenSettings: "STRK-DAI", ] -COLLATERAL_TO_DEBT_TOKENS = {} -for pair in PAIRS: - collateral, debt = pair.split('-') - if collateral not in COLLATERAL_TO_DEBT_TOKENS: - COLLATERAL_TO_DEBT_TOKENS[collateral] = [] - COLLATERAL_TO_DEBT_TOKENS[collateral].append(debt) \ No newline at end of file +COLLATERAL_TOKENS = ['ETH', 'wBTC', 'STRK'] + +DEBT_TOKENS = ['USDC', 'USDT', 'DAI'] \ No newline at end of file From cc5b25d96c5ec632ba7c05e0ce867653a423974f Mon Sep 17 00:00:00 2001 From: adrianvrj Date: Wed, 26 Jun 2024 10:29:10 -0600 Subject: [PATCH 3/5] [update] added a warning when selecting the same token for debt and collateral --- app.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app.py b/app.py index 50c37ae8..abb9f3f9 100644 --- a/app.py +++ b/app.py @@ -59,18 +59,20 @@ def main(): ) collateral_token = streamlit.selectbox( label="Select collateral token:", - options=list(src.settings.COLLATERAL_TOKENS), + options=src.settings.COLLATERAL_TOKENS, index=0, ) - debt_token_options = src.settings.DEBT_TOKENS - debt_token = streamlit.selectbox( label="Select debt token:", - options=debt_token_options, + options=src.settings.DEBT_TOKENS, index=0, ) - + + if(debt_token == collateral_token): + streamlit.subheader( + f":warning: you are selecting the same token for Debt and Collateral") + current_pair = f"{collateral_token}-{debt_token}" main_chart_data = pandas.DataFrame() From 132a9787e7fc63519abcb1d984bb2b6dff989ce8 Mon Sep 17 00:00:00 2001 From: adrianvrj Date: Tue, 2 Jul 2024 09:20:52 -0600 Subject: [PATCH 4/5] [update] added DAI V2 --- app.py | 2 +- src/settings.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app.py b/app.py index abb9f3f9..fb3e6688 100644 --- a/app.py +++ b/app.py @@ -71,7 +71,7 @@ def main(): if(debt_token == collateral_token): streamlit.subheader( - f":warning: you are selecting the same token for Debt and Collateral") + f":warning: You are selecting the same token for Debt and Collateral") current_pair = f"{collateral_token}-{debt_token}" diff --git a/src/settings.py b/src/settings.py index 0bd8ea27..7def9923 100644 --- a/src/settings.py +++ b/src/settings.py @@ -69,6 +69,6 @@ class TokenSettings: "STRK-DAI", ] -COLLATERAL_TOKENS = ['ETH', 'wBTC', 'STRK'] +COLLATERAL_TOKENS = ['ETH', 'WBTC', 'STRK'] -DEBT_TOKENS = ['USDC', 'USDT', 'DAI'] \ No newline at end of file +DEBT_TOKENS = ['USDC', 'USDT', 'DAI', 'DAI V2'] \ No newline at end of file From fffd5d82609bd8d3652fbc3fbee2a091001c56af Mon Sep 17 00:00:00 2001 From: adrianvrj Date: Wed, 3 Jul 2024 11:33:42 -0600 Subject: [PATCH 5/5] [Fix] fixed warning format --- app.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.py b/app.py index 8385b3c9..b163eebe 100644 --- a/app.py +++ b/app.py @@ -69,7 +69,7 @@ def main(): if(debt_token == collateral_token): streamlit.subheader( - f":warning: You are selecting the same token for Debt and Collateral") + f":warning: You are selecting the same token for both collateral and debt.") current_pair = f"{collateral_token}-{debt_token}"