diff --git a/pb/trace.pb.go b/pb/trace.pb.go
index 26b58c07a684057c32343b3d0c13e6ac8c7e3008..d9a86d0e2120823c0c127ea46c78c944cc5645db 100644
--- a/pb/trace.pb.go
+++ b/pb/trace.pb.go
@@ -454,6 +454,7 @@ func (m *TraceEvent_DuplicateMessage) GetTopic() string {
 type TraceEvent_DeliverMessage struct {
 	MessageID            []byte   `protobuf:"bytes,1,opt,name=messageID" json:"messageID,omitempty"`
 	Topic                *string  `protobuf:"bytes,2,opt,name=topic" json:"topic,omitempty"`
+	ReceivedFrom         []byte   `protobuf:"bytes,3,opt,name=receivedFrom" json:"receivedFrom,omitempty"`
 	XXX_NoUnkeyedLiteral struct{} `json:"-"`
 	XXX_unrecognized     []byte   `json:"-"`
 	XXX_sizecache        int32    `json:"-"`
@@ -506,6 +507,13 @@ func (m *TraceEvent_DeliverMessage) GetTopic() string {
 	return ""
 }
 
+func (m *TraceEvent_DeliverMessage) GetReceivedFrom() []byte {
+	if m != nil {
+		return m.ReceivedFrom
+	}
+	return nil
+}
+
 type TraceEvent_AddPeer struct {
 	PeerID               []byte   `protobuf:"bytes,1,opt,name=peerID" json:"peerID,omitempty"`
 	Proto                *string  `protobuf:"bytes,2,opt,name=proto" json:"proto,omitempty"`
@@ -1502,70 +1510,70 @@ func init() {
 func init() { proto.RegisterFile("trace.proto", fileDescriptor_0571941a1d628a80) }
 
 var fileDescriptor_0571941a1d628a80 = []byte{
-	// 993 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0xcf, 0x6e, 0xdb, 0x46,
-	0x10, 0xc6, 0x4b, 0x4b, 0xb2, 0xa4, 0x91, 0x2c, 0xb3, 0xdb, 0x24, 0x20, 0xd4, 0xc4, 0x50, 0xdd,
-	0x20, 0x10, 0x50, 0x40, 0x40, 0x0c, 0x14, 0x39, 0x34, 0x09, 0x2a, 0x8b, 0x8c, 0x2d, 0x43, 0xb6,
-	0x89, 0xb1, 0xec, 0x1e, 0x5d, 0x4a, 0xda, 0xc6, 0x34, 0x24, 0x92, 0x20, 0x57, 0x2a, 0x72, 0xea,
-	0xa9, 0x6f, 0xd5, 0x07, 0xc8, 0xad, 0x7d, 0x84, 0xc2, 0x4f, 0x52, 0xec, 0x2e, 0xff, 0xca, 0xa4,
-	0x92, 0x1a, 0xb9, 0x71, 0x56, 0xdf, 0x6f, 0x76, 0x66, 0x77, 0xbe, 0x85, 0xa0, 0xc1, 0x7c, 0x6b,
-	0x4a, 0x7b, 0x9e, 0xef, 0x32, 0x97, 0xd4, 0xbd, 0xe5, 0x24, 0x58, 0x4e, 0x7a, 0xde, 0x64, 0xff,
-	0xaf, 0x27, 0x00, 0x63, 0xfe, 0x93, 0xb1, 0xa2, 0x0e, 0x23, 0x3d, 0x28, 0xb3, 0x0f, 0x1e, 0xd5,
-	0x94, 0x8e, 0xd2, 0x6d, 0x1d, 0xb4, 0x7b, 0xb1, 0xb0, 0x97, 0x88, 0x7a, 0xe3, 0x0f, 0x1e, 0x45,
-	0xa1, 0x23, 0x4f, 0x60, 0xdb, 0xa3, 0xd4, 0x1f, 0xea, 0xda, 0x56, 0x47, 0xe9, 0x36, 0x31, 0x8c,
-	0xc8, 0x53, 0xa8, 0x33, 0x7b, 0x41, 0x03, 0x66, 0x2d, 0x3c, 0xad, 0xd4, 0x51, 0xba, 0x25, 0x4c,
-	0x16, 0xc8, 0x08, 0x5a, 0xde, 0x72, 0x32, 0xb7, 0x83, 0x9b, 0x53, 0x1a, 0x04, 0xd6, 0x7b, 0xaa,
-	0x95, 0x3b, 0x4a, 0xb7, 0x71, 0xf0, 0x3c, 0x7f, 0x3f, 0x33, 0xa3, 0xc5, 0x35, 0x96, 0x0c, 0x61,
-	0xc7, 0xa7, 0xb7, 0x74, 0xca, 0xa2, 0x64, 0x15, 0x91, 0xec, 0xfb, 0xfc, 0x64, 0x98, 0x96, 0x62,
-	0x96, 0x24, 0x08, 0xea, 0x6c, 0xe9, 0xcd, 0xed, 0xa9, 0xc5, 0x68, 0x94, 0x6d, 0x5b, 0x64, 0x7b,
-	0x91, 0x9f, 0x4d, 0x5f, 0x53, 0xe3, 0x3d, 0x9e, 0x37, 0x3b, 0xa3, 0x73, 0x7b, 0x45, 0xfd, 0x28,
-	0x63, 0x75, 0x53, 0xb3, 0x7a, 0x46, 0x8b, 0x6b, 0x2c, 0x79, 0x05, 0x55, 0x6b, 0x36, 0x33, 0x29,
-	0xf5, 0xb5, 0x9a, 0x48, 0xf3, 0x2c, 0x3f, 0x4d, 0x5f, 0x8a, 0x30, 0x52, 0x93, 0x9f, 0x01, 0x7c,
-	0xba, 0x70, 0x57, 0x54, 0xb0, 0x75, 0xc1, 0x76, 0x8a, 0x8e, 0x28, 0xd2, 0x61, 0x8a, 0xe1, 0x5b,
-	0xfb, 0x74, 0xba, 0x42, 0x73, 0xa0, 0xc1, 0xa6, 0xad, 0x51, 0x8a, 0x30, 0x52, 0x73, 0x30, 0xa0,
-	0xce, 0x8c, 0x83, 0x8d, 0x4d, 0xe0, 0x85, 0x14, 0x61, 0xa4, 0xe6, 0xe0, 0xcc, 0x77, 0x3d, 0x0e,
-	0x36, 0x37, 0x81, 0xba, 0x14, 0x61, 0xa4, 0xe6, 0x63, 0x7c, 0xeb, 0xda, 0x8e, 0xb6, 0x23, 0xa8,
-	0x82, 0x31, 0x3e, 0x71, 0x6d, 0x07, 0x85, 0x8e, 0xbc, 0x84, 0xca, 0x9c, 0x5a, 0x2b, 0xaa, 0xb5,
-	0x04, 0xf0, 0x6d, 0x3e, 0x30, 0xe2, 0x12, 0x94, 0x4a, 0x8e, 0xbc, 0xf7, 0xad, 0xdf, 0x98, 0xb6,
-	0xbb, 0x09, 0x39, 0xe2, 0x12, 0x94, 0x4a, 0x8e, 0x78, 0xfe, 0xd2, 0xa1, 0x9a, 0xba, 0x09, 0x31,
-	0xb9, 0x04, 0xa5, 0xb2, 0xad, 0x43, 0x2b, 0x3b, 0xfd, 0xdc, 0x59, 0x0b, 0xf9, 0x39, 0xd4, 0x85,
-	0x4d, 0x9b, 0x98, 0x2c, 0x90, 0x47, 0x50, 0x61, 0xae, 0x67, 0x4f, 0x85, 0x1d, 0xeb, 0x28, 0x83,
-	0xf6, 0x1f, 0xb0, 0x93, 0x19, 0xfb, 0x4f, 0x24, 0xd9, 0x87, 0xa6, 0x4f, 0xa7, 0xd4, 0x5e, 0xd1,
-	0xd9, 0x3b, 0xdf, 0x5d, 0x84, 0xd6, 0xce, 0xac, 0x71, 0xe3, 0xfb, 0xd4, 0x0a, 0x5c, 0x47, 0xb8,
-	0xbb, 0x8e, 0x61, 0x94, 0x14, 0x50, 0x4e, 0x17, 0x70, 0x0b, 0xea, 0xba, 0x53, 0xbe, 0x40, 0x0d,
-	0xf1, 0x5e, 0xa5, 0xf4, 0x5e, 0x3a, 0xb4, 0xb2, 0x1e, 0x7a, 0xd0, 0x91, 0xbd, 0x82, 0x6a, 0x68,
-	0xa1, 0xd4, 0x1b, 0xa7, 0x64, 0xde, 0xb8, 0x47, 0xfc, 0x3a, 0x5d, 0xe6, 0x46, 0xa0, 0x08, 0xda,
-	0xcf, 0x01, 0x12, 0xff, 0x14, 0xb1, 0xed, 0x5f, 0xa1, 0x1a, 0xda, 0xe4, 0x5e, 0xa7, 0x4a, 0x4e,
-	0xa7, 0x2f, 0xa1, 0xbc, 0xa0, 0xcc, 0x12, 0x3b, 0x15, 0xfb, 0xce, 0x1c, 0x9c, 0x52, 0x66, 0xa1,
-	0x90, 0xb6, 0xc7, 0x50, 0x0d, 0xfd, 0xc4, 0x8b, 0xe0, 0x8e, 0x1a, 0xbb, 0x51, 0x11, 0x32, 0x7a,
-	0x60, 0xd6, 0xd0, 0x6c, 0x5f, 0x32, 0xeb, 0x53, 0x28, 0x73, 0x33, 0x26, 0x57, 0xa1, 0xa4, 0xaf,
-	0xe2, 0x19, 0x54, 0x84, 0xf3, 0x0a, 0x6e, 0xea, 0x47, 0xa8, 0x08, 0x97, 0x6d, 0xba, 0xa7, 0x7c,
-	0x4c, 0x38, 0xed, 0x7f, 0x62, 0x1f, 0x15, 0xa8, 0x86, 0xc5, 0x93, 0x37, 0x50, 0x0b, 0xc7, 0x28,
-	0xd0, 0x94, 0x4e, 0xa9, 0xdb, 0x38, 0xf8, 0x2e, 0xbf, 0xdb, 0x70, 0x10, 0x45, 0xc7, 0x31, 0x42,
-	0xfa, 0xd0, 0x0c, 0x96, 0x93, 0x60, 0xea, 0xdb, 0x1e, 0xb3, 0x5d, 0x47, 0xdb, 0x12, 0x29, 0x8a,
-	0xde, 0xc6, 0xe5, 0x44, 0xe0, 0x19, 0x84, 0xfc, 0x04, 0xd5, 0xa9, 0xeb, 0x30, 0xdf, 0x9d, 0x0b,
-	0x0f, 0x14, 0x16, 0x30, 0x90, 0x22, 0x91, 0x21, 0x22, 0xda, 0x7d, 0x68, 0xa4, 0x0a, 0x7b, 0x90,
-	0x4b, 0xde, 0x40, 0x35, 0x2c, 0x8c, 0xe3, 0x61, 0x69, 0x13, 0xf9, 0xf7, 0xa1, 0x86, 0xc9, 0x42,
-	0x01, 0xfe, 0xe7, 0x16, 0x34, 0x52, 0xa5, 0x91, 0xd7, 0x50, 0xb1, 0x6f, 0xf8, 0x33, 0x2c, 0x4f,
-	0xf3, 0xc5, 0xc6, 0x66, 0x86, 0xc7, 0xd6, 0x4a, 0x1e, 0xa9, 0x84, 0x04, 0xfd, 0xbb, 0xe5, 0xb0,
-	0xf0, 0x20, 0x3f, 0x41, 0xff, 0x62, 0x39, 0x2c, 0xa4, 0x39, 0xc4, 0x69, 0xf9, 0x9e, 0x97, 0x3e,
-	0x83, 0x16, 0x03, 0x27, 0x69, 0xf9, 0xb4, 0xbf, 0x8e, 0x9e, 0xf6, 0xf2, 0x67, 0xd0, 0x62, 0xee,
-	0x24, 0x2d, 0x5f, 0xf9, 0x63, 0x50, 0xd7, 0x9b, 0xca, 0xf7, 0x02, 0xd9, 0x03, 0x88, 0xef, 0x24,
-	0x10, 0x8d, 0x36, 0x31, 0xb5, 0xd2, 0x3e, 0x48, 0x32, 0x45, 0x0d, 0xae, 0x31, 0xca, 0x3d, 0xa6,
-	0x1b, 0x33, 0x71, 0x5b, 0x05, 0x4e, 0x7c, 0x1b, 0x2b, 0xe3, 0x16, 0x0a, 0xea, 0xe4, 0x6f, 0x23,
-	0xa5, 0x7e, 0x54, 0xa2, 0x0c, 0xf6, 0xff, 0x56, 0xa0, 0xcc, 0xff, 0x3c, 0x92, 0x6f, 0x60, 0xd7,
-	0xbc, 0x3c, 0x1c, 0x0d, 0x2f, 0x8e, 0xaf, 0x4f, 0x8d, 0x8b, 0x8b, 0xfe, 0x91, 0xa1, 0x7e, 0x45,
-	0x08, 0xb4, 0xd0, 0x38, 0x31, 0x06, 0xe3, 0x78, 0x4d, 0x21, 0x8f, 0xe1, 0x6b, 0xfd, 0xd2, 0x1c,
-	0x0d, 0x07, 0xfd, 0xb1, 0x11, 0x2f, 0x6f, 0x71, 0x5e, 0x37, 0x46, 0xc3, 0x2b, 0x03, 0xe3, 0xc5,
-	0x12, 0x69, 0x42, 0xad, 0xaf, 0xeb, 0xd7, 0xa6, 0x61, 0xa0, 0x5a, 0x26, 0xbb, 0xd0, 0x40, 0xe3,
-	0xf4, 0xfc, 0xca, 0x90, 0x0b, 0x15, 0xfe, 0x33, 0x1a, 0x83, 0xab, 0x6b, 0x34, 0x07, 0xea, 0x36,
-	0x8f, 0x2e, 0x8c, 0x33, 0x5d, 0x44, 0x55, 0x1e, 0xe9, 0x78, 0x6e, 0x8a, 0xa8, 0x46, 0x6a, 0x50,
-	0x3e, 0x39, 0x1f, 0x9e, 0xa9, 0x75, 0x52, 0x87, 0xca, 0xc8, 0xe8, 0x5f, 0x19, 0x2a, 0xf0, 0xcf,
-	0x23, 0xec, 0xbf, 0x1b, 0xab, 0x0d, 0xfe, 0x69, 0xe2, 0xe5, 0x99, 0xa1, 0x36, 0xf7, 0xdf, 0xc2,
-	0x6e, 0x72, 0xbf, 0x87, 0x16, 0x9b, 0xde, 0x90, 0x1f, 0xa0, 0x32, 0xe1, 0x1f, 0xe1, 0x10, 0x3f,
-	0xce, 0x1d, 0x05, 0x94, 0x9a, 0xc3, 0xe6, 0xc7, 0xbb, 0x3d, 0xe5, 0x9f, 0xbb, 0x3d, 0xe5, 0xdf,
-	0xbb, 0x3d, 0xe5, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x92, 0xe3, 0x70, 0x55, 0xa5, 0x0b, 0x00,
-	0x00,
+	// 999 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x96, 0x51, 0x6f, 0xda, 0x56,
+	0x14, 0xc7, 0xe7, 0x00, 0x01, 0x0e, 0x84, 0x78, 0x77, 0x6d, 0x65, 0xb1, 0x36, 0x62, 0x59, 0x55,
+	0x21, 0x4d, 0x42, 0x6a, 0xa4, 0xa9, 0x0f, 0x6b, 0xab, 0x11, 0xec, 0x26, 0x44, 0x24, 0xb1, 0x0e,
+	0x24, 0x7b, 0xcc, 0x0c, 0xdc, 0x35, 0x8e, 0xc0, 0xb6, 0xec, 0x0b, 0x53, 0x9f, 0xf6, 0xb4, 0xef,
+	0xd6, 0xb7, 0xed, 0x23, 0x54, 0xf9, 0x24, 0xd3, 0xbd, 0xd7, 0x36, 0x36, 0xd8, 0xb4, 0x8b, 0xfa,
+	0xe6, 0x73, 0xf3, 0xff, 0x9d, 0x7b, 0xce, 0xbd, 0xe7, 0x7f, 0x03, 0xd4, 0x98, 0x6f, 0x4d, 0x68,
+	0xc7, 0xf3, 0x5d, 0xe6, 0x92, 0xaa, 0xb7, 0x18, 0x07, 0x8b, 0x71, 0xc7, 0x1b, 0x1f, 0x7e, 0x7a,
+	0x02, 0x30, 0xe2, 0x7f, 0x32, 0x96, 0xd4, 0x61, 0xa4, 0x03, 0x45, 0xf6, 0xc1, 0xa3, 0x9a, 0xd2,
+	0x52, 0xda, 0x8d, 0xa3, 0x66, 0x27, 0x16, 0x76, 0x56, 0xa2, 0xce, 0xe8, 0x83, 0x47, 0x51, 0xe8,
+	0xc8, 0x13, 0xd8, 0xf5, 0x28, 0xf5, 0xfb, 0xba, 0xb6, 0xd3, 0x52, 0xda, 0x75, 0x0c, 0x23, 0xf2,
+	0x14, 0xaa, 0xcc, 0x9e, 0xd3, 0x80, 0x59, 0x73, 0x4f, 0x2b, 0xb4, 0x94, 0x76, 0x01, 0x57, 0x0b,
+	0x64, 0x00, 0x0d, 0x6f, 0x31, 0x9e, 0xd9, 0xc1, 0xed, 0x39, 0x0d, 0x02, 0xeb, 0x3d, 0xd5, 0x8a,
+	0x2d, 0xa5, 0x5d, 0x3b, 0x7a, 0x9e, 0xbd, 0x9f, 0x99, 0xd2, 0xe2, 0x1a, 0x4b, 0xfa, 0xb0, 0xe7,
+	0xd3, 0x3b, 0x3a, 0x61, 0x51, 0xb2, 0x92, 0x48, 0xf6, 0x63, 0x76, 0x32, 0x4c, 0x4a, 0x31, 0x4d,
+	0x12, 0x04, 0x75, 0xba, 0xf0, 0x66, 0xf6, 0xc4, 0x62, 0x34, 0xca, 0xb6, 0x2b, 0xb2, 0xbd, 0xc8,
+	0xce, 0xa6, 0xaf, 0xa9, 0x71, 0x83, 0xe7, 0xcd, 0x4e, 0xe9, 0xcc, 0x5e, 0x52, 0x3f, 0xca, 0x58,
+	0xde, 0xd6, 0xac, 0x9e, 0xd2, 0xe2, 0x1a, 0x4b, 0x5e, 0x41, 0xd9, 0x9a, 0x4e, 0x4d, 0x4a, 0x7d,
+	0xad, 0x22, 0xd2, 0x3c, 0xcb, 0x4e, 0xd3, 0x95, 0x22, 0x8c, 0xd4, 0xe4, 0x57, 0x00, 0x9f, 0xce,
+	0xdd, 0x25, 0x15, 0x6c, 0x55, 0xb0, 0xad, 0xbc, 0x23, 0x8a, 0x74, 0x98, 0x60, 0xf8, 0xd6, 0x3e,
+	0x9d, 0x2c, 0xd1, 0xec, 0x69, 0xb0, 0x6d, 0x6b, 0x94, 0x22, 0x8c, 0xd4, 0x1c, 0x0c, 0xa8, 0x33,
+	0xe5, 0x60, 0x6d, 0x1b, 0x38, 0x94, 0x22, 0x8c, 0xd4, 0x1c, 0x9c, 0xfa, 0xae, 0xc7, 0xc1, 0xfa,
+	0x36, 0x50, 0x97, 0x22, 0x8c, 0xd4, 0x7c, 0x8c, 0xef, 0x5c, 0xdb, 0xd1, 0xf6, 0x04, 0x95, 0x33,
+	0xc6, 0x67, 0xae, 0xed, 0xa0, 0xd0, 0x91, 0x97, 0x50, 0x9a, 0x51, 0x6b, 0x49, 0xb5, 0x86, 0x00,
+	0xbe, 0xcf, 0x06, 0x06, 0x5c, 0x82, 0x52, 0xc9, 0x91, 0xf7, 0xbe, 0xf5, 0x07, 0xd3, 0xf6, 0xb7,
+	0x21, 0x27, 0x5c, 0x82, 0x52, 0xc9, 0x11, 0xcf, 0x5f, 0x38, 0x54, 0x53, 0xb7, 0x21, 0x26, 0x97,
+	0xa0, 0x54, 0x36, 0x75, 0x68, 0xa4, 0xa7, 0x9f, 0x3b, 0x6b, 0x2e, 0x3f, 0xfb, 0xba, 0xb0, 0x69,
+	0x1d, 0x57, 0x0b, 0xe4, 0x11, 0x94, 0x98, 0xeb, 0xd9, 0x13, 0x61, 0xc7, 0x2a, 0xca, 0xa0, 0xf9,
+	0x17, 0xec, 0xa5, 0xc6, 0xfe, 0x33, 0x49, 0x0e, 0xa1, 0xee, 0xd3, 0x09, 0xb5, 0x97, 0x74, 0xfa,
+	0xce, 0x77, 0xe7, 0xa1, 0xb5, 0x53, 0x6b, 0xdc, 0xf8, 0x3e, 0xb5, 0x02, 0xd7, 0x11, 0xee, 0xae,
+	0x62, 0x18, 0xad, 0x0a, 0x28, 0x26, 0x0b, 0xb8, 0x03, 0x75, 0xdd, 0x29, 0x5f, 0xa1, 0x86, 0x78,
+	0xaf, 0x42, 0x72, 0xaf, 0x5b, 0x68, 0xa4, 0x3d, 0xf4, 0x90, 0x23, 0xdb, 0xd8, 0xbf, 0xb0, 0xb9,
+	0x7f, 0xf3, 0x15, 0x94, 0x43, 0x9b, 0x25, 0xde, 0x41, 0x25, 0xf5, 0x0e, 0x3e, 0xe2, 0x57, 0xee,
+	0x32, 0x37, 0x4a, 0x2e, 0x82, 0xe6, 0x73, 0x80, 0x95, 0xc7, 0xf2, 0xd8, 0xe6, 0xef, 0x50, 0x0e,
+	0xad, 0xb4, 0x51, 0x8d, 0x92, 0x71, 0x1a, 0x2f, 0xa1, 0x38, 0xa7, 0xcc, 0x12, 0x3b, 0xe5, 0x7b,
+	0xd3, 0xec, 0x9d, 0x53, 0x66, 0xa1, 0x90, 0x36, 0x47, 0x50, 0x0e, 0x3d, 0xc7, 0x8b, 0xe0, 0xae,
+	0x1b, 0xb9, 0x51, 0x11, 0x32, 0x7a, 0x60, 0xd6, 0xd0, 0x90, 0x5f, 0x33, 0xeb, 0x53, 0x28, 0x72,
+	0xc3, 0xae, 0xae, 0x4b, 0x49, 0x5e, 0xfa, 0x33, 0x28, 0x09, 0x77, 0xe6, 0x18, 0xe0, 0x67, 0x28,
+	0x09, 0x27, 0x6e, 0xbb, 0xa7, 0x6c, 0x4c, 0xb8, 0xf1, 0x7f, 0x62, 0x1f, 0x15, 0x28, 0x87, 0xc5,
+	0x93, 0x37, 0x50, 0x09, 0x47, 0x2d, 0xd0, 0x94, 0x56, 0xa1, 0x5d, 0x3b, 0xfa, 0x21, 0xbb, 0xdb,
+	0x70, 0x58, 0x45, 0xc7, 0x31, 0x42, 0xba, 0x50, 0x0f, 0x16, 0xe3, 0x60, 0xe2, 0xdb, 0x1e, 0xb3,
+	0x5d, 0x47, 0xdb, 0x11, 0x29, 0xf2, 0xde, 0xcf, 0xc5, 0x58, 0xe0, 0x29, 0x84, 0xfc, 0x02, 0xe5,
+	0x89, 0xeb, 0x30, 0xdf, 0x9d, 0x89, 0x21, 0xce, 0x2d, 0xa0, 0x27, 0x45, 0x22, 0x43, 0x44, 0x34,
+	0xbb, 0x50, 0x4b, 0x14, 0xf6, 0xa0, 0xc7, 0xe7, 0x0d, 0x94, 0xc3, 0xc2, 0x38, 0x1e, 0x96, 0x36,
+	0x96, 0x3f, 0x31, 0x2a, 0xb8, 0x5a, 0xc8, 0xc1, 0xff, 0xde, 0x81, 0x5a, 0xa2, 0x34, 0xf2, 0x1a,
+	0x4a, 0xf6, 0x2d, 0x7f, 0xaa, 0xe5, 0x69, 0xbe, 0xd8, 0xda, 0x4c, 0xff, 0xd4, 0x5a, 0xca, 0x23,
+	0x95, 0x90, 0xa0, 0xff, 0xb4, 0x1c, 0x16, 0x1e, 0xe4, 0x67, 0xe8, 0xdf, 0x2c, 0x87, 0x85, 0x34,
+	0x87, 0x38, 0x2d, 0xdf, 0xfc, 0xc2, 0x17, 0xd0, 0x62, 0xe0, 0x24, 0x2d, 0x9f, 0xff, 0xd7, 0xd1,
+	0xf3, 0x5f, 0xfc, 0x02, 0x5a, 0xcc, 0x9d, 0xa4, 0xe5, 0x7f, 0x82, 0x53, 0x50, 0xd7, 0x9b, 0xca,
+	0xf6, 0x02, 0x39, 0x00, 0x88, 0xef, 0x24, 0x10, 0x8d, 0xd6, 0x31, 0xb1, 0xd2, 0x3c, 0x5a, 0x65,
+	0x8a, 0x1a, 0x5c, 0x63, 0x94, 0x0d, 0xa6, 0x1d, 0x33, 0x71, 0x5b, 0x39, 0x4e, 0x7c, 0x1b, 0x2b,
+	0xe3, 0x16, 0x72, 0xea, 0xe4, 0x6f, 0x23, 0xa5, 0x7e, 0x54, 0xa2, 0x0c, 0x0e, 0xff, 0x51, 0xa0,
+	0xc8, 0x7f, 0x60, 0x92, 0xef, 0x60, 0xdf, 0xbc, 0x3a, 0x1e, 0xf4, 0x87, 0xa7, 0x37, 0xe7, 0xc6,
+	0x70, 0xd8, 0x3d, 0x31, 0xd4, 0x6f, 0x08, 0x81, 0x06, 0x1a, 0x67, 0x46, 0x6f, 0x14, 0xaf, 0x29,
+	0xe4, 0x31, 0x7c, 0xab, 0x5f, 0x99, 0x83, 0x7e, 0xaf, 0x3b, 0x32, 0xe2, 0xe5, 0x1d, 0xce, 0xeb,
+	0xc6, 0xa0, 0x7f, 0x6d, 0x60, 0xbc, 0x58, 0x20, 0x75, 0xa8, 0x74, 0x75, 0xfd, 0xc6, 0x34, 0x0c,
+	0x54, 0x8b, 0x64, 0x1f, 0x6a, 0x68, 0x9c, 0x5f, 0x5e, 0x1b, 0x72, 0xa1, 0xc4, 0xff, 0x8c, 0x46,
+	0xef, 0xfa, 0x06, 0xcd, 0x9e, 0xba, 0xcb, 0xa3, 0xa1, 0x71, 0xa1, 0x8b, 0xa8, 0xcc, 0x23, 0x1d,
+	0x2f, 0x4d, 0x11, 0x55, 0x48, 0x05, 0x8a, 0x67, 0x97, 0xfd, 0x0b, 0xb5, 0x4a, 0xaa, 0x50, 0x1a,
+	0x18, 0xdd, 0x6b, 0x43, 0x05, 0xfe, 0x79, 0x82, 0xdd, 0x77, 0x23, 0xb5, 0xc6, 0x3f, 0x4d, 0xbc,
+	0xba, 0x30, 0xd4, 0xfa, 0xe1, 0x5b, 0xd8, 0x5f, 0xdd, 0xef, 0xb1, 0xc5, 0x26, 0xb7, 0xe4, 0x27,
+	0x28, 0x8d, 0xf9, 0x47, 0x38, 0xc4, 0x8f, 0x33, 0x47, 0x01, 0xa5, 0xe6, 0xb8, 0xfe, 0xf1, 0xfe,
+	0x40, 0xf9, 0xf7, 0xfe, 0x40, 0xf9, 0x74, 0x7f, 0xa0, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0xdb,
+	0x3a, 0x1c, 0xe4, 0xc9, 0x0b, 0x00, 0x00,
 }
 
 func (m *TraceEvent) Marshal() (dAtA []byte, err error) {
@@ -1938,6 +1946,13 @@ func (m *TraceEvent_DeliverMessage) MarshalToSizedBuffer(dAtA []byte) (int, erro
 		i -= len(m.XXX_unrecognized)
 		copy(dAtA[i:], m.XXX_unrecognized)
 	}
+	if m.ReceivedFrom != nil {
+		i -= len(m.ReceivedFrom)
+		copy(dAtA[i:], m.ReceivedFrom)
+		i = encodeVarintTrace(dAtA, i, uint64(len(m.ReceivedFrom)))
+		i--
+		dAtA[i] = 0x1a
+	}
 	if m.Topic != nil {
 		i -= len(*m.Topic)
 		copy(dAtA[i:], *m.Topic)
@@ -2921,6 +2936,10 @@ func (m *TraceEvent_DeliverMessage) Size() (n int) {
 		l = len(*m.Topic)
 		n += 1 + l + sovTrace(uint64(l))
 	}
+	if m.ReceivedFrom != nil {
+		l = len(m.ReceivedFrom)
+		n += 1 + l + sovTrace(uint64(l))
+	}
 	if m.XXX_unrecognized != nil {
 		n += len(m.XXX_unrecognized)
 	}
@@ -4456,6 +4475,40 @@ func (m *TraceEvent_DeliverMessage) Unmarshal(dAtA []byte) error {
 			s := string(dAtA[iNdEx:postIndex])
 			m.Topic = &s
 			iNdEx = postIndex
+		case 3:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ReceivedFrom", wireType)
+			}
+			var byteLen int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowTrace
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				byteLen |= int(b&0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			if byteLen < 0 {
+				return ErrInvalidLengthTrace
+			}
+			postIndex := iNdEx + byteLen
+			if postIndex < 0 {
+				return ErrInvalidLengthTrace
+			}
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ReceivedFrom = append(m.ReceivedFrom[:0], dAtA[iNdEx:postIndex]...)
+			if m.ReceivedFrom == nil {
+				m.ReceivedFrom = []byte{}
+			}
+			iNdEx = postIndex
 		default:
 			iNdEx = preIndex
 			skippy, err := skipTrace(dAtA[iNdEx:])
diff --git a/pb/trace.proto b/pb/trace.proto
index d1aaef9095d9ed998216d9ef9bff2b997d429c4d..7f834020cc3f0158a15f8c9197edc4f1a0c47ea2 100644
--- a/pb/trace.proto
+++ b/pb/trace.proto
@@ -58,6 +58,7 @@ message TraceEvent {
   message DeliverMessage {
     optional bytes messageID = 1;
     optional string topic = 2;
+    optional bytes receivedFrom = 3;
   }
 
   message AddPeer {