refactor: optimize events

Author: heueristik

contracts/src/ProtocolAdapter.sol

@@ -39,8 +39,6 @@ contract ProtocolAdapter is IProtocolAdapter, ReentrancyGuardTransient, Commitme
 
     RiscZeroVerifierRouter internal immutable _TRUSTED_RISC_ZERO_VERIFIER_ROUTER;
 
-    uint256 internal _txCount;
-
     error ZeroNotAllowed();
 
     error ForwarderCallOutputMismatch(bytes expected, bytes actual);
@@ -156,7 +154,7 @@ contract ProtocolAdapter is IProtocolAdapter, ReentrancyGuardTransient, Commitme
         }
 
         // Emit the event containing the transaction and new root
-        emit TransactionExecuted({id: _txCount++, transaction: transaction, newRoot: newRoot});
+        emit TransactionExecuted({tags: tags, newRoot: newRoot});
     }
     // slither-disable-end reentrancy-no-eth
 
@@ -237,6 +235,44 @@ contract ProtocolAdapter is IProtocolAdapter, ReentrancyGuardTransient, Commitme
         if (input.appData.externalPayload.length != 0) {
             _processForwarderCalls(input, consumed);
         }
+
+        _emitBlobs(input);
+    }
+
+    /// @notice Emits app data blobs.
+    /// @param input The logic verifier input containing the app data.
+    function _emitBlobs(Logic.VerifierInput calldata input) internal {
+        Logic.ExpirableBlob[] calldata payload = input.appData.resourcePayload;
+        uint256 n = payload.length;
+        for (uint256 i = 0; i < n; ++i) {
+            if (payload[i].deletionCriterion == Logic.DeletionCriterion.Never) {
+                emit ResourcePayload({tag: input.tag, blob: payload[i].blob});
+            }
+        }
+
+        payload = input.appData.discoveryPayload;
+        n = payload.length;
+        for (uint256 i = 0; i < n; ++i) {
+            if (payload[i].deletionCriterion == Logic.DeletionCriterion.Never) {
+                emit DiscoveryPayload({tag: input.tag, blob: payload[i].blob});
+            }
+        }
+
+        payload = input.appData.externalPayload;
+        n = payload.length;
+        for (uint256 i = 0; i < n; ++i) {
+            if (payload[i].deletionCriterion == Logic.DeletionCriterion.Never) {
+                emit ExternalPayload({tag: input.tag, blob: payload[i].blob});
+            }
+        }
+
+        payload = input.appData.applicationPayload;
+        n = payload.length;
+        for (uint256 i = 0; i < n; ++i) {
+            if (payload[i].deletionCriterion == Logic.DeletionCriterion.Never) {
+                emit ApplicationPayload({tag: input.tag, blob: payload[i].blob});
+            }
+        }
     }
 
     /// @notice Processes forwarder calls by verifying and executing them.

contracts/src/interfaces/IProtocolAdapter.sol

@@ -9,17 +9,36 @@ import {Transaction} from "../Types.sol";
 /// @custom:security-contact security@anoma.foundation
 interface IProtocolAdapter {
     /// @notice Emitted when a transaction is executed.
-    /// @param id The transaction ID.
-    /// @param transaction The executed transaction.
+    /// @param tags The tags of resources being consumed and created in this transaction in alternating appearance.
     /// @param newRoot The new commitment tree root.
-    event TransactionExecuted(uint256 indexed id, Transaction transaction, bytes32 newRoot);
+    event TransactionExecuted(bytes32[] tags, bytes32 newRoot);
 
     /// @notice Emitted when a forwarder call is executed.
     /// @param untrustedForwarder The forwarder contract forwarding the call.
     /// @param input The input data for the forwarded call.
     /// @param output The expected output data from the forwarded call.
     event ForwarderCallExecuted(address indexed untrustedForwarder, bytes input, bytes output);
 
+    /// @notice Emitted to store a resource payload blob persistently.
+    /// @param tag The tag of the resource this blob belongs to.
+    /// @param blob The blob.
+    event ResourcePayload(bytes32 indexed tag, bytes blob);
+
+    /// @notice Emitted to store a discovery payload blob persistently.
+    /// @param tag The tag of the resource this blob belongs to.
+    /// @param blob The blob.
+    event DiscoveryPayload(bytes32 indexed tag, bytes blob);
+
+    /// @notice Emitted to store a external call payload blob persistently.
+    /// @param tag The tag of the resource this blob belongs to.
+    /// @param blob The blob.
+    event ExternalPayload(bytes32 indexed tag, bytes blob);
+
+    /// @notice Emitted to store an application payload blob persistently.
+    /// @param tag The tag of the resource this blob belongs to.
+    /// @param blob The blob.
+    event ApplicationPayload(bytes32 indexed tag, bytes blob);
+
     /// @notice Executes a transaction by adding the commitments and nullifiers to the commitment tree and nullifier
     /// set, respectively.
     /// @param transaction The transaction to execute.

contracts/test/ProtocolAdapterMock.t.sol

@@ -15,7 +15,7 @@ import {RiscZeroUtils} from "../src/libs/RiscZeroUtils.sol";
 import {ProtocolAdapter} from "../src/ProtocolAdapter.sol";
 import {Logic} from "../src/proving/Logic.sol";
 import {NullifierSet} from "../src/state/NullifierSet.sol";
-import {Transaction, Resource} from "../src/Types.sol";
+import {Transaction, Action, Resource} from "../src/Types.sol";
 
 import {ForwarderExample} from "./examples/Forwarder.e.sol";
 import {INPUT, EXPECTED_OUTPUT} from "./examples/ForwarderTarget.e.sol";
@@ -29,6 +29,7 @@ contract ProtocolAdapterMockTest is Test {
     using RiscZeroUtils for Logic.VerifierInput;
     using TxGen for RiscZeroMockVerifier;
     using TxGen for Transaction;
+    using TxGen for Action[];
 
     bytes32 internal constant _CARRIER_LOGIC_REF = bytes32(uint256(123));
 
@@ -67,7 +68,7 @@ contract ProtocolAdapterMockTest is Test {
         bytes32 expectedRoot = cms.computeRoot({treeDepth: MerkleTree.computeMinimalTreeDepth(cms.length) + 1});
 
         vm.expectEmit(address(_mockPa));
-        emit IProtocolAdapter.TransactionExecuted({id: 0, transaction: txn, newRoot: expectedRoot});
+        emit IProtocolAdapter.TransactionExecuted({tags: txn.actions.collectTags(), newRoot: expectedRoot});
         _mockPa.execute(txn);
     }