feat: update portal_*Offer to handle multiple pieces of content (#1507

)

ethportal-api/src/beacon.rs

@@ -115,19 +115,18 @@ pub trait BeaconNetworkApi {
         content_value: RawContentValue,
     ) -> RpcResult<TraceGossipInfo>;
 
-    /// Send an OFFER request with given ContentKey, to the designated peer and wait for a response.
-    /// Does not store the content locally.
+    /// Send an OFFER request with given ContentItems, to the designated peer and wait for a
+    /// response. Does not store the content locally.
     /// Returns the content keys bitlist upon successful content transmission or empty bitlist
     /// receive.
     #[method(name = "beaconOffer")]
     async fn offer(
         &self,
         enr: Enr,
-        content_key: BeaconContentKey,
-        content_value: RawContentValue,
+        content_items: Vec<(BeaconContentKey, RawContentValue)>,
     ) -> RpcResult<AcceptInfo>;
 
-    /// Send an OFFER request with given ContentKey, to the designated peer.
+    /// Send an OFFER request with given ContentItems, to the designated peer.
     /// Does not store the content locally.
     /// Returns trace info for the offer.
     #[method(name = "beaconTraceOffer")]
@@ -138,17 +137,6 @@ pub trait BeaconNetworkApi {
         content_value: RawContentValue,
     ) -> RpcResult<OfferTrace>;
 
