add mix pubkey in enr and fix lightpush rebase issues

Author: chaitanyaprem

waku/factory/internal_config.nim

@@ -11,6 +11,7 @@ import
   ../common/utils/nat,
   ../node/config,
   ../waku_enr/capabilities,
+  ../waku_enr/mix,
   ../waku_enr,
   ../waku_core
 
@@ -33,6 +34,9 @@ proc enrConfiguration*(
   ).isOkOr:
     return err("could not initialize ENR with shards")
 
+  if conf.mix and conf.mixKey.isSome():
+    enrBuilder.withMixKey(conf.mixKey.get())
+
   let recordRes = enrBuilder.build()
   let record =
     if recordRes.isErr():

waku/node/waku_node.nim

@@ -272,7 +272,6 @@ proc mountMix*(node: WakuNode, mixPrivKey: string): Future[Result[void, string]]
     node.switch.mount(node.mix)
   if catchRes.isErr():
     return err(catchRes.error.msg)
-
   return ok()
 
 ## Waku Sync

waku/waku_lightpush/client.nim

@@ -114,15 +114,19 @@ proc publishToAny*(
 
 proc publishWithConn*(
   wl: WakuLightPushClient, pubSubTopic: PubsubTopic, message: WakuMessage, conn: Connection
-): Future[WakuLightPushResult[void]] {.async, gcsafe.} =
+): Future[WakuLightPushResult] {.async, gcsafe.} =
   ## This proc is similar to the publish one but in this case
   ## we use existing connection to publish.
 
   info "publishWithConn", msg_hash = computeMessageHash(pubsubTopic, message).to0xHex
 
-  let pushRequest = PushRequest(pubSubTopic: pubSubTopic, message: message)
-  let rpc = PushRPC(requestId: generateRequestId(wl.rng), request: some(pushRequest))
-  await conn.writeLP(rpc.encode().buffer)
+  let pushRequest = LightpushRequest(
+    requestId: generateRequestId(wl.rng),
+    pubSubTopic: some(pubSubTopic),
+    message: message,
+  )
+
+  await conn.writeLP(pushRequest.encode().buffer)
 
   for obs in wl.publishObservers:
     obs.onMessagePublished(pubSubTopic, message)