From 893efe4f11b4549e2e5d38a69990740b28787054 Mon Sep 17 00:00:00 2001
From: GUVWAF <78759985+GUVWAF@users.noreply.github.com>
Date: Sat, 9 Nov 2024 04:30:12 +0100
Subject: [PATCH 1/3] Always set the channel corresponding to a node (#5287)

---
 src/mesh/Router.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index ca9600cabc..0b46ca3b9e 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -187,9 +187,10 @@ ErrorCode Router::sendLocal(meshtastic_MeshPacket *p, RxSource src)
             handleReceived(p, src);
         }
 
-        if (!p->channel && !p->pki_encrypted) { // don't override if a channel was requested
+        // don't override if a channel was requested and no need to set it when PKI is enforced
+        if (!p->channel && !p->pki_encrypted) {
             meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(p->to);
-            if (node && node->user.public_key.size == 0) {
+            if (node) {
                 p->channel = node->channel;
                 LOG_DEBUG("localSend to channel %d", p->channel);
             }

From f28f0a9d90bd449a5a4f01fb14d13bf2d20efd51 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 9 Nov 2024 05:31:09 -0600
Subject: [PATCH 2/3] [create-pull-request] automated change (#5290)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/protobufs b/protobufs
index 834915aa04..04f21f5c72 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 834915aa046532da0bd8478c250eb33847e9518f
+Subproject commit 04f21f5c7238b8e02f794d9282c4786752634b3c

From 623203ca3bbaecaf66241ba658d992e511ec5628 Mon Sep 17 00:00:00 2001
From: Tom Fifield <tom@tomfifield.net>
Date: Sat, 9 Nov 2024 21:30:04 +0800
Subject: [PATCH 3/3] Remove scary warning about full NodeDB (#5292)

NodeDB becoming full at 100 entries and cycling out old entries is normal behaviour. The user doesn't need to take any action and shouldn't be concerned when this happens.

Remove the warning from the screen and reduce loglevel to info.
---
 src/mesh/NodeDB.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp
index bb5a09eaac..632f03456c 100644
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -1219,9 +1219,7 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
 
     if (!lite) {
         if (isFull()) {
-            if (screen)
-                screen->print("Warn: node database full!\nErasing oldest entry\n");
-            LOG_WARN("Node database full with %i nodes and %i bytes free! Erasing oldest entry", numMeshNodes,
+            LOG_INFO("Node database full with %i nodes and %i bytes free. Erasing oldest entry", numMeshNodes,
                      memGet.getFreeHeap());
             // look for oldest node and erase it
             uint32_t oldest = UINT32_MAX;
@@ -1285,4 +1283,4 @@ void recordCriticalError(meshtastic_CriticalErrorCode code, uint32_t address, co
     LOG_ERROR("A critical failure occurred, portduino is exiting");
     exit(2);
 #endif
-}
\ No newline at end of file
+}