Merge branch 'bugfix/2277' into sebin/task/#2284-upgrade-cypress-to-t…

…he-latest-ricardo

frontend/controller/actions/group.js

@@ -896,7 +896,23 @@ export default (sbp('sbp/selectors/register', {
       sbp('okTurtles.events/emit', REPLACE_MODAL, 'IncomeDetails')
     }
   },
-  ...encryptedAction('gi.actions/group/leaveChatRoom', L('Failed to leave chat channel.')),
+  ...encryptedAction('gi.actions/group/leaveChatRoom', L('Failed to leave chat channel.'), async (sendMessage, params) => {
+    const state = await sbp('chelonia/contract/state', params.contractID)
+    const memberID = params.data.memberID || sbp('chelonia/rootState').loggedIn.identityContractID
+    const joinedHeight = state.chatRooms[params.data.chatRoomID].members[memberID].joinedHeight
+
+    // For more efficient and correct processing, augment the leaveChatRoom
+    // action with the height of the join action. This helps prevent reduce
+    // the logic running as side-effects when syncing contracts from scratch
+    // by only considering the most recent join/leave events.
+    await sendMessage({
+      ...params,
+      data: {
+        ...params.data,
+        joinedHeight
+      }
+    })
+  }),
   ...encryptedAction('gi.actions/group/deleteChatRoom', L('Failed to delete chat channel.')),
   ...encryptedAction('gi.actions/group/invite', L('Failed to create invite.')),
   ...encryptedAction('gi.actions/group/inviteAccept', L('Failed to accept invite.'), async function (sendMessage, params) {
@@ -1014,6 +1030,7 @@ export default (sbp('sbp/selectors/register', {
   ...encryptedAction('gi.actions/group/updateSettings', L('Failed to update group settings.')),
   ...encryptedAction('gi.actions/group/updateAllVotingRules', (params, e) => L('Failed to update voting rules. {codeError}', { codeError: e.message })),
   ...encryptedAction('gi.actions/group/updateDistributionDate', L('Failed to update group distribution date.')),
+  ...encryptedAction('gi.actions/group/upgradeFrom1.0.7', L('Failed to upgrade from version 1.0.6')),
   ...((process.env.NODE_ENV === 'development' || process.env.CI) && {
     ...encryptedAction('gi.actions/group/forceDistributionDate', L('Failed to force distribution date.'))
   })

frontend/controller/actions/identity.js

@@ -302,8 +302,13 @@ export default (sbp('sbp/selectors/register', {
         )
 
         // update the 'lastLoggedIn' field in user's group profiles
-        Object.keys(cheloniaState[identityContractID].groups)
-          .forEach(cId => {
+        // For this, we select only those groups for which membership is
+        // active (meaning current groups), instead of historical groups (groups
+        // that have been joined in the past)
+        Object.entries(cheloniaState[identityContractID].groups)
+          // $FlowFixMe[incompatible-use]
+          .filter(([, { hasLeft }]) => !hasLeft)
+          .forEach(([cId]) => {
             // We send this action only for groups we have fully joined (i.e.,
             // accepted an invite and added our profile)
             if (cheloniaState[cId]?.profiles?.[identityContractID]?.status === PROFILE_STATUS.ACTIVE) {
@@ -420,7 +425,7 @@ export default (sbp('sbp/selectors/register', {
     const rootState = sbp('state/vuex/state')
     const state = rootState[contractID]
     // TODO: Also share PEK with DMs
-    await Promise.all(Object.keys(state.groups || {}).filter(groupID => !!rootState.contracts[groupID]).map(async groupID => {
+    await Promise.all(Object.keys(state.groups || {}).filter(groupID => !state.groups[groupID].hasLeft && !!rootState.contracts[groupID]).map(async groupID => {
       const CEKid = await sbp('chelonia/contract/currentKeyIdByName', groupID, 'cek')
       const CSKid = await sbp('chelonia/contract/currentKeyIdByName', groupID, 'csk')
 

frontend/controller/app/group.js

@@ -28,9 +28,11 @@ sbp('okTurtles.events/on', LEFT_GROUP, ({ identityContractID, groupContractID })
   // grab the groupID of any group that we're a part of
   const currentGroupId = rootState.currentGroupId
   if (!currentGroupId || currentGroupId === groupContractID) {
-    const groupIdToSwitch = Object.keys(state.groups)
+    const groupIdToSwitch = Object.entries(state.groups)
+      // $FlowFixMe[incompatible-use]
+      .map(([cID, { hasLeft }]) => !hasLeft && cID)
       .filter(cID =>
-        cID !== groupContractID
+        cID && cID !== groupContractID
       ).sort(cID =>
       // prefer successfully joined groups
         sbp('state/vuex/state')[cID]?.profiles?.[groupContractID] ? -1 : 1

frontend/controller/app/identity.js

@@ -7,7 +7,7 @@ import { Secret } from '~/shared/domains/chelonia/Secret.js'
 import { boxKeyPair, buildRegisterSaltRequest, computeCAndHc, decryptContractSalt, hash, hashPassword, randomNonce } from '~/shared/zkpp.js'
 // Using relative path to crypto.js instead of ~-path to workaround some esbuild bug
 import * as Common from '@common/common.js'
-import { cloneDeep, has } from '@model/contracts/shared/giLodash.js'
+import { cloneDeep } from '@model/contracts/shared/giLodash.js'
 import { CURVE25519XSALSA20POLY1305, EDWARDS25519SHA512BATCH, deriveKeyFromPassword, serializeKey } from '../../../shared/domains/chelonia/crypto.js'
 import { handleFetchResult } from '../utils/misc.js'
 
@@ -109,7 +109,8 @@ sbp('okTurtles.events/on', LOGIN, async ({ identityContractID, encryptionParams,
       if (cheloniaState.namespaceLookups) {
         Vue.set(state, 'namespaceLookups', cheloniaState.namespaceLookups)
       }
-    // End exclude contracts
+      // End exclude contracts
+      sbp('state/vuex/postUpgradeVerification', state)
     }
 
     if (encryptionParams) {
@@ -121,7 +122,7 @@ sbp('okTurtles.events/on', LOGIN, async ({ identityContractID, encryptionParams,
     const currentState = sbp('state/vuex/state')
     if (!currentState.currentGroupId) {
       const gId = Object.keys(currentState.contracts)
-        .find(cID => has(currentState[identityContractID].groups, cID))
+        .find(cID => currentState[identityContractID].groups[cID] && !currentState[identityContractID].groups[cID].hasLeft)
 
       if (gId) {
         sbp('gi.app/group/switch', gId)

frontend/controller/namespace.js

@@ -7,7 +7,11 @@ import Vue from 'vue'
 sbp('sbp/selectors/register', {
   'namespace/lookupCached': (name: string) => {
     const cache = sbp('state/vuex/state').namespaceLookups
-    return cache?.[name] ?? null
+    return cache[name] ?? null
+  },
+  'namespace/lookupReverseCached': (id: string) => {
+    const cache = sbp('state/vuex/state').reverseNamespaceLookups
+    return cache[id] ?? null
   },
   'namespace/lookup': (name: string, { skipCache }: { skipCache: boolean } = { skipCache: false }) => {
     if (!skipCache) {
@@ -29,9 +33,11 @@ sbp('sbp/selectors/register', {
       }
       return r['text']()
     }).then(value => {
-      const cache = sbp('state/vuex/state').namespaceLookups
       if (value !== null) {
+        const cache = sbp('state/vuex/state').namespaceLookups
+        const reverseCache = sbp('state/vuex/state').reverseNamespaceLookups
         Vue.set(cache, name, value)
+        Vue.set(reverseCache, value, name)
       }
       return value
     })

frontend/model/contracts/chatroom.js

@@ -8,14 +8,14 @@ import { actionRequireInnerSignature, arrayOf, number, object, objectOf, optiona
 import { ChelErrorGenerator } from '~/shared/domains/chelonia/errors.js'
 import { findForeignKeysByContractID, findKeyIdByName } from '~/shared/domains/chelonia/utils.js'
 import {
-  MAX_HASH_LEN,
   CHATROOM_ACTIONS_PER_PAGE,
   CHATROOM_DESCRIPTION_LIMITS_IN_CHARS,
   CHATROOM_MAX_MESSAGES,
-  CHATROOM_NAME_LIMITS_IN_CHARS,
   CHATROOM_MAX_MESSAGE_LEN,
+  CHATROOM_NAME_LIMITS_IN_CHARS,
   CHATROOM_PRIVACY_LEVEL,
   CHATROOM_TYPES,
+  MAX_HASH_LEN,
   MESSAGE_NOTIFICATIONS,
   MESSAGE_NOTIFY_SETTINGS,
   MESSAGE_RECEIVE,
@@ -27,6 +27,7 @@ import {
   findMessageIdx,
   leaveChatRoom,
   makeMentionFromUserID,
+  referenceTally,
   swapMentionIDForDisplayname
 } from './shared/functions.js'
 import chatroomGetters from './shared/getters/chatroom.js'
@@ -177,7 +178,7 @@ sbp('chelonia/defineContract', {
 
         if (!state.renderingContext) {
           if (!state.members) {
-            state['members'] = {}
+            state.members = {}
           }
           if (state.members[memberID]) {
             throw new GIChatroomAlreadyMemberError(`Can not join the chatroom which ${memberID} is already part of`)
@@ -207,9 +208,11 @@ sbp('chelonia/defineContract', {
         addMessage(state, createMessage({ meta, hash, height, state, data: notificationData, innerSigningContractID }))
       },
       sideEffect ({ data, contractID, hash, meta, innerSigningContractID, height }, { state }) {
+        const memberID = data.memberID || innerSigningContractID
+        sbp('gi.contracts/chatroom/referenceTally', contractID, memberID, 'retain')
+
         sbp('chelonia/queueInvocation', contractID, async () => {
           const state = await sbp('chelonia/contract/state', contractID)
-          const memberID = data.memberID || innerSigningContractID
 
           if (!state?.members?.[memberID]) {
             return
@@ -221,16 +224,6 @@ sbp('chelonia/defineContract', {
             sbp('gi.actions/identity/kv/initChatRoomUnreadMessages', {
               contractID, messageHash: hash, createdHeight: height
             })
-
-            // subscribe to founder's IdentityContract & everyone else's
-            const profileIds = Object.keys(state.members)
-            sbp('chelonia/contract/retain', profileIds).catch((e) => {
-              console.error('Error while syncing other members\' contracts at chatroom join', e)
-            })
-          } else {
-            sbp('chelonia/contract/retain', memberID).catch((e) => {
-              console.error(`Error while syncing new memberID's contract ${memberID}`, e)
-            })
           }
         }).catch((e) => {
           console.error('[gi.contracts/chatroom/join/sideEffect] Error at sideEffect', e?.message || e)
@@ -287,7 +280,6 @@ sbp('chelonia/defineContract', {
           }
         }
 
-        state.members[memberID].leftHeight = height
         delete state.members[memberID]
 
         if (!state.attributes) return
@@ -310,18 +302,19 @@ sbp('chelonia/defineContract', {
           innerSigningContractID: !isKicked ? memberID : innerSigningContractID
         }))
       },
-      async sideEffect ({ data, hash, contractID, meta, innerSigningContractID }) {
+      async sideEffect ({ data, hash, contractID, meta, innerSigningContractID }, { state }) {
         const memberID = data.memberID || innerSigningContractID
         const itsMe = memberID === sbp('state/vuex/state').loggedIn.identityContractID
 
         // NOTE: we don't add this 'if' statement in the queuedInvocation
         //       because these should not be running while rejoining
         if (itsMe) {
-          await leaveChatRoom(contractID).catch(e => {
+          await leaveChatRoom(contractID, state).catch(e => {
             console.error('[gi.contracts/chatroom/leave] Error at leaveChatRoom', e)
           })
         }
 
+        sbp('gi.contracts/chatroom/referenceTally', contractID, memberID, 'release')
         sbp('chelonia/queueInvocation', contractID, async () => {
           const state = await sbp('chelonia/contract/state', contractID)
           if (!state || !!state.members?.[data.memberID] || !state.attributes) {
@@ -344,18 +337,21 @@ sbp('chelonia/defineContract', {
           throw new TypeError(L('Only the channel creator can delete channel.'))
         }
       }),
-      process ({ meta }, { state }) {
+      process ({ meta, contractID }, { state }) {
         if (!state.attributes) return
         state.attributes['deletedDate'] = meta.createdDate
+        sbp('gi.contracts/chatroom/pushSideEffect', contractID,
+          ['gi.contracts/chatroom/referenceTally', contractID, Object.keys(state.members), 'release']
+        )
         for (const memberID in state.members) {
           delete state.members[memberID]
         }
       },
-      async sideEffect ({ contractID }) {
+      async sideEffect ({ contractID }, { state }) {
         // NOTE: make sure *not* to await on this, since that can cause
         //       a potential deadlock. See same warning in sideEffect for
         //       'gi.contracts/group/removeMember'
-        await leaveChatRoom(contractID)
+        await leaveChatRoom(contractID, state)
       }
     },
     'gi.contracts/chatroom/addMessage': {
@@ -723,9 +719,9 @@ sbp('chelonia/defineContract', {
   },
   methods: {
     'gi.contracts/chatroom/_cleanup': ({ contractID, state }) => {
-      if (state) {
+      if (state?.members) {
         sbp('chelonia/contract/release', Object.keys(state.members)).catch(e => {
-          console.error(`[gi.contracts/chatroom/_cleanup] Error releasing chatroom members for ${contractID}`, Object.keys(state.members), e)
+          console.error('[gi.contracts/chatroom/_cleanup] Error calling release', contractID, e)
         })
       }
     },
@@ -767,6 +763,7 @@ sbp('chelonia/defineContract', {
       }).catch(e => {
         console.warn(`removeForeignKeys: ${e.name} thrown during queueEvent to ${contractID}:`, e)
       })
-    }
+    },
+    ...referenceTally('gi.contracts/chatroom/referenceTally')
   }
 })