-    /// Send an OFFER request with given ContentKeys, to the designated peer and wait for a
-    /// response. Requires the content keys to be stored locally.
-    /// Returns the content keys bitlist upon successful content transmission or empty bitlist
-    /// receive.
-    #[method(name = "beaconWireOffer")]
-    async fn wire_offer(
-        &self,
-        enr: Enr,
-        content_keys: Vec<BeaconContentKey>,
-    ) -> RpcResult<AcceptInfo>;
-
     /// Store content key with a content data to the local database.
     #[method(name = "beaconStore")]
     async fn store(

ethportal-api/src/history.rs

@@ -101,19 +101,18 @@ pub trait HistoryNetworkApi {
         content_value: RawContentValue,
     ) -> RpcResult<TraceGossipInfo>;
 
-    /// Send an OFFER request with given ContentKey, to the designated peer and wait for a response.
-    /// Does not store the content locally.
+    /// Send an OFFER request with given ContentItems, to the designated peer and wait for a
+    /// response. Does not store the content locally.
     /// Returns the content keys bitlist upon successful content transmission or empty bitlist
     /// receive.
     #[method(name = "historyOffer")]
     async fn offer(
         &self,
         enr: Enr,
-        content_key: HistoryContentKey,
-        content_value: RawContentValue,
+        content_items: Vec<(HistoryContentKey, RawContentValue)>,
     ) -> RpcResult<AcceptInfo>;
 
-    /// Send an OFFER request with given ContentKey, to the designated peer.
+    /// Send an OFFER request with given ContentItems, to the designated peer.
     /// Does not store the content locally.
     /// Returns trace info for the offer.
     #[method(name = "historyTraceOffer")]
@@ -124,17 +123,6 @@ pub trait HistoryNetworkApi {
         content_value: RawContentValue,
     ) -> RpcResult<OfferTrace>;
 
-    /// Send an OFFER request with given ContentKeys, to the designated peer and wait for a
-    /// response. Requires the content keys to be stored locally.
-    /// Returns the content keys bitlist upon successful content transmission or empty bitlist
-    /// receive.
-    #[method(name = "historyWireOffer")]
-    async fn wire_offer(
-        &self,
-        enr: Enr,
-        content_keys: Vec<HistoryContentKey>,
-    ) -> RpcResult<AcceptInfo>;
-
     /// Store content key with a content data to the local database.
     #[method(name = "historyStore")]
     async fn store(

ethportal-api/src/state.rs

@@ -94,19 +94,18 @@ pub trait StateNetworkApi {
         content_value: RawContentValue,
     ) -> RpcResult<TraceGossipInfo>;
 
-    /// Send an OFFER request with given ContentKey, to the designated peer and wait for a response.
-    /// Does not store the content locally.
+    /// Send an OFFER request with given ContentItems, to the designated peer and wait for a
+    /// response. Does not store the content locally.
     /// Returns the content keys bitlist upon successful content transmission or empty bitlist
     /// receive.
     #[method(name = "stateOffer")]
     async fn offer(
         &self,
         enr: Enr,
-        content_key: StateContentKey,
-        content_value: RawContentValue,
+        content_items: Vec<(StateContentKey, RawContentValue)>,
     ) -> RpcResult<AcceptInfo>;
 
-    /// Send an OFFER request with given ContentKey, to the designated peer.
+    /// Send an OFFER request with given ContentItems, to the designated peer.
     /// Does not store the content locally.
     /// Returns trace info for offer.
     #[method(name = "stateTraceOffer")]

ethportal-api/src/types/jsonrpc/endpoints.rs

@@ -42,10 +42,8 @@ pub enum StateEndpoint {
     TraceRecursiveFindContent(StateContentKey),
     /// params: [content_key, content_value]
     Store(StateContentKey, StateContentValue),
-    /// WireOffer is not supported in the state network, since locally
-    /// stored values do not contain the proofs necessary for valid gossip.
-    /// params: [enr, content_key, content_value]
-    Offer(Enr, StateContentKey, StateContentValue),
+    /// params: [enr, Vec<(content_key, content_value>)]
+    Offer(Enr, Vec<(StateContentKey, StateContentValue)>),
     /// params: [enr, content_key, content_value]
     TraceOffer(Enr, StateContentKey, StateContentValue),
     /// params: [enr, content_key, content_value]
@@ -79,12 +77,10 @@ pub enum HistoryEndpoint {
     Gossip(HistoryContentKey, HistoryContentValue),
     /// params: [content_key, content_value]
     TraceGossip(HistoryContentKey, HistoryContentValue),
-    /// params: [enr, content_key, content_value]
-    Offer(Enr, HistoryContentKey, HistoryContentValue),
+    /// params: [enr, Vec<(content_key, content_value)>]
+    Offer(Enr, Vec<(HistoryContentKey, HistoryContentValue)>),
     /// params: [enr, content_key, content_value]
     TraceOffer(Enr, HistoryContentKey, HistoryContentValue),
-    /// params: [enr, [content_key]]
-    WireOffer(Enr, Vec<HistoryContentKey>),
     /// params: [enr]
     Ping(Enr),
     /// params: content_key
@@ -133,12 +129,10 @@ pub enum BeaconEndpoint {
     Gossip(BeaconContentKey, BeaconContentValue),
     /// params: [content_key, content_value]
     TraceGossip(BeaconContentKey, BeaconContentValue),
-    /// params: [enr, content_key, content_value]
-    Offer(Enr, BeaconContentKey, BeaconContentValue),
+    /// params: [enr, Vec<(content_key, content_value>)]
+    Offer(Enr, Vec<(BeaconContentKey, BeaconContentValue)>),
     /// params: [enr, content_key, content_value]
     TraceOffer(Enr, BeaconContentKey, BeaconContentValue),
-    /// params: [enr, [content_key]]
-    WireOffer(Enr, Vec<BeaconContentKey>),
     /// params: enr
     Ping(Enr),
     /// params: content_key

ethportal-api/src/types/portal.rs

@@ -32,6 +32,8 @@ pub struct PongInfo {
 
 pub type FindNodesInfo = Vec<Enr>;
 
+pub const MAX_CONTENT_KEYS_PER_OFFER: usize = 64;
+
 /// Response for Offer endpoint
 #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]

ethportal-peertest/src/scenarios/gossip.rs

@@ -181,13 +181,15 @@ pub async fn test_gossip_dropped_with_offer(peertest: &Peertest, target: &Client
     target
         .offer(
             fresh_enr.clone(),
-            header_key_2.clone(),
-            header_value_2.encode(),
+            vec![(header_key_2.clone(), header_value_2.encode())],
         )
         .await
         .unwrap();
     target
-        .offer(fresh_enr.clone(), body_key_2.clone(), body_value_2.encode())
+        .offer(
+            fresh_enr.clone(),
+            vec![(body_key_2.clone(), body_value_2.encode())],
+        )
         .await
         .unwrap();