Skip to content

Commit

Permalink
Merge pull request #2310
Browse files Browse the repository at this point in the history 
update roadmap for 2024
  • Loading branch information
@luigi1111
luigi1111 committed Jul 20, 2024
2 parents a5ed74b + 30aeac7 commit 3d1274c
Show file tree
Hide file tree
Showing 4 changed files with 49 additions and 28 deletions.
1 change: 1 addition & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,7 @@ Where `STATUS` can be:
- `completed` for completed milestones
- `ongoing` for milestones currently being worked on
- `upcoming` for milestones not yet completed or in progress
- `proposed` for milestones open to research and consideration

If an entry is `completed`, a green tick symbol will be displayed on its left. if it's `ongoing` a roadwork sign and `upcoming` a compass.

Expand Down
16 changes: 10 additions & 6 deletions _i18n/en.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,7 @@ roadmap:
completed: Completed task
ongoing: Ongoing task
upcoming: Upcoming task
proposed: Proposed task
future: Future

jan: January
Expand Down Expand Up @@ -818,29 +819,32 @@ roadmap:
onionaddress: Onion address for Getmonero.org
supercop: Wallet scanning speedups (support for supercop ASM)
clsag: Concise linkable spontaneous anonymous group (CLSAG) signatures
tryptych: "Triptych: logarithmic-sized linkable ring signatures with applications"
kastelo: "Kastelo: open source hardware wallet"
layer2: Second-layer solutions for speed and scalability
released-0-16-0-0: CLI and GUI 0.16.0.0 released
released-0-17: CLI and GUI 0.17 'Oxygen Orion' released

returnaddr: Return addresses
atomicswaps: Monero <-> Bitcoin atomic swaps
bplus: Bulletproofs+
p2pool: P2Pool released
haveno: Haveno

ringsize-sera-tryp: increase ring size to >100
seraphis-jamtis: Seraphis & Jamtis
seraphis-jamtis: Seraphis codebase & Jamtis
ospead: OSPEAD
released-0-18: CLI and GUI 0.18 "Flourine Fermi" released
hardfork-v15: Network upgrade v15 Hardfork
xmr-eth-atomicswaps: Monero <-> Ethereum Atomic Swaps
bp++: Bulletproofs++
lws-subaddress: Light Wallet Server subaddress support
view-tags: Wallet synchronization speed improved by +40% with one-byte view tags

genimprov: "Multiple improvements like: block propagation delay reduced, tx_extra limited, wallet refresh and startup speedups"


xmrbch-atomicswap: XMR-BCH atomic swap is completed
haveno-mainnet: HavenoDEX released
fcmp-plus: Full-Chain Membership Proofs
mrl-tasks: Proposed tasks from Monero Research Lab
cuprate: Monerod Rust implementation - Cuprate

research-lab:
intro: Monero is not only committed to making a fungible currency, but also to continued research into the realm of financial privacy as it involves cryptocurrencies. Below you'll find the work of our very own Monero Research Lab, with more papers to come.
intro_email: "To contact the Monero Research Lab, please email lab@getmonero.org."
Expand Down
4 changes: 4 additions & 0 deletions css/custom.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3600,6 +3600,10 @@ img.emoji {
content: url("/img/emojis/1F9ED.svg");
}

.roadmap li.proposed:before {
content: url("/img/emojis/1F310.svg");
}

