From 55fe95e84c14023cb4134392c7bea79a31a9741b Mon Sep 17 00:00:00 2001
From: Marco Munizaga <git@marcopolo.io>
Date: Wed, 3 Sep 2025 15:31:05 -0700
Subject: [PATCH 1/4] refactor!: move canonicallog package outside of core

---
 {core => p2p}/canonicallog/canonicallog.go      | 0
 {core => p2p}/canonicallog/canonicallog_test.go | 0
 p2p/net/swarm/swarm_dial.go                     | 2 +-
 p2p/net/swarm/swarm_listen.go                   | 2 +-
 p2p/security/noise/session_transport.go         | 2 +-
 p2p/security/noise/transport.go                 | 2 +-
 p2p/security/tls/transport.go                   | 2 +-
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename {core => p2p}/canonicallog/canonicallog.go (100%)
 rename {core => p2p}/canonicallog/canonicallog_test.go (100%)

diff --git a/core/canonicallog/canonicallog.go b/p2p/canonicallog/canonicallog.go
similarity index 100%
rename from core/canonicallog/canonicallog.go
rename to p2p/canonicallog/canonicallog.go
diff --git a/core/canonicallog/canonicallog_test.go b/p2p/canonicallog/canonicallog_test.go
similarity index 100%
rename from core/canonicallog/canonicallog_test.go
rename to p2p/canonicallog/canonicallog_test.go
diff --git a/p2p/net/swarm/swarm_dial.go b/p2p/net/swarm/swarm_dial.go
index 031bdfa2d7..19e835e82b 100644
--- a/p2p/net/swarm/swarm_dial.go
+++ b/p2p/net/swarm/swarm_dial.go
@@ -9,11 +9,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/libp2p/go-libp2p/core/canonicallog"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/peerstore"
 	"github.com/libp2p/go-libp2p/core/transport"
+	"github.com/libp2p/go-libp2p/p2p/canonicallog"
 
 	ma "github.com/multiformats/go-multiaddr"
 	mafmt "github.com/multiformats/go-multiaddr-fmt"
diff --git a/p2p/net/swarm/swarm_listen.go b/p2p/net/swarm/swarm_listen.go
index 1da22d6d67..307c55580d 100644
--- a/p2p/net/swarm/swarm_listen.go
+++ b/p2p/net/swarm/swarm_listen.go
@@ -6,9 +6,9 @@ import (
 	"slices"
 	"time"
 
-	"github.com/libp2p/go-libp2p/core/canonicallog"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/transport"
+	"github.com/libp2p/go-libp2p/p2p/canonicallog"
 
 	ma "github.com/multiformats/go-multiaddr"
 )
diff --git a/p2p/security/noise/session_transport.go b/p2p/security/noise/session_transport.go
index 0f26f3fa8e..456c26c8bb 100644
--- a/p2p/security/noise/session_transport.go
+++ b/p2p/security/noise/session_transport.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"net"
 
-	"github.com/libp2p/go-libp2p/core/canonicallog"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/core/sec"
+	"github.com/libp2p/go-libp2p/p2p/canonicallog"
 	"github.com/libp2p/go-libp2p/p2p/security/noise/pb"
 
 	manet "github.com/multiformats/go-multiaddr/net"
