Organize spec/test by folders via network type

Author: KolbyML

README.md

@@ -180,17 +180,17 @@ This network is a pure gossip network and does not implement any form of content
 ## Network Specifications
 
 - [Portal Wire Protocol](./portal-wire-protocol.md)
-- [uTP over DiscoveryV5](./discv5-utp.md)
-- [State Network](./state-network.md)
+- [uTP over DiscoveryV5](./utp/discv5-utp.md)
+- [State Network](./state/state-network.md)
     - Prior work: https://ethresear.ch/t/scalable-gossip-for-state-network/8958/4
-- [History Network](./history-network.md)
+- [History Network](./history/history-network.md)
     - Prior work: https://notes.ethereum.org/oUJE4ZX2Q6eMOgEMiQPkpQ?view
     - Prior Python proof-of-concept: https://github.com/ethereum/ddht/tree/341e84e9163338556cd48dd2fcfda9eedec3eb45
         - This POC should NOT be considered representative of the end goal.  It incorporates mechanisms that aren't likely to be apart of the actual implementation, specifically the "advertisement" system which proved to be a big bottleneck, as well as the SSZ merkle root system which was a workaround for large data transfer which we now intend to solve with uTP.
 - [Beacon Chain Network](./beacon-chain/beacon-network.md)
 - [Canonical Transaction Index Network](./canonical-transaction-index-network.md)
     - Spec is preliminary.
     - Network design borrows heavily from history network.
-- [Transaction Gossip Network](./transaction-gossip.md):
+- [Transaction Gossip Network](./transaction-gossip/transaction-gossip.md):
     - Spec is preliminary
     - Prior work: https://ethresear.ch/t/scalable-transaction-gossip/8660

canonical-transaction-index-network.md renamed to canonical-transaction-index/canonical-transaction-index-network.md

@@ -1,6 +1,6 @@
-# Header Gossip Network Test Vectors
+# Epoch Accumulator Test Vectors
 
-This document contains test vectors for the Header Gossip Network to help implementations conform to the specification.
+This document contains test vectors Epoch Accumulator for the Header Network to help implementations conform to the specification.
 
 ## Header Accumulator Encodings
 

content-keys-test-vectors.md

@@ -66,3 +66,64 @@ Includes both a pre and post Shapella upgrade test vector.
     }
 }
 ```
+
+## Content Id Derivations
+
+Following the testing of the encoding and decoding of the keys, we also test the proper derivation
+of the corresponding `content-id`. This is given as both the hex string and corresponding raw U256 integer.
+
+#### Block Header Key
+
+##### Input Parameters
+```
+block_hash = 0xd1c390624d3bd4e409a61a858e5dcc5517729a9170d014a6c96530d64dd8621d
+```
+
+##### Expected Output
+```
+content_key = 0x00d1c390624d3bd4e409a61a858e5dcc5517729a9170d014a6c96530d64dd8621d
+content_id = 0x3e86b3767b57402ea72e369ae0496ce47cc15be685bec3b4726b9f316e3895fe
+content_id: U256 = 28281392725701906550238743427348001871342819822834514257505083923073246729726
+```
+
+#### Block Body Key
+
+##### Input Parameters
+```
+block_hash = 0xd1c390624d3bd4e409a61a858e5dcc5517729a9170d014a6c96530d64dd8621d
+```
+
+##### Expected Output
+```
+content_key = 0x01d1c390624d3bd4e409a61a858e5dcc5517729a9170d014a6c96530d64dd8621d
+content_id = 0xebe414854629d60c58ddd5bf60fd72e41760a5f7a463fdcb169f13ee4a26786b
+content_id: U256 = 106696502175825986237944249828698290888857178633945273402044845898673345165419
+```
+
+#### Receipt Key
+
+##### Input Parameters
+```
+block_hash = 0xd1c390624d3bd4e409a61a858e5dcc5517729a9170d014a6c96530d64dd8621d
+```
+
+##### Expected Output
+```
+content_key = 0x02d1c390624d3bd4e409a61a858e5dcc5517729a9170d014a6c96530d64dd8621d
+content_id = 0xa888f4aafe9109d495ac4d4774a6277c1ada42035e3da5e10a04cc93247c04a4
+content_id: U256 = 76230538398907151249589044529104962263309222250374376758768131420767496438948
+```
+
+#### Epoch Accumulator Key
+
+##### Input Parameters
+```
+epoch_hash = 0xe242814b90ed3950e13aac7e56ce116540c71b41d1516605aada26c6c07cc491
+```
+
+##### Expected Output
+```
+content_key = 0x03e242814b90ed3950e13aac7e56ce116540c71b41d1516605aada26c6c07cc491
+content_id = 0x9fb2175e76c6989e0fdac3ee10c40d2a81eb176af32e1c16193e3904fe56896e
+content_id: U256 = 72232402989179419196382321898161638871438419016077939952896528930608027961710
+```

header-gossip-network-test-vectors.md renamed to history/epoch-accumulator-test-vectors.md

@@ -72,6 +72,12 @@ All relevant data (extracted using `eth_getProof` and `eth_getCode`):
 
 The leaf node of the account trie that holds the account state.
 
+##### Content Key Input Parameters
+```
+path = [8, 6, 7, 9, 14, 8, 14, 13]
+node_hash = 0x6225fcc63b22b80301d9f2582014e450e91f9b329b7cc87ad16894722fff5296
+```
+
 ```json
 {
   "content_key": "0x20240000006225fcc63b22b80301d9f2582014e450e91f9b329b7cc87ad16894722fff5296008679e8ed",
@@ -86,6 +92,13 @@ The leaf node of the account trie that holds the account state.
 The leaf node of the contract storage trie that holds the number of decimal
 points used by the token.
 
+##### Content Key Input Parameters
+```
+address = 0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
+path = [4, 0, 5, 7, 8, 7]
+node_hash = 0xeb43d68008d216e753fef198cf51077f5a89f406d9c244119d1643f0f2b19011
+```
+
 ```json
 {
   "content_key": "0x21c02aaa39b223fe8d0a0e5c4f27ead9083c756cc238000000eb43d68008d216e753fef198cf51077f5a89f406d9c244119d1643f0f2b1901100405787",
@@ -97,6 +110,12 @@ points used by the token.
 
 ## Contract Bytecode
 
+##### Content Key Input Parameters
+```
+address = 0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
+code_hash = 0xd0a06b12ac47863b5c7be4185c2deaad1c61557033f56c7d4ea74429cbb25e23
+```
+
 ```json
 {
   "content_key": "0x22c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2d0a06b12ac47863b5c7be4185c2deaad1c61557033f56c7d4ea74429cbb25e23",