Milestone tidy up

# Conflicts:
#	draft-roadmap/integrate_nwaku_in_status_desktop_relay_mode_only.md

FURPS/application/status_private_chats.md

@@ -1,4 +1,4 @@
-# {Feature Name} FURPS
+# Status Private Chats FURPS
 
 Waku specific FURPS, **before** integration of the Chat SDK.
 

draft-roadmap/define_incentivisation_for_rlnaas.md

@@ -15,40 +15,5 @@ including RLN proofs as a service, Store, Filter and Lightpush.
 This milestone encapsulates the efforts to distribute rewards for running RLN Relay nodes and getting paid for providing Waku services.
 This is the first step to providing a sustainable way to scale the Status application.
 
-**FURPS**: TODO
-
-**deliverables**: https://github.com/waku-org/pm/milestone/35 TODO adjust deliverables with FURPS
-
-## [Pay for RLN provision PoC](https://github.com/waku-org/pm/issues/245)
-
-**Owner**: core research
-
-**Feature**: [Incentivisation](/FURPS/core/incentivisation.md)
-
 **FURPS**:
-- F1. RLNaaS clients proceed to pay RLNaaS providers for attaching RLN proof to published messages.
-- F2. RLNaaS clients can assess the quality of a provisioned RLNaaS and use it to build local reputation.
-- F3. RLNaaS clients can use local reputation of RLNaaS providers to select what provider to use.
-- U1. A consumer node can pay a service node for RLNaaS.
-- U2. A consumer node can select an RLNaaS provider based on local reputation.
-- R1. A consumer prefers new providers to known unreliable providers.
-- R2. In a stable network, a client can find, pay and send a message via a RLNaaS provider (**Vac-QA**)
-   in 90% of cases **(Vac-DST)**.
-- R3. A client can assess whether an RLNaaS provider has relayed their message (**Vac-QA**)
-   in 90% of cases **(Vac-DST)**.
-- P1. Assuming a block time of 5 seconds,
-  a user can execute an RLNaaS payment and send a message within 30 seconds (Vac-DST)
-
-For S1. A nwaku-based CLI on a testnet, interaction with a custodial wallet is out-of-scope.
-
-**Checklist**:
-- [ ] Specs: link to specs and/or API definition
-- [ ] Code: link to GitHub issues/PRs/Epic
-- [ ] Dogfood: link to dogfooding session/artefact
-- [ ] Docs: links to README.md or docs.waku.org (TBD)
-
-## [Service incentivisation roadmap & spec](https://github.com/waku-org/pm/issues/246)
-
-**Owner**: core research
-
-**Output**: a roadmap document.
+- [Incentivisation](/FURPS/core/incentivisation.md): F1-3, U1-2, R1-3, P1, for S1

draft-roadmap/deploy_rln_onchain_tree_on_l2_testnet.md

@@ -3,9 +3,10 @@
 **Estimated date of completion**: 30 June 2025
 
 **Resources Required for 2025H2**:
-- {roles and % application to it}
-- {external services consumed (Vac/IFT)}
-- {infrastructure}
+- 1 nwaku engineer
+- 1 js-waku engineer
+- 1 core research engineer
+All for maintenance and dogfooding related activities.
 
 This is a split of RLN mainnet milestone which grew too large in scope.
 

draft-roadmap/foundation_for_communities_optimisation.md

@@ -1,9 +1,11 @@
 # [Foundation for Communities Optimisation](https://github.com/waku-org/pm/milestone/31)
 
-**Estimated date of completion**: 7-Apr-2025 - to be reviewed TODO
+**Estimated date of completion**: 31 Oct 2025 (Final clean-up to be merged after a few Status app releases)
 
 **Resources Required for 2025H2**:
-- App/Chat engineer: Pablo 100% for X months - TODO
+- 1 App/Chat engineer for 2 weeks (only work will be to rebase and merge an existing clean-up PR)
+- Vac/QA to run status-backend tests
+- Status/QA and dev for reviews and testing
 
 Once completed, the usage of content topics by Communities will be simplified,
 enabling both improvements in terms of store queries and light mode message reception,

draft-roadmap/hardening_and_scaling_foundation_for_private_chat.md

@@ -1,6 +1,6 @@
 # [Hardening and Scaling Foundations for Private Chats](https://github.com/waku-org/pm/milestone/40)
 
-**Estimated date of completion**: TODO
+**Estimated date of completion**: TODO (only Private chat rate limit PoC remaining)
 
 **Resources Required for 2025H2**: TODO
 - {roles and % application to it}
@@ -31,9 +31,11 @@ either removed or disabled by default to ensure accurate testing and evaluation.
 
 **Milestone and deliverables**: https://github.com/waku-org/pm/milestone/40
 
-TODO: [clean-up the deliverables](https://discord.com/channels/1110799176264056863/1337300409412489290/1379311090302980097):
-- specify private chat: drop
-- rate limit poc: finish it
-- network metrics: move it
-- baseline benchmarks: handover to DST
-- status-cli: review with QA
+## Scope Changes
+
+1. **Specify Private Chat Protocol**: We stop the exercise here, meaning that we don't formally update/add to Status specs/RFC.
+   A justification to write a new protocol stack has been [published](https://forum.vac.dev/t/chatsdk-motivations/501). 
+2. **Private chat rate limit PoC**: Work to be completed to help with reliability. No further RLN integration planned.
+3. **Global Network Metrics**: Moved to a new milestone - [Improve DevEx: API, TWN, Metrics, Docs](improve_devex_api_twn_metrics_docs.md). 
+4. **Baseline benchmarks**: Handing over to Vac/DST
+5. **status-cli**: Handing over to Vac/QA

draft-roadmap/integrate_nwaku_in_status_desktop_relay_mode_only.md

@@ -1,9 +1,12 @@
-# Integrate nwaku in Status Desktop, relay mode only
+# [Integrate nwaku in Status Desktop, relay mode only](https://github.com/waku-org/pm/milestone/33)
 
 **Estimated date of completion**: 30 June
 
 **Resources Required for 2025H2**:
-- 1 nwaku engineer
+- 1 nwaku engineer for maintenance and support
+- Vac-QA to run status-backend tests on a nwaku-based build
+- Vac-DST to complete benchmark works and proceed with nwaku-based vs go-waku-based status-backend comparisons
+- Status-QA to include nwaku-based builds in tests
 
 With this milestone, Status Desktop builds can use nwaku instead of go-waku.
 However, it should be seen as a MVP as further hardening and implementation of light client mode will be missing.

draft-roadmap/introduce_e2e_reliability_in_status.md

@@ -4,6 +4,8 @@
 
 **Resources Required for 2025H2**:
 - 1 app chat engineer for 2 months
+- Status dev for review support
+- Status-QA and Vac-QA for new tests
 - (core research work finishes by end of June)
 
 (Renamed "e2e reliability protocol " milestone, but work as per scope, only split a deliverable)