diff --git a/VERSION b/VERSION index a70fe659e..d15acbbe9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.23.0-beta.6 +0.23.0-beta.7 diff --git a/services/shhext/chat/encryption.go b/services/shhext/chat/encryption.go index 0e38fc3f4..483ce7443 100644 --- a/services/shhext/chat/encryption.go +++ b/services/shhext/chat/encryption.go @@ -114,7 +114,7 @@ func (s *EncryptionService) ConfirmMessagesProcessed(messageIDs [][]byte) error id := confirmationIDString(idByte) confirmationData, ok := s.messageIDs[id] if !ok { - s.log.Warn("Could not confirm message", "messageID", id) + s.log.Debug("Could not confirm message", "messageID", id) continue } diff --git a/services/shhext/chat/encryption_test.go b/services/shhext/chat/encryption_test.go index 96c047685..2f84b49c3 100644 --- a/services/shhext/chat/encryption_test.go +++ b/services/shhext/chat/encryption_test.go @@ -858,6 +858,10 @@ func (s *EncryptionServiceTestSuite) TestRefreshedBundle() { s.NotNil(x3dhHeader1) s.Equal(bobBundle1.GetSignedPreKeys()[bobInstallationID].GetSignedPreKey(), x3dhHeader1.GetId()) + // Bob decrypts the message + _, err = s.bob.DecryptPayload(bobKey, &aliceKey.PublicKey, aliceInstallationID, encryptionResponse1, defaultMessageID) + s.Require().NoError(err) + // We add the second bob bundle _, err = s.alice.ProcessPublicBundle(aliceKey, bobBundle2) s.Require().NoError(err) @@ -875,6 +879,9 @@ func (s *EncryptionServiceTestSuite) TestRefreshedBundle() { s.NotNil(x3dhHeader2) s.Equal(bobBundle2.GetSignedPreKeys()[bobInstallationID].GetSignedPreKey(), x3dhHeader2.GetId()) + // Bob decrypts the message + _, err = s.bob.DecryptPayload(bobKey, &aliceKey.PublicKey, aliceInstallationID, encryptionResponse2, defaultMessageID) + s.Require().NoError(err) } func (s *EncryptionServiceTestSuite) TestMessageConfirmation() { diff --git a/services/shhext/chat/sql_lite_persistence.go b/services/shhext/chat/sql_lite_persistence.go index 2345df4d3..5bcc6ab82 100644 --- a/services/shhext/chat/sql_lite_persistence.go +++ b/services/shhext/chat/sql_lite_persistence.go @@ -465,7 +465,7 @@ func (s *SQLLitePersistence) GetAnyPrivateBundle(myIdentityKey []byte, installat func (s *SQLLitePersistence) GetPrivateKeyBundle(bundleID []byte) ([]byte, error) { stmt, err := s.db.Prepare(`SELECT private_key FROM bundles - WHERE expired = 0 AND signed_pre_key = ? LIMIT 1`) + WHERE signed_pre_key = ? LIMIT 1`) if err != nil { return nil, err }