fix(api): actviate correct policy state when multiple of the same key are executed at once

Author: hbriese

api/src/feat/policies/activate-policy.edgeql

@@ -1,7 +1,10 @@
 with account := (select Account filter .address = <UAddress>$account),
-     proposal := (select SystemTx filter .hash = <Bytes32>$systxHash).proposal,
      key := <uint16>$key,
-     new := assert_single((select PolicyState filter .account = account and .key = key and (.proposal ?= proposal or .initState))),
+     new := assert_single((
+       select PolicyState filter .account = account and .key = key and 
+         ([is Policy].hash ?= <optional Bytes32>$hash or PolicyState is RemovedPolicy) and
+         (not exists .activationBlock or .activationBlock ?= 0)
+     )),
      old := assert_single((select PolicyState filter .account = account and key = .key and .isLatest and .id != new.id)),
      activationBlock := <bigint>$activationBlock,
      isLater := (activationBlock > (old.activationBlock ?? -1n)),

api/src/feat/policies/activate-policy.query.ts

@@ -4,8 +4,8 @@ import type {Executor} from "edgedb";
 
 export type ActivatePolicyArgs = {
   readonly "account": string;
-  readonly "systxHash": string;
   readonly "key": number;
+  readonly "hash"?: string | null;
   readonly "activationBlock": bigint;
 };
 
@@ -18,9 +18,12 @@ export type ActivatePolicyReturns = {
 export function activatePolicy(client: Executor, args: ActivatePolicyArgs): Promise<ActivatePolicyReturns> {
   return client.queryRequiredSingle(`\
 with account := (select Account filter .address = <UAddress>$account),
-     proposal := (select SystemTx filter .hash = <Bytes32>$systxHash).proposal,
      key := <uint16>$key,
-     new := assert_single((select PolicyState filter .account = account and .key = key and (.proposal ?= proposal or .initState))),
+     new := assert_single((
+       select PolicyState filter .account = account and .key = key and 
+         ([is Policy].hash ?= <optional Bytes32>$hash or PolicyState is RemovedPolicy) and
+         (not exists .activationBlock or .activationBlock ?= 0)
+     )),
      old := assert_single((select PolicyState filter .account = account and key = .key and .isLatest and .id != new.id)),
      activationBlock := <bigint>$activationBlock,
      isLater := (activationBlock > (old.activationBlock ?? -1n)),

api/src/feat/policies/policies.events.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { EventsWorker, EventData, Log } from '../events/events.worker';
-import { ACCOUNT_ABI, PolicyKey, asPolicyKey, asUAddress, asUUID } from 'lib';
+import { ACCOUNT_ABI, Hex, PolicyKey, asPolicyKey, asUAddress, asUUID } from 'lib';
 import { Chain } from 'chains';
 import { DatabaseService } from '~/core/database';
 import { getAbiItem } from 'viem';
@@ -29,6 +29,7 @@ export class PoliciesEventsProcessor {
       chain,
       log,
       asPolicyKey(log.args.key),
+      log.args.hash,
     );
 
     if (policyId)
@@ -46,20 +47,21 @@ export class PoliciesEventsProcessor {
       this.policies.event({ event: PolicyEvent.removed, account, policyId: asUUID(policyId) });
   }
 
-  private async markStateAsActive(chain: Chain, log: Log, key: PolicyKey) {
-    // FIXME: when multiple policies are activated in one block, the wrong one may be marked as active
-    // This *always* occurs when a policy is activated by a policy update transaction
-
+  private async markStateAsActive(chain: Chain, log: Log, key: PolicyKey, hash?: Hex) {
     const account = asUAddress(log.address, chain);
     const r = await this.db.exec(activatePolicy, {
       account,
       key,
-      systxHash: log.transactionHash,
+      hash,
       activationBlock: log.blockNumber,
     });
 
     await Promise.all(r.pendingTransactions.map((id) => this.transactions.tryExecute(asUUID(id))));
 
+    if (!r.new) {
+      // TODO: this shouldn't happen
+    }
+
     return { account, old: r.old, new: r.new };
   }
 }