From 021cf3701e0fbcc92cb888aefd01cbbf43734c1f Mon Sep 17 00:00:00 2001
From: Oskar Thoren <ot@oskarthoren.com>
Date: Tue, 27 Aug 2019 15:44:42 +0200
Subject: [PATCH] move whisper v6 extensions to main spec

---
 status-spec.md |  6 ++++++
 x7.md          | 11 -----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/status-spec.md b/status-spec.md
index 66a2d36..31bdf27 100644
--- a/status-spec.md
+++ b/status-spec.md
@@ -206,6 +206,12 @@ for i = 0; i < topic_len; i++ {
 }
 ```
 
+### Whisper v6 extensions
+
+Outside of Whisper v6, there are some extensions, message codes and RPC methods that MAY be useful for client implementers. An implementation of this can be found in a fork of Whisper [here](https://github.com/status-im/whisper).
+
+<!--TODO: provide a list of RPC methods from `shhext` API which are relevant to this spec, as well as motivation (rationale section) -->
+
 ## Secure Transport
 
 In order to provide confidentiality, integrity, authentication and forward
diff --git a/x7.md b/x7.md
index 8275610..0dcdc6f 100644
--- a/x7.md
+++ b/x7.md
@@ -280,19 +280,8 @@ However, we added a few extensions, message codes and RPC methods to the Whisper
 
 All described addons are implemented in [status-im/whisper fork](https://github.com/status-im/whisper).
 
-## New RPC methods
-
 <!--TODO: provide a list of RPC methods from `shhext` API which are relevant to this spec.-->
 
-## Transport privacy
-
-The transport privacy layer defines how messages are exchanged. The goal is to hide metadata such as sender, receiver and to which conversation a message belongs.
-
-This evaluates Whisper as a standalone protocol. However, we also note common usage and Status specific usage.
-
-- [EIP-627, aka Whisper v6](https://eips.ethereum.org/EIPS/eip-627)
-- [Whisper PoC 2 spec (more motivation)](https://github.com/ethereum/wiki/wiki/Whisper-PoC-2-Protocol-Spec)
-
 <!-- TODO: Document Discovery topic -->
 <!-- TODO: Document topic hashing for 1:1 chat -->
 <!-- TODO: Document topic hashing for private group chat -->