feat: update light push to match v3 spec

.gitignore

@@ -17,4 +17,6 @@ packages/discovery/mock_local_storage
 .giga
 .cursor
 .DS_Store
-CLAUDE.md
+CLAUDE.md
+packages/discovery/scratch/
+

packages/core/src/index.ts

@@ -11,6 +11,11 @@ export { FilterCore, FilterCodecs } from "./lib/filter/index.js";
 
 export * as waku_light_push from "./lib/light_push/index.js";
 export { LightPushCodec, LightPushCore } from "./lib/light_push/index.js";
+export {
+  LightPushCoreV2,
+  LightPushCodecV2,
+  LightPushCoreV3
+} from "./lib/light_push/index.js";
 
 export * as waku_store from "./lib/store/index.js";
 export { StoreCore, StoreCodec } from "./lib/store/index.js";

packages/core/src/lib/connection_manager/connection_manager.ts

@@ -57,7 +57,7 @@
   private options: ConnectionManagerOptions;
   private libp2p: Libp2p;
   private dialAttemptsForPeer: Map<string, number> = new Map();
   private dialErrorsForPeer: Map<string, any> = new Map();
 
   private currentActiveParallelDialCount = 0;
   private pendingPeerDialQueue: Array<PeerId> = [];
@@ -267,7 +267,7 @@
    * // Dial using multiaddr with specific protocols
    * await connectionManager.dialPeer(multiaddr, [
    *   "/vac/waku/relay/2.0.0",
-   *   "/vac/waku/lightpush/2.0.0-beta1"
+   *   "/vac/waku/lightpush/3.0.0"
    * ]);
    * ```
    *
@@ -315,7 +315,7 @@
         } else {
           // Handle generic error
           log.error(
             `Error dialing peer ${peerIdStr} - ${(error as any).message}`
           );
         }
         this.dialErrorsForPeer.set(peerIdStr, error);

packages/core/src/lib/light_push/index.ts

@@ -1 +1,22 @@
-export { LightPushCore, LightPushCodec, PushResponse } from "./light_push.js";
+export {
+  LightPushCore,
+  LightPushCodec,
+  LightPushCoreV2,
+  LightPushCodecV2,
+  PushResponse
+} from "./light_push.js";
+
+export { LightPushCoreV3 } from "./light_push_v3.js";
+export { PushRpcV3 } from "./push_rpc_v3.js";
+export {
+  lightPushStatusCodeToProtocolErrorV3,
+  lightPushStatusDescriptionsV3,
+  getLightPushStatusDescriptionV3
+} from "./status_codes_v3.js";
+export {
+  LightPushStatusCode,
+  lightPushStatusCodeToProtocolError,
+  lightPushStatusDescriptions,
+  getLightPushStatusDescription,
+  isSuccessStatusCode
+} from "./status_codes.js";

packages/core/src/lib/light_push/light_push.ts

@@ -1,14 +1,14 @@
 import type { PeerId, Stream } from "@libp2p/interface";
 import {
-  type CoreProtocolResult,
+  type CoreProtocolResultWithMeta,
   type IEncoder,
   type IMessage,
   type Libp2p,
   ProtocolError,
   PubsubTopic,
   type ThisOrThat
 } from "@waku/interfaces";
-import { PushResponse } from "@waku/proto";
+import { proto_lightpush_v2, PushResponse } from "@waku/proto";
 import { isMessageSizeUnderCap } from "@waku/utils";
 import { Logger } from "@waku/utils";
 import all from "it-all";
@@ -18,19 +18,17 @@ import { Uint8ArrayList } from "uint8arraylist";
 
 import { StreamManager } from "../stream_manager/index.js";
 
-import { PushRpc } from "./push_rpc.js";
-import { isRLNResponseError } from "./utils.js";
+import { PushRpcV2 } from "./push_rpc_v2.js";
+import { mapInfoToProtocolError } from "./utils.js";
 
 const log = new Logger("light-push");
 
 export const LightPushCodec = "/vac/waku/lightpush/2.0.0-beta1";
-export { PushResponse };
 
-type PreparePushMessageResult = ThisOrThat<"query", PushRpc>;
+export const LightPushCodecV2 = LightPushCodec;
+
+type PreparePushMessageResult = ThisOrThat<"query", PushRpcV2>;
 
-/**
- * Implements the [Waku v2 Light Push protocol](https://rfc.vac.dev/spec/19/).
- */
 export class LightPushCore {
   private readonly streamManager: StreamManager;
 
@@ -67,7 +65,7 @@ export class LightPushCore {
         };
       }
 
-      const query = PushRpc.createRequest(protoMessage, encoder.pubsubTopic);
+      const query = PushRpcV2.createRequest(protoMessage, encoder.pubsubTopic);
       return { query, error: null };
     } catch (error) {
       log.error("Failed to prepare push message", error);
@@ -83,7 +81,7 @@ export class LightPushCore {
     encoder: IEncoder,
     message: IMessage,
     peerId: PeerId
-  ): Promise<CoreProtocolResult> {
+  ): Promise<CoreProtocolResultWithMeta> {
     const { query, error: preparationError } = await this.preparePushMessage(
       encoder,
       message
@@ -95,7 +93,8 @@ export class LightPushCore {
         failure: {
           error: preparationError,
           peerId
-        }
+        },
+        protocolUsed: LightPushCodec
       };
     }
 
@@ -109,7 +108,8 @@ export class LightPushCore {
         failure: {
           error: ProtocolError.NO_STREAM_AVAILABLE,
           peerId: peerId
-        }
+        },
+        protocolUsed: LightPushCodec
       };
     }
 
@@ -123,14 +123,14 @@ export class LightPushCore {
         async (source) => await all(source)
       );
     } catch (err) {
-      // can fail only because of `stream` abortion
       log.error("Failed to send waku light push request", err);
       return {
         success: null,
         failure: {
           error: ProtocolError.STREAM_ABORTED,
           peerId: peerId
-        }
+        },
+        protocolUsed: LightPushCodec
       };
     }
 
@@ -139,17 +139,18 @@ export class LightPushCore {
       bytes.append(chunk);
     });
 
-    let response: PushResponse | undefined;
+    let response: proto_lightpush_v2.PushResponse | undefined;
     try {
-      response = PushRpc.decode(bytes).response;
+      response = PushRpcV2.decode(bytes).response;
     } catch (err) {
       log.error("Failed to decode push reply", err);
       return {
         success: null,
         failure: {
           error: ProtocolError.DECODE_FAILED,
           peerId: peerId
-        }
+        },
+        protocolUsed: LightPushCodec
       };
     }
 
@@ -160,32 +161,35 @@ export class LightPushCore {
         failure: {
           error: ProtocolError.NO_RESPONSE,
           peerId: peerId
-        }
-      };
-    }
-
-    if (isRLNResponseError(response.info)) {
-      log.error("Remote peer fault: RLN generation");
-      return {
-        success: null,
-        failure: {
-          error: ProtocolError.RLN_PROOF_GENERATION,
-          peerId: peerId
-        }
+        },
+        protocolUsed: LightPushCodec
       };
     }
 
     if (!response.isSuccess) {
-      log.error("Remote peer rejected the message: ", response.info);
+      const errorMessage = response.info || "Message rejected";
+      log.error("Remote peer rejected the message: ", errorMessage);
+
+      // Use pattern matching to determine the appropriate error type
+      const error = mapInfoToProtocolError(response.info);
+
       return {
         success: null,
         failure: {
-          error: ProtocolError.REMOTE_PEER_REJECTED,
+          error: error,
           peerId: peerId
-        }
+        },
+        protocolUsed: LightPushCodec
       };
     }
 
-    return { success: peerId, failure: null };
+    return {
+      success: peerId,
+      failure: null,
+      protocolUsed: LightPushCodec
+    };
   }
 }
+
+export const LightPushCoreV2 = LightPushCore;
+export { PushResponse };