Skip to content

Commit

Permalink
Fix #2103 (#2116)
Browse files Browse the repository at this point in the history
* Fix manifest loading
* Prevent processing events if OP_CONTRACT failed
* Prevent processing subsequent events after an error
  due to missing state
  • Loading branch information
corrideat committed Jun 24, 2024
1 parent 9a64672 commit 89dc42d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 7 deletions.
4 changes: 4 additions & 0 deletions frontend/model/state.js
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,10 @@ const getters = {
Object.keys(state.contracts)
.filter(contractID => state.contracts[contractID].type === 'gi.contracts/identity')
.forEach(contractID => {
if (!state[contractID]) {
console.warn('[ourContactProfilesById] Missing state', contractID)
return
}
const attributes = state[contractID].attributes
if (attributes) { // NOTE: this is for fixing the error while syncing the identity contracts
const username = checkedUsername(state, attributes.username, contractID)
Expand Down
17 changes: 10 additions & 7 deletions shared/domains/chelonia/internals.js
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,10 @@ export default (sbp('sbp/selectors/register', {
}
if (!this.config.skipActionProcessing && !this.manifestToContract[manifestHash]) {
const rootState = sbp(this.config.stateSelector)
const contractName = has(rootState.contracts, contractID)
// Having rootState.contracts[contractID] is not enough to determine we
// have previously synced this contract, as reference counts are also
// stored there. Hence, we check for the presence of 'type'
const contractName = has(rootState.contracts, contractID) && has(rootState.contracts[contractID], 'type')
? rootState.contracts[contractID].type
: opT === GIMessage.OP_CONTRACT
? ((opV: any): GIOpContract).type
Expand Down Expand Up @@ -1304,15 +1307,15 @@ export default (sbp('sbp/selectors/register', {
const keysToUpdate = []

pendingWatch.forEach(([keyName, externalId]) => {
// Does the key exist? If not, it has probably been removed and instead
// of waiting, we need to remove it ourselves
// Does the key exist? If not, it has probably been removed and instead
// of waiting, we need to remove it ourselves
const keyId = findKeyIdByName(contractState, keyName)
if (!keyId) {
keysToDelete.push(externalId)
return
} else if (keyId !== externalId) {
// Or, the key has been updated and we need to update it in the external
// contract as well
// Or, the key has been updated and we need to update it in the external
// contract as well
keysToUpdate.push(externalId)
}

Expand Down Expand Up @@ -1696,7 +1699,7 @@ export default (sbp('sbp/selectors/register', {
throw new Error(`[chelonia] Wrong contract ID. Expected ${contractID} but got ${message.contractID()}`)
}
if (!message.isFirstMessage() && (!has(state.contracts, contractID) || !has(state, contractID))) {
throw new Error('The event is not for a first message but the contract state is missing')
throw new ChelErrorUnrecoverable('The event is not for a first message but the contract state is missing')
}
preHandleEvent?.(message)
// the order the following actions are done is critically important!
Expand Down Expand Up @@ -1740,7 +1743,7 @@ export default (sbp('sbp/selectors/register', {
processingErrored = e?.name !== 'ChelErrorWarning'
this.config.hooks.processError?.(e, message, getMsgMeta(message, contractID, state))
// special error that prevents the head from being updated, effectively killing the contract
if (e.name === 'ChelErrorUnrecoverable') throw e
if (e.name === 'ChelErrorUnrecoverable' || message.isFirstMessage()) throw e
}

// process any side-effects (these must never result in any mutation to the contract state!)
Expand Down

0 comments on commit 89dc42d

Please sign in to comment.