chore: remove RekeyCompatibility

It is safe to remove now. It improves how community encryption keys
are distributed.

Author: osmaczko

messaging/api.go

@@ -17,7 +17,6 @@ import (
 
 	"github.com/status-im/status-go/connection"
 	"github.com/status-im/status-go/messaging/adapters"
-	"github.com/status-im/status-go/messaging/common"
 	"github.com/status-im/status-go/messaging/layers/encryption"
 	"github.com/status-im/status-go/messaging/layers/transport"
 	"github.com/status-im/status-go/messaging/types"
@@ -469,10 +468,6 @@ func CommunityShardInfoTopicPrefix() string {
 	return transport.CommunityShardInfoTopicPrefix()
 }
 
-func SetRekeyCompatibility(compatibility bool) {
-	common.RekeyCompatibility = compatibility
-}
-
 func GenerateInstallationID() string {
 	return uuid.New().String()
 }

messaging/common/message_sender.go

@@ -37,10 +37,6 @@ const (
 	maxMessageSenderEphemeralKeys = 3
 )
 
-// RekeyCompatibility indicates whether we should be sending
-// keys in 1-to-1 messages as well as in the newer format
-var RekeyCompatibility = true
-
 type MessageSender struct {
 	identity    *ecdsa.PrivateKey
 	transport   *transport.Transport
@@ -299,10 +295,8 @@ func (s *MessageSender) sendCommunity(
 	// Check if it's a key exchange message. In this case we send it
 	// to all the recipients
 	if rawMessage.CommunityKeyExMsgType != messagingtypes.KeyExMsgNone {
-		// If rekeycompatibility is on, we always
-		// want to execute below, otherwise we execute
-		// only when we want to fill up old keys to a given user
-		if RekeyCompatibility || !forceRekey {
+		// we want to fill up old keys to a given user
+		if !forceRekey {
 			keyExMessageSpecs, err := s.protocol.GetKeyExMessageSpecs(rawMessage.HashRatchetGroupID, s.identity, rawMessage.Recipients, forceRekey)
 			if err != nil {
 				return nil, err
@@ -526,18 +520,8 @@ func (s *MessageSender) dispatchCommunityChatMessage(ctx context.Context, rawMes
 	payload := wrappedMessage
 	var err error
 	if rekey && len(rawMessage.HashRatchetGroupID) != 0 {
-
-		var ratchet *encryption.HashRatchetKeyCompatibility
-		// We have just rekeyed, pull the latest
-		if RekeyCompatibility {
-			ratchet, err = s.protocol.GetCurrentKeyForGroup(rawMessage.HashRatchetGroupID)
-			if err != nil {
-				return nil, nil, err
-			}
-
-		}
 		// We send the message over the community topic
-		spec, err := s.protocol.BuildHashRatchetReKeyGroupMessage(s.identity, rawMessage.Recipients, rawMessage.HashRatchetGroupID, wrappedMessage, ratchet)
+		spec, err := s.protocol.BuildHashRatchetReKeyGroupMessage(s.identity, rawMessage.Recipients, rawMessage.HashRatchetGroupID, wrappedMessage, nil)
 		if err != nil {
 			return nil, nil, err
 		}
@@ -969,24 +953,8 @@ func (s *MessageSender) sendPrivateRawMessage(ctx context.Context, rawMessage *m
 func (s *MessageSender) dispatchCommunityMessage(ctx context.Context, publicKey *ecdsa.PublicKey, wrappedMessage []byte, pubsubTopic string, rekey bool, rawMessage *messagingtypes.RawMessage) ([][]byte, []*wakutypes.NewMessage, error) {
 	payload := wrappedMessage
 	if rekey && len(rawMessage.HashRatchetGroupID) != 0 {
-
-		var ratchet *encryption.HashRatchetKeyCompatibility
-		var err error
-		// We have just rekeyed, pull the latest
-		if RekeyCompatibility {
-			ratchet, err = s.protocol.GetCurrentKeyForGroup(rawMessage.HashRatchetGroupID)
-			if err != nil {
-				return nil, nil, err
-			}
-
-		}
-		keyID, err := ratchet.GetKeyID()
-		if err != nil {
-			return nil, nil, err
-		}
-		s.logger.Debug("adding key id to message", zap.String("keyid", cryptotypes.Bytes2Hex(keyID)))
 		// We send the message over the community topic
-		spec, err := s.protocol.BuildHashRatchetReKeyGroupMessage(s.identity, rawMessage.Recipients, rawMessage.HashRatchetGroupID, wrappedMessage, ratchet)
+		spec, err := s.protocol.BuildHashRatchetReKeyGroupMessage(s.identity, rawMessage.Recipients, rawMessage.HashRatchetGroupID, wrappedMessage, nil)
 		if err != nil {
 			return nil, nil, err
 		}

protocol/communities_messenger_test.go

@@ -3880,109 +3880,6 @@ func (s *MessengerCommunitiesSuite) TestCommunityRekeyAfterBan() {
 	s.Require().NoError(err)
 }
 
-func (s *MessengerCommunitiesSuite) TestCommunityRekeyAfterBanDisableCompatibility() {
-	messaging.SetRekeyCompatibility(false)
-	s.owner.communitiesManager.RekeyInterval = 500 * time.Minute
-
-	// Create a new community
-	response, err := s.owner.CreateCommunity(
-		&requests.CreateCommunity{
-			Membership:  protobuf.CommunityPermissions_AUTO_ACCEPT,
-			Name:        "status",
-			Color:       "#57a7e5",
-			Description: "status community description",
-		},
-		true,
-	)
-	s.Require().NoError(err)
-	s.Require().NotNil(response)
-	s.Require().Len(response.Communities(), 1)
-
-	// Check community is present in the DB and has default values we care about
-	c, err := s.owner.GetCommunityByID(response.Communities()[0].ID())
-	s.Require().NoError(err)
-	s.Require().False(c.Encrypted())
-	// TODO some check that there are no keys for the community. Alt for s.Require().Zero(c.RekeyedAt().Unix())
-
-	_, err = s.owner.CreateCommunityTokenPermission(&requests.CreateCommunityTokenPermission{
-		CommunityID: c.ID(),
-		Type:        protobuf.CommunityTokenPermission_BECOME_MEMBER,
-		TokenCriteria: []*protobuf.TokenCriteria{{
-			ContractAddresses: map[uint64]string{3: "0x933"},
-			Type:              protobuf.CommunityTokenType_ERC20,
-			Symbol:            "STT",
-			Name:              "Status Test Token",
-			AmountInWei:       "10000000000000000000",
-			Decimals:          18,
-		}},
-	})
-	s.Require().NoError(err)
-
-	c, err = s.owner.GetCommunityByID(c.ID())
-	s.Require().NoError(err)
-	s.Require().True(c.Encrypted())
-
-	s.advertiseCommunityTo(c, s.owner, s.bob)
-	s.advertiseCommunityTo(c, s.owner, s.alice)
-
-	s.mockPermissionCheckerForAllMessenger()
-
-	s.joinCommunity(c, s.owner, s.bob)
-	s.joinCommunity(c, s.owner, s.alice)
-
-	// Check the Alice and Bob are members of the community
-	c, err = s.owner.GetCommunityByID(c.ID())
-	s.Require().NoError(err)
-	s.Require().True(c.HasMember(&s.alice.identity.PublicKey))
-	s.Require().True(c.HasMember(&s.bob.identity.PublicKey))
-
-	// Make sure at least one key makes it to alice
-	response, err = WaitOnMessengerResponse(s.alice,
-		func(r *MessengerResponse) bool {
-			keysCount, err := messaging.TestUtils{API: s.alice.messaging}.GetKeysForGroupCount(response.Communities()[0].ID())
-			if err != nil || keysCount != 1 {
-				return false
-			}
-			return true
-
-		},
-		"alice does not have enough keys",
-	)
-	s.Require().NoError(err)
-
-	response, err = s.owner.BanUserFromCommunity(context.Background(), &requests.BanUserFromCommunity{
-		CommunityID: c.ID(),
-		User:        crypto.PubkeyToHexBytes(&s.bob.identity.PublicKey),
-	})
-	s.Require().NoError(err)
-	s.Require().Len(response.Communities(), 1)
-
-	s.Require().False(response.Communities()[0].HasMember(&s.bob.identity.PublicKey))
-
-	// Check bob has been banned
-	response, err = WaitOnMessengerResponse(s.alice,
-		func(r *MessengerResponse) bool {
-			return len(r.Communities()) == 1 && !r.Communities()[0].HasMember(&s.bob.identity.PublicKey)
-
-		},
-		"alice didn't receive updated description",
-	)
-	s.Require().NoError(err)
-
-	response, err = WaitOnMessengerResponse(s.alice,
-		func(r *MessengerResponse) bool {
-			keysCount, err := messaging.TestUtils{API: s.alice.messaging}.GetKeysForGroupCount(response.Communities()[0].ID())
-			if err != nil || keysCount < 2 {
-				return false
-			}
-			return true
-
-		},
-		"alice hasn't received updated key",
-	)
-	s.Require().NoError(err)
-}
-
 func (s *MessengerCommunitiesSuite) TestRetrieveBigCommunity() {
 	bigEmoji := make([]byte, 4*1024*1024) // 4 MB
 	description := &requests.CreateCommunity{