diff --git a/p2p/security/noise/transport.go b/p2p/security/noise/transport.go
index e42cea1bf7..c97b77159c 100644
--- a/p2p/security/noise/transport.go
+++ b/p2p/security/noise/transport.go
@@ -4,11 +4,11 @@ import (
 	"context"
 	"net"
 
-	"github.com/libp2p/go-libp2p/core/canonicallog"
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/core/sec"
+	"github.com/libp2p/go-libp2p/p2p/canonicallog"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
 	"github.com/libp2p/go-libp2p/p2p/security/noise/pb"
 
diff --git a/p2p/security/tls/transport.go b/p2p/security/tls/transport.go
index 0c494a7fdc..36265b1fa9 100644
--- a/p2p/security/tls/transport.go
+++ b/p2p/security/tls/transport.go
@@ -9,12 +9,12 @@ import (
 	"os"
 	"runtime/debug"
 
-	"github.com/libp2p/go-libp2p/core/canonicallog"
 	ci "github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/core/sec"
+	"github.com/libp2p/go-libp2p/p2p/canonicallog"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
 
 	manet "github.com/multiformats/go-multiaddr/net"

From 403c42ee72ba7407e0e7b3b9dccab00037d2e31d Mon Sep 17 00:00:00 2001
From: Marco Munizaga <git@marcopolo.io>
Date: Thu, 4 Sep 2025 10:01:36 -0700
Subject: [PATCH 2/4] refactor: drop go-varint dependency

---
 core/record/envelope.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/record/envelope.go b/core/record/envelope.go
index 413a55c9e8..593460c5eb 100644
--- a/core/record/envelope.go
+++ b/core/record/envelope.go
@@ -2,6 +2,7 @@ package record
 
 import (
 	"bytes"
+	"encoding/binary"
 	"errors"
 	"fmt"
 	"sync"
@@ -12,7 +13,6 @@ import (
 
 	pool "github.com/libp2p/go-buffer-pool"
 
-	"github.com/multiformats/go-varint"
 	"google.golang.org/protobuf/proto"
 )
 
@@ -278,7 +278,7 @@ func makeUnsigned(domain string, payloadType []byte, payload []byte) ([]byte, er
 
 	for i, f := range fields {
 		l := len(f)
-		flen[i] = varint.ToUvarint(uint64(l))
+		flen[i] = binary.AppendUvarint(nil, uint64(l))
 		size += l + len(flen[i])
 	}
 

From 758bbd29a106b4e741ad7d665669ba949c73e554 Mon Sep 17 00:00:00 2001
From: Marco Munizaga <git@marcopolo.io>
Date: Thu, 4 Sep 2025 10:02:00 -0700
Subject: [PATCH 3/4] refactor!: move insecure transport outside of core

---
 config/config.go                              |  2 +-
 core/sec/insecure/pb/plaintext.proto          | 12 -----
 p2p/net/swarm/dial_worker_test.go             |  2 +-
 p2p/net/swarm/testing/testing.go              |  2 +-
 p2p/net/upgrader/listener_test.go             |  2 +-
 p2p/net/upgrader/upgrader_test.go             |  2 +-
 .../sec => p2p/security}/insecure/insecure.go |  4 +-
 .../security}/insecure/insecure_test.go       |  0
 .../security}/insecure/pb/plaintext.pb.go     | 54 +++++++++----------
 p2p/security/insecure/pb/plaintext.proto      | 12 +++++
 p2p/test/negotiation/muxer_test.go            |  2 +-
 p2p/transport/tcp/tcp_test.go                 |  2 +-
 p2p/transport/websocket/websocket_test.go     |  2 +-
 proto_test.go                                 |  2 +-
 scripts/gen-proto.sh                          |  2 +-
 15 files changed, 51 insertions(+), 51 deletions(-)
 delete mode 100644 core/sec/insecure/pb/plaintext.proto
 rename {core/sec => p2p/security}/insecure/insecure.go (98%)
 rename {core/sec => p2p/security}/insecure/insecure_test.go (100%)
 rename {core/sec => p2p/security}/insecure/pb/plaintext.pb.go (54%)
 create mode 100644 p2p/security/insecure/pb/plaintext.proto

diff --git a/config/config.go b/config/config.go
index 2b3b6ee772..8e730b19ee 100644
--- a/config/config.go
+++ b/config/config.go
@@ -21,7 +21,6 @@ import (
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/core/routing"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	logging "github.com/libp2p/go-libp2p/gologshim"
 	"github.com/libp2p/go-libp2p/p2p/host/autonat"
@@ -40,6 +39,7 @@ import (
 	relayv2 "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/relay"
 	"github.com/libp2p/go-libp2p/p2p/protocol/holepunch"
 	"github.com/libp2p/go-libp2p/p2p/protocol/identify"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcpreuse"
 	libp2pwebrtc "github.com/libp2p/go-libp2p/p2p/transport/webrtc"
diff --git a/core/sec/insecure/pb/plaintext.proto b/core/sec/insecure/pb/plaintext.proto
deleted file mode 100644
index 6b14764bec..0000000000
--- a/core/sec/insecure/pb/plaintext.proto
+++ /dev/null
@@ -1,12 +0,0 @@
-syntax = "proto2";
-
-package plaintext.pb;
-
-import "core/crypto/pb/crypto.proto";
-
-option go_package = "github.com/libp2p/go-libp2p/core/sec/insecure/pb";
-
-message Exchange {
-    optional bytes id = 1;
-    optional crypto.pb.PublicKey pubkey = 2;
-}
diff --git a/p2p/net/swarm/dial_worker_test.go b/p2p/net/swarm/dial_worker_test.go
index 3935c79767..bc422ee4af 100644
--- a/p2p/net/swarm/dial_worker_test.go
+++ b/p2p/net/swarm/dial_worker_test.go
@@ -19,13 +19,13 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/peerstore"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/test"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"
 	"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
diff --git a/p2p/net/swarm/testing/testing.go b/p2p/net/swarm/testing/testing.go
index bafe49b769..1766b5c3bf 100644
--- a/p2p/net/swarm/testing/testing.go
+++ b/p2p/net/swarm/testing/testing.go
@@ -15,13 +15,13 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/peerstore"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/host/eventbus"
 	"github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoremem"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	"github.com/libp2p/go-libp2p/p2p/net/swarm"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	libp2pquic "github.com/libp2p/go-libp2p/p2p/transport/quic"
 	"github.com/libp2p/go-libp2p/p2p/transport/quicreuse"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
diff --git a/p2p/net/upgrader/listener_test.go b/p2p/net/upgrader/listener_test.go
index e2def7cc0c..95b16f123a 100644
--- a/p2p/net/upgrader/listener_test.go
+++ b/p2p/net/upgrader/listener_test.go
@@ -14,9 +14,9 @@ import (
 	mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
diff --git a/p2p/net/upgrader/upgrader_test.go b/p2p/net/upgrader/upgrader_test.go
index 95fa49cbf7..11a39db252 100644
--- a/p2p/net/upgrader/upgrader_test.go
+++ b/p2p/net/upgrader/upgrader_test.go
@@ -13,10 +13,10 @@ import (
 	mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	"github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 
 	ma "github.com/multiformats/go-multiaddr"
 	manet "github.com/multiformats/go-multiaddr/net"
diff --git a/core/sec/insecure/insecure.go b/p2p/security/insecure/insecure.go
similarity index 98%
rename from core/sec/insecure/insecure.go
rename to p2p/security/insecure/insecure.go
index 3377b320c2..8b0dc37d52 100644
--- a/core/sec/insecure/insecure.go
+++ b/p2p/security/insecure/insecure.go
@@ -1,6 +1,6 @@
 // Package insecure provides an insecure, unencrypted implementation of the SecureConn and SecureTransport interfaces.
 //
-// Recommended only for testing and other non-production usage.
+// Not Recommended
 package insecure
 
 import (
@@ -14,7 +14,7 @@ import (
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure/pb"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure/pb"
 
 	"github.com/libp2p/go-msgio"
 
diff --git a/core/sec/insecure/insecure_test.go b/p2p/security/insecure/insecure_test.go
similarity index 100%
rename from core/sec/insecure/insecure_test.go
rename to p2p/security/insecure/insecure_test.go
diff --git a/core/sec/insecure/pb/plaintext.pb.go b/p2p/security/insecure/pb/plaintext.pb.go
similarity index 54%
rename from core/sec/insecure/pb/plaintext.pb.go
rename to p2p/security/insecure/pb/plaintext.pb.go
index bb3ebf5438..c08300eede 100644
--- a/core/sec/insecure/pb/plaintext.pb.go
+++ b/p2p/security/insecure/pb/plaintext.pb.go
@@ -2,7 +2,7 @@
 // versions:
 // 	protoc-gen-go v1.36.6
 // 	protoc        v5.29.2
-// source: core/sec/insecure/pb/plaintext.proto
+// source: p2p/security/insecure/pb/plaintext.proto
 
 package pb
 
@@ -32,7 +32,7 @@ type Exchange struct {
 
 func (x *Exchange) Reset() {
 	*x = Exchange{}
-	mi := &file_core_sec_insecure_pb_plaintext_proto_msgTypes[0]
+	mi := &file_p2p_security_insecure_pb_plaintext_proto_msgTypes[0]
 	ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 	ms.StoreMessageInfo(mi)
 }
@@ -44,7 +44,7 @@ func (x *Exchange) String() string {
 func (*Exchange) ProtoMessage() {}
 
 func (x *Exchange) ProtoReflect() protoreflect.Message {
-	mi := &file_core_sec_insecure_pb_plaintext_proto_msgTypes[0]
+	mi := &file_p2p_security_insecure_pb_plaintext_proto_msgTypes[0]
 	if x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -57,7 +57,7 @@ func (x *Exchange) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use Exchange.ProtoReflect.Descriptor instead.
 func (*Exchange) Descriptor() ([]byte, []int) {
-	return file_core_sec_insecure_pb_plaintext_proto_rawDescGZIP(), []int{0}
+	return file_p2p_security_insecure_pb_plaintext_proto_rawDescGZIP(), []int{0}
 }
 
 func (x *Exchange) GetId() []byte {
@@ -74,33 +74,33 @@ func (x *Exchange) GetPubkey() *pb.PublicKey {
 	return nil
 }
 
-var File_core_sec_insecure_pb_plaintext_proto protoreflect.FileDescriptor
+var File_p2p_security_insecure_pb_plaintext_proto protoreflect.FileDescriptor
 
-const file_core_sec_insecure_pb_plaintext_proto_rawDesc = "" +
+const file_p2p_security_insecure_pb_plaintext_proto_rawDesc = "" +
 	"\n" +
-	"$core/sec/insecure/pb/plaintext.proto\x12\fplaintext.pb\x1a\x1bcore/crypto/pb/crypto.proto\"H\n" +
+	"(p2p/security/insecure/pb/plaintext.proto\x12\fplaintext.pb\x1a\x1bcore/crypto/pb/crypto.proto\"H\n" +
 	"\bExchange\x12\x0e\n" +
 	"\x02id\x18\x01 \x01(\fR\x02id\x12,\n" +
-	"\x06pubkey\x18\x02 \x01(\v2\x14.crypto.pb.PublicKeyR\x06pubkeyB2Z0github.com/libp2p/go-libp2p/core/sec/insecure/pb"
+	"\x06pubkey\x18\x02 \x01(\v2\x14.crypto.pb.PublicKeyR\x06pubkeyB6Z4github.com/libp2p/go-libp2p/p2p/security/insecure/pb"
 
 var (
-	file_core_sec_insecure_pb_plaintext_proto_rawDescOnce sync.Once
-	file_core_sec_insecure_pb_plaintext_proto_rawDescData []byte
+	file_p2p_security_insecure_pb_plaintext_proto_rawDescOnce sync.Once
+	file_p2p_security_insecure_pb_plaintext_proto_rawDescData []byte
 )
 
-func file_core_sec_insecure_pb_plaintext_proto_rawDescGZIP() []byte {
-	file_core_sec_insecure_pb_plaintext_proto_rawDescOnce.Do(func() {
-		file_core_sec_insecure_pb_plaintext_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_core_sec_insecure_pb_plaintext_proto_rawDesc), len(file_core_sec_insecure_pb_plaintext_proto_rawDesc)))
+func file_p2p_security_insecure_pb_plaintext_proto_rawDescGZIP() []byte {
+	file_p2p_security_insecure_pb_plaintext_proto_rawDescOnce.Do(func() {
+		file_p2p_security_insecure_pb_plaintext_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_p2p_security_insecure_pb_plaintext_proto_rawDesc), len(file_p2p_security_insecure_pb_plaintext_proto_rawDesc)))
 	})
-	return file_core_sec_insecure_pb_plaintext_proto_rawDescData
+	return file_p2p_security_insecure_pb_plaintext_proto_rawDescData
 }
 
-var file_core_sec_insecure_pb_plaintext_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_core_sec_insecure_pb_plaintext_proto_goTypes = []any{
+var file_p2p_security_insecure_pb_plaintext_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_p2p_security_insecure_pb_plaintext_proto_goTypes = []any{
 	(*Exchange)(nil),     // 0: plaintext.pb.Exchange
 	(*pb.PublicKey)(nil), // 1: crypto.pb.PublicKey
 }
-var file_core_sec_insecure_pb_plaintext_proto_depIdxs = []int32{
+var file_p2p_security_insecure_pb_plaintext_proto_depIdxs = []int32{
 	1, // 0: plaintext.pb.Exchange.pubkey:type_name -> crypto.pb.PublicKey
 	1, // [1:1] is the sub-list for method output_type
 	1, // [1:1] is the sub-list for method input_type
@@ -109,26 +109,26 @@ var file_core_sec_insecure_pb_plaintext_proto_depIdxs = []int32{
 	0, // [0:1] is the sub-list for field type_name
 }
 
-func init() { file_core_sec_insecure_pb_plaintext_proto_init() }
-func file_core_sec_insecure_pb_plaintext_proto_init() {
-	if File_core_sec_insecure_pb_plaintext_proto != nil {
+func init() { file_p2p_security_insecure_pb_plaintext_proto_init() }
+func file_p2p_security_insecure_pb_plaintext_proto_init() {
+	if File_p2p_security_insecure_pb_plaintext_proto != nil {
 		return
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
 		File: protoimpl.DescBuilder{
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: unsafe.Slice(unsafe.StringData(file_core_sec_insecure_pb_plaintext_proto_rawDesc), len(file_core_sec_insecure_pb_plaintext_proto_rawDesc)),
+			RawDescriptor: unsafe.Slice(unsafe.StringData(file_p2p_security_insecure_pb_plaintext_proto_rawDesc), len(file_p2p_security_insecure_pb_plaintext_proto_rawDesc)),
 			NumEnums:      0,
 			NumMessages:   1,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
-		GoTypes:           file_core_sec_insecure_pb_plaintext_proto_goTypes,
-		DependencyIndexes: file_core_sec_insecure_pb_plaintext_proto_depIdxs,
-		MessageInfos:      file_core_sec_insecure_pb_plaintext_proto_msgTypes,
+		GoTypes:           file_p2p_security_insecure_pb_plaintext_proto_goTypes,
+		DependencyIndexes: file_p2p_security_insecure_pb_plaintext_proto_depIdxs,
+		MessageInfos:      file_p2p_security_insecure_pb_plaintext_proto_msgTypes,
 	}.Build()
-	File_core_sec_insecure_pb_plaintext_proto = out.File
-	file_core_sec_insecure_pb_plaintext_proto_goTypes = nil
-	file_core_sec_insecure_pb_plaintext_proto_depIdxs = nil
+	File_p2p_security_insecure_pb_plaintext_proto = out.File
+	file_p2p_security_insecure_pb_plaintext_proto_goTypes = nil
+	file_p2p_security_insecure_pb_plaintext_proto_depIdxs = nil
 }
diff --git a/p2p/security/insecure/pb/plaintext.proto b/p2p/security/insecure/pb/plaintext.proto
new file mode 100644
index 0000000000..1af90fe260
--- /dev/null
+++ b/p2p/security/insecure/pb/plaintext.proto
@@ -0,0 +1,12 @@
+syntax = "proto2";
+
+package plaintext.pb;
+
+import "core/crypto/pb/crypto.proto";
+
+option go_package = "github.com/libp2p/go-libp2p/p2p/security/insecure/pb";
+
+message Exchange {
+  optional bytes id = 1;
+  optional crypto.pb.PublicKey pubkey = 2;
+}
diff --git a/p2p/test/negotiation/muxer_test.go b/p2p/test/negotiation/muxer_test.go
index 52c662236c..0047c5ab60 100644
--- a/p2p/test/negotiation/muxer_test.go
+++ b/p2p/test/negotiation/muxer_test.go
@@ -10,8 +10,8 @@ import (
 	"github.com/libp2p/go-libp2p/core/crypto"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/protocol"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/security/noise"
 	tls "github.com/libp2p/go-libp2p/p2p/security/tls"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcp"
diff --git a/p2p/transport/tcp/tcp_test.go b/p2p/transport/tcp/tcp_test.go
index 8fff3ce46f..304bce251c 100644
--- a/p2p/transport/tcp/tcp_test.go
+++ b/p2p/transport/tcp/tcp_test.go
@@ -11,10 +11,10 @@ import (
 	mocknetwork "github.com/libp2p/go-libp2p/core/network/mocks"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/transport/tcpreuse"
 	ttransport "github.com/libp2p/go-libp2p/p2p/transport/testsuite"
 
diff --git a/p2p/transport/websocket/websocket_test.go b/p2p/transport/websocket/websocket_test.go
index fb60744385..7dda6c6bd4 100644
--- a/p2p/transport/websocket/websocket_test.go
+++ b/p2p/transport/websocket/websocket_test.go
@@ -26,11 +26,11 @@ import (
 	"github.com/libp2p/go-libp2p/core/network"
 	"github.com/libp2p/go-libp2p/core/peer"
 	"github.com/libp2p/go-libp2p/core/sec"
-	"github.com/libp2p/go-libp2p/core/sec/insecure"
 	"github.com/libp2p/go-libp2p/core/test"
 	"github.com/libp2p/go-libp2p/core/transport"
 	"github.com/libp2p/go-libp2p/p2p/muxer/yamux"
 	tptu "github.com/libp2p/go-libp2p/p2p/net/upgrader"
+	"github.com/libp2p/go-libp2p/p2p/security/insecure"
 	"github.com/libp2p/go-libp2p/p2p/security/noise"
 	ttransport "github.com/libp2p/go-libp2p/p2p/transport/testsuite"
 
diff --git a/proto_test.go b/proto_test.go
index 4c81749b55..625c146e44 100644
--- a/proto_test.go
+++ b/proto_test.go
@@ -9,13 +9,13 @@ import (
 	_ "github.com/libp2p/go-libp2p/core/crypto/pb"
 	_ "github.com/libp2p/go-libp2p/core/peer/pb"
 	_ "github.com/libp2p/go-libp2p/core/record/pb"
-	_ "github.com/libp2p/go-libp2p/core/sec/insecure/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/host/autonat/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/host/peerstore/pstoreds/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/protocol/autonatv2/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/protocol/circuitv2/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/protocol/holepunch/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/protocol/identify/pb"
+	_ "github.com/libp2p/go-libp2p/p2p/security/insecure/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/security/noise/pb"
 	_ "github.com/libp2p/go-libp2p/p2p/transport/webrtc/pb"
 	"google.golang.org/protobuf/reflect/protoreflect"
diff --git a/scripts/gen-proto.sh b/scripts/gen-proto.sh
index dac2cff2f9..836f6c78a9 100755
--- a/scripts/gen-proto.sh
+++ b/scripts/gen-proto.sh
@@ -7,7 +7,7 @@ proto_array=(
   core/crypto/pb/crypto.proto
   core/record/pb/envelope.proto
   core/peer/pb/peer_record.proto
-  core/sec/insecure/pb/plaintext.proto
+  p2p/security/insecure/pb/plaintext.proto
   p2p/host/autonat/pb/autonat.proto
   p2p/security/noise/pb/payload.proto
   p2p/transport/webrtc/pb/message.proto

From e1218c52d6e91d4acbfa7ffd34272015b3a46e73 Mon Sep 17 00:00:00 2001
From: Marco Munizaga <git@marcopolo.io>
Date: Fri, 19 Sep 2025 08:56:50 -0700
Subject: [PATCH 4/4] chore: gitignore go.work files

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 64c6d853dd..33cd516483 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 *.sqlog
 *.qlog.zst
 *.sqlog.zst
+go.work
+go.work.sum