.roadmap .tabPanel-content span, .roadmap .ms-completed, .roadmap .ms-upcoming {
width: 1rem;
height: 1rem;
Expand Down
56 changes: 34 additions & 22 deletions resources/roadmap/index.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ meta_descr: meta_descr.roadmap
<div class="col-sm-3 col-xs-4">
<p><img class="emoji" src="/img/emojis/1F9ED.svg">{% t roadmap.upcoming %}</p>
</div>
<div class="col-sm-3 col-xs-4">
<p><img class="emoji" src="/img/emojis/1F310.svg">{% t roadmap.proposed %}</p>
</div>
</div>
</div>
<section class="container">
Expand All @@ -25,7 +28,7 @@ meta_descr: meta_descr.roadmap
<div class="tabPanel-widget">
<label for="tab-1" tabindex="0"></label>
<input id="tab-1" type="radio" name="tabs" aria-hidden="true">
<h2>2014-2018</h2>
<h2>2014-2019</h2>
<div class="tabPanel-content info-block">
<h2>2014</h2>
<ul>
Expand Down Expand Up @@ -122,11 +125,6 @@ meta_descr: meta_descr.roadmap
<li class="completed">{% t roadmap.paper10 %}</li>
<li class="completed">{% t roadmap.mms %}</li>
</ul>
</div>
<label for="tab-2" tabindex="0"></label>
<input id="tab-2" type="radio" name="tabs" aria-hidden="true">
<h2>2019</h2>
<div class="tabPanel-content info-block">
<h2>2019</h2>
<ul>
<h3 class="months">{% t roadmap.feb %}</h3>
Expand Down Expand Up @@ -156,8 +154,8 @@ meta_descr: meta_descr.roadmap
<li class="completed">{% t roadmap.randomx %}</li>
</ul>
</div>
<label for="tab-3" tabindex="0"></label>
<input id="tab-3" type="radio" name="tabs" aria-hidden="true">
<label for="tab-2" tabindex="0"></label>
<input id="tab-2" type="radio" name="tabs" aria-hidden="true">
<h2>2020</h2>
<div class="tabPanel-content info-block">
<h2>2020</h2>
Expand All @@ -178,8 +176,8 @@ meta_descr: meta_descr.roadmap
<li class="completed">{% t roadmap.released-0-17 %}</li>
</ul>
</div>
<label for="tab-4" tabindex="0"></label>
<input id="tab-4" type="radio" name="tabs" aria-hidden="true" checked>
<label for="tab-3" tabindex="0"></label>
<input id="tab-3" type="radio" name="tabs" aria-hidden="true" checked>
<h2>2021</h2>
<div class="tabPanel-content info-block">
<h2>2021</h2>
Expand All @@ -192,26 +190,44 @@ meta_descr: meta_descr.roadmap
<li class="completed"><a href="{{ site.baseurl }}/2021/10/05/p2pool-released.html">{% t roadmap.p2pool %}</a></li>
</ul>
</div>
<label for="tab-5" tabindex="0"></label>
<input id="tab-5" type="radio" name="tabs" aria-hidden="true" checked>
<label for="tab-4" tabindex="0"></label>
<input id="tab-4" type="radio" name="tabs" aria-hidden="true" checked>
<h2>2022</h2>
<div class="tabPanel-content info-block">
<h2>2022</h2>
<ul>
<h3 class="months">{% t roadmap.apr %}</h3>
<li class="completed">{% t roadmap.view-tags %}</li>
<h3 class="months">{% t roadmap.jul %}</h3>
<li class="completed"><a href="{{ site.baseurl }}/2022/07/19/monero-0.18.0.0-released.html">{% t roadmap.released-0-18 %}</a></li>
<h3 class="months">{% t roadmap.aug %}</h3>
<li class="completed"><a href="{{ site.baseurl }}/2022/04/20/network-upgrade-july-2022.html">{% t roadmap.hardfork-v15 %}</a></li>
</ul>
</div>
<label for="tab-6" tabindex="0"></label>
<input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
<label for="tab-5" tabindex="0"></label>
<input id="tab-5" type="radio" name="tabs" aria-hidden="true" checked>
<h2>2023</h2>
<div class="tabPanel-content info-block">
<h2>2023</h2>
<ul>
<h3 class="months"></h3>
<li class="completed">{% t roadmap.genimprov %}</li>
<h3 class="months">{% t roadmap.may %}</h3>
<li class="completed">{% t roadmap.xmr-eth-atomicswaps %}</li>
<h3 class="months">{% t roadmap.dec %}</h3>
<li class="completed">{% t roadmap.lws-subaddress %}</li>
</ul>
</div>
<label for="tab-6" tabindex="0"></label>
<input id="tab-6" type="radio" name="tabs" aria-hidden="true" checked>
<h2>2024</h2>
<div class="tabPanel-content info-block">
<h2>2024</h2>
<ul>
<h3 class="months">{% t roadmap.jan %}</h3>
<li class="completed">{% t roadmap.xmrbch-atomicswap %}</li>
<h3 class="months">{% t roadmap.may %}</h3>
<li class="completed"><a href="https://haveno.exchange">{% t roadmap.haveno-mainnet %}</a></li>
</ul>
</div>
<label for="tab-7" tabindex="0"></label>
Expand All @@ -221,16 +237,12 @@ meta_descr: meta_descr.roadmap
<h2>{% t roadmap.future %}</h2>
<ul>
<h3 class="months">{% t roadmap.comingsoon %}</h3>
<li class="ongoing"><a href="https://haveno.exchange">{% t roadmap.haveno %}</a></li>
<li class="ongoing"><a href="https://github.com/seraphis-migration/strategy/wiki">{% t roadmap.seraphis-jamtis %}</a></li>
<li class="ongoing"><a href="https://github.com/Rucknium/OSPEAD">{% t roadmap.ospead %}</a></li>
<li class="ongoing">{% t roadmap.ringsize-sera-tryp %}</li>
<li class="ongoing">{% t roadmap.tryptych %}</li>
<li class="ongoing">{% t roadmap.xmr-eth-atomicswaps %}</li>
<li class="ongoing">{% t roadmap.bp++ %}</li>
<li class="ongoing">{% t roadmap.lws-subaddress %}</li>
<li class="upcoming">{% t roadmap.returnaddr %}</li>
<li class="upcoming">{% t roadmap.layer2 %}</li>
<li class="ongoing">{% t roadmap.cuprate %}</li>
<li class="upcoming">{% t roadmap.seraphis-jamtis %}</li>
<li class="upcoming"><a href="https://github.com/seraphis-migration/strategy/wiki/Our-Wallet-Rewrite-Project-After-Priority-Switched-From-Seraphis-to-FCMPs">{% t roadmap.fcmp-plus %}</a></li>
<li class="proposed"><a href="https://github.com/monero-project/research-lab/issues/94">{% t roadmap.mrl-tasks %}</a></li>
</ul>
</div>
</div>
Expand Down

0 comments on commit 3d1274c

Please sign in to comment.