Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Extension 5 - Pool Compounding #130

Open
wants to merge 39 commits into
base: main
Choose a base branch
from
Open

WIP: Extension 5 - Pool Compounding #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
a3354af
added compounding mechanism
rosseyre Sep 22, 2021
25d3690
development of ext5
rosseyre Sep 23, 2021
bd73c31
updated pool compounding mechanism
rosseyre Sep 23, 2021
9b5643f
may return here later
rosseyre Sep 23, 2021
538a787
progress
rosseyre Sep 23, 2021
417f8ea
getting there..
rosseyre Sep 23, 2021
acd2fbf
still getting there..
rosseyre Sep 23, 2021
c2828d0
saved
rosseyre Sep 24, 2021
bcbe045
new branch
rosseyre Sep 24, 2021
fdc607d
updated pool indeces check
rosseyre Sep 26, 2021
4af7888
started plotting
rosseyre Sep 26, 2021
2fc085a
updates
rosseyre Sep 26, 2021
ff918e2
compiled 2 experiments in notebook, corrected eth_staked > eth_supply…
rosseyre Sep 27, 2021
39e4b07
General formatting and cleaning of code and comments
rosseyre Sep 27, 2021
bf58928
Added test_notebook to .gitignore
rosseyre Sep 27, 2021
3ac12c7
Added test_notebook to .gitignore
rosseyre Sep 27, 2021
6e26ab4
General formatting and cleaning of code and comments
rosseyre Sep 27, 2021
2b61567
placeholder for eth_staked process implementation
rosseyre Sep 27, 2021
d3d177b
added validator compounding queue
rosseyre Oct 1, 2021
b2b0b0e
Notebook organisation and model cleanup
rosseyre Oct 1, 2021
7ffaa19
minor reformatting
rosseyre Oct 5, 2021
85cd2fc
improved validator allocation mechanism
rosseyre Oct 5, 2021
d7f8e72
updated experiment notebook
rosseyre Oct 5, 2021
ac75bb8
Cleanup
rosseyre Oct 12, 2021
8a2e583
refactored mechanism to use more nparray operations
rosseyre Oct 13, 2021
e41c31b
improved comments and formatting
rosseyre Oct 13, 2021
4cf188b
added validator queue distribution count mechanism
rosseyre Oct 14, 2021
cc37a5d
added staker profit yield metrics
rosseyre Oct 16, 2021
c134801
update plot configs
rosseyre Oct 16, 2021
9feea37
removed unused variables
rosseyre Oct 22, 2021
0d958bb
updates
rosseyre Oct 27, 2021
34f25e8
WIP refactor
rosseyre Oct 29, 2021
9139167
updated staker yield functions
rosseyre Dec 13, 2021
16070eb
notebook overhaul
rosseyre Dec 13, 2021
c3d9d3d
formatting
rosseyre Dec 14, 2021
f4d0e55
commenting and minor formatting
rosseyre Jan 13, 2022
51facfc
updated yield calculations and notebook improvements
rosseyre Jan 15, 2022
e2b304b
formatting
rosseyre Jan 15, 2022
7b87706
formatting
rosseyre Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,9 @@ target/
# Jupyter Notebook
.ipynb_checkpoints

# Test notebooks
/experiments/notebooks/test_notebook.ipynb

# IPython
profile_default/
ipython_config.py
Expand Down
2 changes: 1 addition & 1 deletion experiments/default_experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@
# Configure Simulation & Experiment engine
simulation.engine = experiment.engine
experiment.engine.backend = Backend.SINGLE_PROCESS
experiment.engine.deepcopy = False
experiment.engine.deepcopy = False
experiment.engine.drop_substeps = True
6 changes: 3 additions & 3 deletions experiments/notebooks/1_model_validation.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -596,9 +596,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python (CADLabs Ethereum Economic Model)",
"language": "python",
"name": "python3"
"name": "python-cadlabs-eth-model"
},
"language_info": {
"codemirror_mode": {
Expand All @@ -610,7 +610,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.11"
"version": "3.8.2"
}
},
"nbformat": 4,
Expand Down
12 changes: 11 additions & 1 deletion experiments/notebooks/2_validator_revenue_and_profit_yields.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,16 @@
"df_1a, _exceptions = run(simulation_1a)"
]
},
{
"cell_type": "code",
"execution_count": null,
"id": "25560f38",
"metadata": {},
"outputs": [],
"source": [
"df_1a.query(\"number_of_validators_in_activation_queue == 0\")"
]
},
{
"cell_type": "code",
"execution_count": null,
Expand Down Expand Up @@ -478,7 +488,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.11"
"version": "3.8.5"
}
},
"nbformat": 4,
Expand Down
6 changes: 3 additions & 3 deletions experiments/notebooks/3_network_issuance_and_inflation_rate.ipynb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,9 @@
],
"metadata": {
"kernelspec": {
"display_name": "Python 3",
"display_name": "Python (CADLabs Ethereum Economic Model)",
"language": "python",
"name": "python3"
"name": "python-cadlabs-eth-model"
},
"language_info": {
"codemirror_mode": {
Expand All @@ -259,7 +259,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.8.11"
"version": "3.8.2"
}
},
"nbformat": 4,
Expand Down
Loading