From fcdf21b384f92943f845d84317f054bb001a7f55 Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Mon, 4 Nov 2024 17:15:33 +0100
Subject: [PATCH 1/9] feat: txm hooks

---
 packages/randomness-service/src/index.ts      |  7 ++-
 packages/randomness-service/tsconfig.json     |  6 ++-
 packages/transaction-manager/lib/EventBus.ts  |  1 +
 .../transaction-manager/lib/HookManager.ts    | 50 +++++++++++++++++++
 .../transaction-manager/lib/Transaction.ts    |  6 +++
 .../lib/TransactionManager.ts                 | 12 +++++
 .../lib/TransactionRepository.ts              | 17 +++++++
 packages/transaction-manager/lib/index.ts     |  1 +
 8 files changed, 97 insertions(+), 3 deletions(-)
 create mode 100644 packages/transaction-manager/lib/HookManager.ts

diff --git a/packages/randomness-service/src/index.ts b/packages/randomness-service/src/index.ts
index b9b994bd13..63383d7c1d 100644
--- a/packages/randomness-service/src/index.ts
+++ b/packages/randomness-service/src/index.ts
@@ -1,5 +1,5 @@
-import { TransactionManager } from "@happychain/transaction-manager"
-import type { LatestBlock, Transaction } from "@happychain/transaction-manager"
+import { TransactionManager, TxmHookType } from "@happychain/transaction-manager"
+import type { LatestBlock, Transaction,  } from "@happychain/transaction-manager"
 import { webSocket } from "viem"
 import { privateKeyToAccount } from "viem/accounts"
 import { anvil } from "viem/chains"
@@ -34,6 +34,9 @@ class RandomnessService {
 
         this.txm.start()
         this.txm.addTransactionCollector(this.onCollectTransactions.bind(this))
+        this.txm.addHook(TxmHookType.TransactionStatusChanged, (event) => {
+            console.log(event)
+        })
     }
 
     private onCollectTransactions(block: LatestBlock): Transaction[] {
diff --git a/packages/randomness-service/tsconfig.json b/packages/randomness-service/tsconfig.json
index 4d863df25e..8b56a30c17 100644
--- a/packages/randomness-service/tsconfig.json
+++ b/packages/randomness-service/tsconfig.json
@@ -1,4 +1,8 @@
 {
     "extends": ["../configs/tsconfig.base.json"],
-    "include": ["*.ts", "src"]
+    "include": ["*.ts", "src"],
+    "compilerOptions": {
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true
+    }
 }
diff --git a/packages/transaction-manager/lib/EventBus.ts b/packages/transaction-manager/lib/EventBus.ts
index 63e7cd19d4..212839a644 100644
--- a/packages/transaction-manager/lib/EventBus.ts
+++ b/packages/transaction-manager/lib/EventBus.ts
@@ -2,6 +2,7 @@ import EventEmitter from "eventemitter3"
 
 export enum Topics {
     NewBlock = "NewBlock",
+    TransactionStatusChanged = "TransactionStatusChanged",
 }
 
 export type EventBus = EventEmitter<Topics>
diff --git a/packages/transaction-manager/lib/HookManager.ts b/packages/transaction-manager/lib/HookManager.ts
new file mode 100644
index 0000000000..ca02fcbe48
--- /dev/null
+++ b/packages/transaction-manager/lib/HookManager.ts
@@ -0,0 +1,50 @@
+import type { UUID } from "@happychain/common"
+import { Topics, eventBus } from "./EventBus.js"
+import type { TransactionStatus } from "./Transaction.js"
+
+export enum TxmHookType {
+    All = "All",
+    TransactionStatusChanged = "TransactionStatusChanged",
+}
+
+export type TxmHookPayload = {
+    type: TxmHookType,
+    intentId: UUID,
+}
+
+export type TxmHookHandler = (event: TxmHookPayload) => void
+
+
+export class HookManager {
+    private hooks: Record<TxmHookType, TxmHookHandler[]>;
+
+    constructor() {
+        this.hooks = {
+            [TxmHookType.All]: [],
+            [TxmHookType.TransactionStatusChanged]: [],
+        }
+        eventBus.on(Topics.TransactionStatusChanged, this.onTransactionStatusChanged.bind(this))
+    }
+
+    public async addHook(type: TxmHookType, handler: TxmHookHandler): Promise<void> {
+        if (!this.hooks[type]) {
+            this.hooks[type] = []
+        }
+        this.hooks[type].push(handler)
+    }
+
+    private async onTransactionStatusChanged(payload: {
+        intentId: UUID,
+        status: TransactionStatus
+    }): Promise<void> {
+        this.hooks[TxmHookType.TransactionStatusChanged].map((h) => h({
+            type: TxmHookType.TransactionStatusChanged,
+            intentId: payload.intentId,
+        }))
+
+        this.hooks[TxmHookType.All].map((h) => h({
+            type: TxmHookType.All,
+            intentId: payload.intentId,
+        }))
+    }
+}
diff --git a/packages/transaction-manager/lib/Transaction.ts b/packages/transaction-manager/lib/Transaction.ts
index 198386836b..4d185b8d47 100644
--- a/packages/transaction-manager/lib/Transaction.ts
+++ b/packages/transaction-manager/lib/Transaction.ts
@@ -3,6 +3,7 @@ import type { Insertable, Selectable } from "kysely"
 import type { Address, ContractFunctionArgs, Hash } from "viem"
 import type { LatestBlock } from "./BlockMonitor"
 import type { TransactionTable } from "./db/types.js"
+import { eventBus, Topics } from "./EventBus.js"
 
 export enum TransactionStatus {
     Pending = "Pending",
@@ -113,6 +114,11 @@ export class Transaction {
 
     changeStatus(status: TransactionStatus): void {
         this.status = status
+
+        eventBus.emit(Topics.TransactionStatusChanged, {
+            intentId: this.intentId,
+            status,
+        })
     }
 
     get attemptCount(): number {
diff --git a/packages/transaction-manager/lib/TransactionManager.ts b/packages/transaction-manager/lib/TransactionManager.ts
index 3985bad14e..0dc17a7a19 100644
--- a/packages/transaction-manager/lib/TransactionManager.ts
+++ b/packages/transaction-manager/lib/TransactionManager.ts
@@ -1,6 +1,7 @@
 import {
     type SafeViemPublicClient,
     type SafeViemWalletClient,
+    type UUID,
     convertToSafeViemPublicClient,
     convertToSafeViemWalletClient,
 } from "@happychain/common"
@@ -16,6 +17,7 @@ import { TransactionRepository } from "./TransactionRepository.js"
 import { TransactionSubmitter } from "./TransactionSubmitter.js"
 import { TxMonitor } from "./TxMonitor.js"
 import { type EIP1559Parameters, opStackDefaultEIP1559Parameters } from "./eip1559.js"
+import { HookManager, type TxmHookType, type TxmHookHandler } from "./HookManager.js"
 
 export type TransactionManagerConfig = {
     /** The transport protocol used for the client. See {@link Transport} from viem for more details. */
@@ -89,6 +91,7 @@ export class TransactionManager {
     public readonly transactionRepository: TransactionRepository
     public readonly transactionCollector: TransactionCollector
     public readonly transactionSubmitter: TransactionSubmitter
+    public readonly hookManager: HookManager
 
     public readonly id: string
     public readonly eip1559: EIP1559Parameters
@@ -122,6 +125,7 @@ export class TransactionManager {
         this.transactionRepository = new TransactionRepository(this)
         this.transactionCollector = new TransactionCollector(this)
         this.transactionSubmitter = new TransactionSubmitter(this)
+        this.hookManager = new HookManager()
 
         this.id = _config.id
         this.eip1559 = _config.eip1559 || opStackDefaultEIP1559Parameters
@@ -138,6 +142,14 @@ export class TransactionManager {
         this.collectors.push(collector)
     }
 
+    public async addHook(type: TxmHookType, handler: TxmHookHandler): Promise<void> {
+        await this.hookManager.addHook(type, handler);
+    }
+
+    public async getTransaction(txIntentId: UUID): Promise<Transaction | undefined> {
+        return this.transactionRepository.getTransaction(txIntentId)
+    }
+
     public async start(): Promise<void> {
         // Start the gas price oracle to prevent other parts of the application from calling `suggestGasForNextBlock` before the gas price oracle has initialized the gas price after processing the first block
         const priceOraclePromise = this.gasPriceOracle.start()
diff --git a/packages/transaction-manager/lib/TransactionRepository.ts b/packages/transaction-manager/lib/TransactionRepository.ts
index 1c6b9e94fe..46ca9e2877 100644
--- a/packages/transaction-manager/lib/TransactionRepository.ts
+++ b/packages/transaction-manager/lib/TransactionRepository.ts
@@ -1,5 +1,6 @@
 import { unknownToError } from "@happychain/common"
 import { type Result, ResultAsync } from "neverthrow"
+import type { UUID } from "@happychain/common"
 import { NotFinalizedStatuses, Transaction } from "./Transaction.js"
 import type { TransactionManager } from "./TransactionManager.js"
 import { db } from "./db/driver.js"
@@ -27,6 +28,22 @@ export class TransactionRepository {
         return [...this.notFinalizedTransactions]
     }
 
+    async getTransaction(intentId: UUID): Promise<Transaction | undefined> {
+        const cachedTransaction =  this.notFinalizedTransactions.find((t) => t.intentId === intentId)
+
+        if (cachedTransaction) {
+            return cachedTransaction;
+        }
+
+        const persistedTransaction = await db
+            .selectFrom("transaction")
+            .where("intentId", "=", intentId)
+            .selectAll()
+            .executeTakeFirst()
+
+        return persistedTransaction ? Transaction.fromDbRow(persistedTransaction) : undefined
+    }
+
     async saveTransactions(transactions: Transaction[]): Promise<Result<void, Error>> {
         const result = await ResultAsync.fromPromise(
             db
diff --git a/packages/transaction-manager/lib/index.ts b/packages/transaction-manager/lib/index.ts
index 9620c954da..8ff89421ec 100644
--- a/packages/transaction-manager/lib/index.ts
+++ b/packages/transaction-manager/lib/index.ts
@@ -2,3 +2,4 @@ export { Transaction } from "./Transaction.js"
 export { TransactionManager } from "./TransactionManager.js"
 export { GasEstimator, EstimateGasErrorCause } from "./GasEstimator.js"
 export type { LatestBlock } from "./BlockMonitor.js"
+export { TxmHookType, type TxmHookHandler } from "./HookManager.js"
\ No newline at end of file

From 49947205e45f9bd34c4b1290a4e38acf76fb582f Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Wed, 6 Nov 2024 12:04:56 +0100
Subject: [PATCH 2/9] chore: format

---
 packages/randomness-service/src/index.ts      |  2 +-
 .../transaction-manager/lib/HookManager.ts    | 31 ++++++++++---------
 .../lib/TransactionManager.ts                 |  4 +--
 packages/transaction-manager/lib/index.ts     |  2 +-
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/packages/randomness-service/src/index.ts b/packages/randomness-service/src/index.ts
index 63383d7c1d..1ae2c66287 100644
--- a/packages/randomness-service/src/index.ts
+++ b/packages/randomness-service/src/index.ts
@@ -1,5 +1,5 @@
 import { TransactionManager, TxmHookType } from "@happychain/transaction-manager"
-import type { LatestBlock, Transaction,  } from "@happychain/transaction-manager"
+import type { LatestBlock, Transaction } from "@happychain/transaction-manager"
 import { webSocket } from "viem"
 import { privateKeyToAccount } from "viem/accounts"
 import { anvil } from "viem/chains"
diff --git a/packages/transaction-manager/lib/HookManager.ts b/packages/transaction-manager/lib/HookManager.ts
index ca02fcbe48..6041780343 100644
--- a/packages/transaction-manager/lib/HookManager.ts
+++ b/packages/transaction-manager/lib/HookManager.ts
@@ -8,15 +8,14 @@ export enum TxmHookType {
 }
 
 export type TxmHookPayload = {
-    type: TxmHookType,
-    intentId: UUID,
+    type: TxmHookType
+    intentId: UUID
 }
 
 export type TxmHookHandler = (event: TxmHookPayload) => void
 
-
 export class HookManager {
-    private hooks: Record<TxmHookType, TxmHookHandler[]>;
+    private hooks: Record<TxmHookType, TxmHookHandler[]>
 
     constructor() {
         this.hooks = {
@@ -34,17 +33,21 @@ export class HookManager {
     }
 
     private async onTransactionStatusChanged(payload: {
-        intentId: UUID,
+        intentId: UUID
         status: TransactionStatus
     }): Promise<void> {
-        this.hooks[TxmHookType.TransactionStatusChanged].map((h) => h({
-            type: TxmHookType.TransactionStatusChanged,
-            intentId: payload.intentId,
-        }))
-
-        this.hooks[TxmHookType.All].map((h) => h({
-            type: TxmHookType.All,
-            intentId: payload.intentId,
-        }))
+        this.hooks[TxmHookType.TransactionStatusChanged].map((h) =>
+            h({
+                type: TxmHookType.TransactionStatusChanged,
+                intentId: payload.intentId,
+            }),
+        )
+
+        this.hooks[TxmHookType.All].map((h) =>
+            h({
+                type: TxmHookType.All,
+                intentId: payload.intentId,
+            }),
+        )
     }
 }
diff --git a/packages/transaction-manager/lib/TransactionManager.ts b/packages/transaction-manager/lib/TransactionManager.ts
index 0dc17a7a19..9dda034962 100644
--- a/packages/transaction-manager/lib/TransactionManager.ts
+++ b/packages/transaction-manager/lib/TransactionManager.ts
@@ -10,6 +10,7 @@ import { ABIManager } from "./AbiManager.js"
 import { BlockMonitor, type LatestBlock } from "./BlockMonitor.js"
 import { GasEstimator } from "./GasEstimator.js"
 import { GasPriceOracle } from "./GasPriceOracle.js"
+import { HookManager, type TxmHookHandler, type TxmHookType } from "./HookManager.js"
 import { NonceManager } from "./NonceManager.js"
 import type { Transaction } from "./Transaction.js"
 import { TransactionCollector } from "./TransactionCollector.js"
@@ -17,7 +18,6 @@ import { TransactionRepository } from "./TransactionRepository.js"
 import { TransactionSubmitter } from "./TransactionSubmitter.js"
 import { TxMonitor } from "./TxMonitor.js"
 import { type EIP1559Parameters, opStackDefaultEIP1559Parameters } from "./eip1559.js"
-import { HookManager, type TxmHookType, type TxmHookHandler } from "./HookManager.js"
 
 export type TransactionManagerConfig = {
     /** The transport protocol used for the client. See {@link Transport} from viem for more details. */
@@ -143,7 +143,7 @@ export class TransactionManager {
     }
 
     public async addHook(type: TxmHookType, handler: TxmHookHandler): Promise<void> {
-        await this.hookManager.addHook(type, handler);
+        await this.hookManager.addHook(type, handler)
     }
 
     public async getTransaction(txIntentId: UUID): Promise<Transaction | undefined> {
diff --git a/packages/transaction-manager/lib/index.ts b/packages/transaction-manager/lib/index.ts
index 8ff89421ec..f5cec82e01 100644
--- a/packages/transaction-manager/lib/index.ts
+++ b/packages/transaction-manager/lib/index.ts
@@ -2,4 +2,4 @@ export { Transaction } from "./Transaction.js"
 export { TransactionManager } from "./TransactionManager.js"
 export { GasEstimator, EstimateGasErrorCause } from "./GasEstimator.js"
 export type { LatestBlock } from "./BlockMonitor.js"
-export { TxmHookType, type TxmHookHandler } from "./HookManager.js"
\ No newline at end of file
+export { TxmHookType, type TxmHookHandler } from "./HookManager.js"

From b7abacd3fa559ce9cff248378ae2a61c258249f3 Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Wed, 6 Nov 2024 15:28:57 +0100
Subject: [PATCH 3/9] feat(txm): hook handler receives a transaction instead of
 the intent id

---
 .../transaction-manager/lib/HookManager.ts    | 41 +++++++++----------
 .../lib/TransactionManager.ts                 |  9 +++-
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/packages/transaction-manager/lib/HookManager.ts b/packages/transaction-manager/lib/HookManager.ts
index 6041780343..a8cf431e22 100644
--- a/packages/transaction-manager/lib/HookManager.ts
+++ b/packages/transaction-manager/lib/HookManager.ts
@@ -1,52 +1,49 @@
-import type { UUID } from "@happychain/common"
 import { Topics, eventBus } from "./EventBus.js"
-import type { TransactionStatus } from "./Transaction.js"
+import type { Transaction } from "./Transaction.js"
 
 export enum TxmHookType {
-    All = "All",
     TransactionStatusChanged = "TransactionStatusChanged",
 }
 
 export type TxmHookPayload = {
     type: TxmHookType
-    intentId: UUID
+    transaction: Transaction
 }
 
 export type TxmHookHandler = (event: TxmHookPayload) => void
 
 export class HookManager {
-    private hooks: Record<TxmHookType, TxmHookHandler[]>
+    private hooks: Record<TxmHookType | "All", TxmHookHandler[]>
 
     constructor() {
         this.hooks = {
-            [TxmHookType.All]: [],
-            [TxmHookType.TransactionStatusChanged]: [],
+            All: [],
+            TransactionStatusChanged: [],
         }
         eventBus.on(Topics.TransactionStatusChanged, this.onTransactionStatusChanged.bind(this))
     }
 
-    public async addHook(type: TxmHookType, handler: TxmHookHandler): Promise<void> {
-        if (!this.hooks[type]) {
-            this.hooks[type] = []
+    /**
+     * Adds a hook to the hook manager.
+     * @param type - The type of hook to add. Defaults to All.
+     * @param handler - The handler function to add.
+     */
+    public async addHook({ type, handler }: { type?: TxmHookType; handler: TxmHookHandler }): Promise<void> {
+        const mapKey = type ?? "All"
+
+        if (!this.hooks[mapKey]) {
+            this.hooks[mapKey] = []
         }
-        this.hooks[type].push(handler)
+        this.hooks[mapKey].push(handler)
     }
 
     private async onTransactionStatusChanged(payload: {
-        intentId: UUID
-        status: TransactionStatus
+        transaction: Transaction
     }): Promise<void> {
-        this.hooks[TxmHookType.TransactionStatusChanged].map((h) =>
+        this.hooks[TxmHookType.TransactionStatusChanged].concat(this.hooks.All).map((h) =>
             h({
                 type: TxmHookType.TransactionStatusChanged,
-                intentId: payload.intentId,
-            }),
-        )
-
-        this.hooks[TxmHookType.All].map((h) =>
-            h({
-                type: TxmHookType.All,
-                intentId: payload.intentId,
+                transaction: payload.transaction,
             }),
         )
     }
diff --git a/packages/transaction-manager/lib/TransactionManager.ts b/packages/transaction-manager/lib/TransactionManager.ts
index 9dda034962..fc3dca7cc7 100644
--- a/packages/transaction-manager/lib/TransactionManager.ts
+++ b/packages/transaction-manager/lib/TransactionManager.ts
@@ -142,8 +142,13 @@ export class TransactionManager {
         this.collectors.push(collector)
     }
 
-    public async addHook(type: TxmHookType, handler: TxmHookHandler): Promise<void> {
-        await this.hookManager.addHook(type, handler)
+    /**
+     * Adds a hook to the hook manager.
+     * @param type - The type of hook to add. Defaults to All.
+     * @param handler - The handler function to add.
+     */
+    public async addHook(payload: { type?: TxmHookType; handler: TxmHookHandler }): Promise<void> {
+        await this.hookManager.addHook(payload)
     }
 
     public async getTransaction(txIntentId: UUID): Promise<Transaction | undefined> {

From da5fcf678a5ddd13085492c16e7b2ace2fa6fd08 Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Mon, 11 Nov 2024 23:19:23 +0100
Subject: [PATCH 4/9] chore(txm): format

---
 packages/transaction-manager/lib/Transaction.ts           | 2 +-
 packages/transaction-manager/lib/TransactionRepository.ts | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/transaction-manager/lib/Transaction.ts b/packages/transaction-manager/lib/Transaction.ts
index 4d185b8d47..52432166c1 100644
--- a/packages/transaction-manager/lib/Transaction.ts
+++ b/packages/transaction-manager/lib/Transaction.ts
@@ -2,8 +2,8 @@ import { type UUID, bigIntReplacer, bigIntReviver, createUUID } from "@happychai
 import type { Insertable, Selectable } from "kysely"
 import type { Address, ContractFunctionArgs, Hash } from "viem"
 import type { LatestBlock } from "./BlockMonitor"
+import { Topics, eventBus } from "./EventBus.js"
 import type { TransactionTable } from "./db/types.js"
-import { eventBus, Topics } from "./EventBus.js"
 
 export enum TransactionStatus {
     Pending = "Pending",
diff --git a/packages/transaction-manager/lib/TransactionRepository.ts b/packages/transaction-manager/lib/TransactionRepository.ts
index 46ca9e2877..2301115c4a 100644
--- a/packages/transaction-manager/lib/TransactionRepository.ts
+++ b/packages/transaction-manager/lib/TransactionRepository.ts
@@ -1,6 +1,6 @@
 import { unknownToError } from "@happychain/common"
-import { type Result, ResultAsync } from "neverthrow"
 import type { UUID } from "@happychain/common"
+import { type Result, ResultAsync } from "neverthrow"
 import { NotFinalizedStatuses, Transaction } from "./Transaction.js"
 import type { TransactionManager } from "./TransactionManager.js"
 import { db } from "./db/driver.js"
@@ -29,10 +29,10 @@ export class TransactionRepository {
     }
 
     async getTransaction(intentId: UUID): Promise<Transaction | undefined> {
-        const cachedTransaction =  this.notFinalizedTransactions.find((t) => t.intentId === intentId)
+        const cachedTransaction = this.notFinalizedTransactions.find((t) => t.intentId === intentId)
 
         if (cachedTransaction) {
-            return cachedTransaction;
+            return cachedTransaction
         }
 
         const persistedTransaction = await db

From 9abf1ba677162a207802bb7cee8513b474d447d5 Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Tue, 12 Nov 2024 11:05:08 +0100
Subject: [PATCH 5/9] chore(txm): self review

---
 bun.lockb                                     | Bin 997696 -> 997728 bytes
 packages/randomness-service/package.json      |   1 +
 .../src/CommitmentManager.ts                  |   9 ++++--
 packages/randomness-service/src/index.ts      |  29 +++++++++++-------
 packages/randomness-service/tsconfig.json     |   6 +---
 .../transaction-manager/lib/HookManager.ts    |   5 ---
 .../transaction-manager/lib/Transaction.ts    |   3 +-
 .../lib/TransactionCollector.ts               |   5 +--
 .../lib/TransactionManager.ts                 |   2 +-
 packages/transaction-manager/lib/index.ts     |   2 +-
 10 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index 9d4daed6869bd02965aa4e0645677da3e7c32de8..2670ca3a46d0b24ddd75dd04e53c2df691066f3e 100755
GIT binary patch
delta 18157
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
UqulzmxHaAfX5H;ZH;&uzPuqwQ-~a#s

delta 18147
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
R51l2A^MY2m^BPBg`X3CU3&{Wg

diff --git a/packages/randomness-service/package.json b/packages/randomness-service/package.json
index 1a20d42e92..b135403144 100644
--- a/packages/randomness-service/package.json
+++ b/packages/randomness-service/package.json
@@ -7,6 +7,7 @@
     "module": "./dist/index.es.js",
     "dependencies": {
         "@happychain/transaction-manager": "workspace:^",
+        "@happychain/common": "workspace:^",
         "neverthrow": "^8.1.0",
         "viem": "^2.21.53",
         "zod": "^3.23.8"
diff --git a/packages/randomness-service/src/CommitmentManager.ts b/packages/randomness-service/src/CommitmentManager.ts
index bacc5059bf..91c01f801d 100644
--- a/packages/randomness-service/src/CommitmentManager.ts
+++ b/packages/randomness-service/src/CommitmentManager.ts
@@ -1,23 +1,28 @@
 import crypto from "node:crypto"
+import type { UUID } from "@happychain/common"
 import type { Hex } from "viem"
 import { encodePacked, keccak256 } from "viem"
 
 interface Commitment {
     value: bigint
     commitment: Hex
+    transactionIntentId: UUID
 }
 
 export class CommitmentManager {
     private readonly map = new Map<bigint, Commitment>()
 
-    generateCommitmentForTimestamp(timestamp: bigint): Commitment {
+    generateCommitmentForTimestamp(): Omit<Commitment, "transactionIntentId"> {
         const value = this.generateRandomness()
         const commitment = this.hashValue(value)
         const commitmentObject = { value, commitment }
-        this.map.set(timestamp, commitmentObject)
         return commitmentObject
     }
 
+    setCommitmentForTimestamp(timestamp: bigint, commitment: Commitment): void {
+        this.map.set(timestamp, commitment)
+    }
+
     getCommitmentForTimestamp(timestamp: bigint): Commitment | undefined {
         return this.map.get(timestamp)
     }
diff --git a/packages/randomness-service/src/index.ts b/packages/randomness-service/src/index.ts
index 1ae2c66287..e526796e07 100644
--- a/packages/randomness-service/src/index.ts
+++ b/packages/randomness-service/src/index.ts
@@ -1,4 +1,4 @@
-import { TransactionManager, TxmHookType } from "@happychain/transaction-manager"
+import { TransactionManager, TransactionStatus } from "@happychain/transaction-manager"
 import type { LatestBlock, Transaction } from "@happychain/transaction-manager"
 import { webSocket } from "viem"
 import { privateKeyToAccount } from "viem/accounts"
@@ -34,17 +34,14 @@ class RandomnessService {
 
         this.txm.start()
         this.txm.addTransactionCollector(this.onCollectTransactions.bind(this))
-        this.txm.addHook(TxmHookType.TransactionStatusChanged, (event) => {
-            console.log(event)
-        })
     }
 
-    private onCollectTransactions(block: LatestBlock): Transaction[] {
+    private async onCollectTransactions(block: LatestBlock): Promise<Transaction[]> {
         const transactions: Transaction[] = []
 
         // We try to commit the ramdomness POST_COMMIT_MARGIN to be safe that the transaction is included before the PRECOMMIT_DELAY
         const commitmentTimestamp = block.timestamp + env.PRECOMMIT_DELAY + env.POST_COMMIT_MARGIN
-        const commitment = this.commitmentManager.generateCommitmentForTimestamp(commitmentTimestamp)
+        const commitment = this.commitmentManager.generateCommitmentForTimestamp()
 
         const commitmentTransaction = this.commitmentTransactionFactory.create(
             commitmentTimestamp,
@@ -53,14 +50,24 @@ class RandomnessService {
 
         transactions.push(commitmentTransaction)
 
+        this.commitmentManager.setCommitmentForTimestamp(commitmentTimestamp, {
+            ...commitment,
+            transactionIntentId: commitmentTransaction.intentId,
+        })
+
         const revealValueCommitment = this.commitmentManager.getCommitmentForTimestamp(block.timestamp + env.TIME_BLOCK)
 
         if (revealValueCommitment) {
-            const revealValueTransaction = this.revealValueTransactionFactory.create(
-                block.timestamp + env.TIME_BLOCK,
-                revealValueCommitment.value,
-            )
-            transactions.push(revealValueTransaction)
+            const transaction = await this.txm.getTransaction(revealValueCommitment.transactionIntentId)
+
+            if (transaction?.status === TransactionStatus.Success) {
+                console.log(transaction)
+                const revealValueTransaction = this.revealValueTransactionFactory.create(
+                    block.timestamp + env.TIME_BLOCK,
+                    revealValueCommitment.value,
+                )
+                transactions.push(revealValueTransaction)
+            }
         }
 
         return transactions
diff --git a/packages/randomness-service/tsconfig.json b/packages/randomness-service/tsconfig.json
index 8b56a30c17..4d863df25e 100644
--- a/packages/randomness-service/tsconfig.json
+++ b/packages/randomness-service/tsconfig.json
@@ -1,8 +1,4 @@
 {
     "extends": ["../configs/tsconfig.base.json"],
-    "include": ["*.ts", "src"],
-    "compilerOptions": {
-        "experimentalDecorators": true,
-        "emitDecoratorMetadata": true
-    }
+    "include": ["*.ts", "src"]
 }
diff --git a/packages/transaction-manager/lib/HookManager.ts b/packages/transaction-manager/lib/HookManager.ts
index a8cf431e22..96555278e2 100644
--- a/packages/transaction-manager/lib/HookManager.ts
+++ b/packages/transaction-manager/lib/HookManager.ts
@@ -23,11 +23,6 @@ export class HookManager {
         eventBus.on(Topics.TransactionStatusChanged, this.onTransactionStatusChanged.bind(this))
     }
 
-    /**
-     * Adds a hook to the hook manager.
-     * @param type - The type of hook to add. Defaults to All.
-     * @param handler - The handler function to add.
-     */
     public async addHook({ type, handler }: { type?: TxmHookType; handler: TxmHookHandler }): Promise<void> {
         const mapKey = type ?? "All"
 
diff --git a/packages/transaction-manager/lib/Transaction.ts b/packages/transaction-manager/lib/Transaction.ts
index 52432166c1..bcdd1260c2 100644
--- a/packages/transaction-manager/lib/Transaction.ts
+++ b/packages/transaction-manager/lib/Transaction.ts
@@ -116,8 +116,7 @@ export class Transaction {
         this.status = status
 
         eventBus.emit(Topics.TransactionStatusChanged, {
-            intentId: this.intentId,
-            status,
+            transaction: this,
         })
     }
 
diff --git a/packages/transaction-manager/lib/TransactionCollector.ts b/packages/transaction-manager/lib/TransactionCollector.ts
index 075e090624..d36c038a95 100644
--- a/packages/transaction-manager/lib/TransactionCollector.ts
+++ b/packages/transaction-manager/lib/TransactionCollector.ts
@@ -14,8 +14,9 @@ export class TransactionCollector {
     private async onNewBlock(block: LatestBlock) {
         const { maxFeePerGas, maxPriorityFeePerGas } = this.txmgr.gasPriceOracle.suggestGasForNextBlock()
 
-        const transactionsBatch = this.txmgr.collectors
-            .flatMap((c) => c(block))
+        const transactionUnsorted = await Promise.all(this.txmgr.collectors.map((c) => c(block)))
+        const transactionsBatch = transactionUnsorted
+            .flat()
             .sort((a, b) => (a.deadline ?? Number.POSITIVE_INFINITY) - (b.deadline ?? Number.POSITIVE_INFINITY))
 
         const saveResult = await this.txmgr.transactionRepository.saveTransactions(transactionsBatch)
diff --git a/packages/transaction-manager/lib/TransactionManager.ts b/packages/transaction-manager/lib/TransactionManager.ts
index fc3dca7cc7..5192ad6ad4 100644
--- a/packages/transaction-manager/lib/TransactionManager.ts
+++ b/packages/transaction-manager/lib/TransactionManager.ts
@@ -76,7 +76,7 @@ export type TransactionManagerConfig = {
     gasEstimator?: GasEstimator
 }
 
-export type TransactionOriginator = (block: LatestBlock) => Transaction[]
+export type TransactionOriginator = (block: LatestBlock) => Promise<Transaction[]>
 
 export class TransactionManager {
     public readonly collectors: TransactionOriginator[]
diff --git a/packages/transaction-manager/lib/index.ts b/packages/transaction-manager/lib/index.ts
index f5cec82e01..48451d3dc9 100644
--- a/packages/transaction-manager/lib/index.ts
+++ b/packages/transaction-manager/lib/index.ts
@@ -1,4 +1,4 @@
-export { Transaction } from "./Transaction.js"
+export { Transaction, TransactionStatus } from "./Transaction.js"
 export { TransactionManager } from "./TransactionManager.js"
 export { GasEstimator, EstimateGasErrorCause } from "./GasEstimator.js"
 export type { LatestBlock } from "./BlockMonitor.js"

From c4b5d90d28452ccebec29f55dd1eef8049c70dc9 Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Tue, 12 Nov 2024 11:18:30 +0100
Subject: [PATCH 6/9] chore(txm): remove console.log

---
 packages/randomness-service/src/CommitmentManager.ts | 2 +-
 packages/randomness-service/src/index.ts             | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/randomness-service/src/CommitmentManager.ts b/packages/randomness-service/src/CommitmentManager.ts
index 91c01f801d..901e3dfa48 100644
--- a/packages/randomness-service/src/CommitmentManager.ts
+++ b/packages/randomness-service/src/CommitmentManager.ts
@@ -12,7 +12,7 @@ interface Commitment {
 export class CommitmentManager {
     private readonly map = new Map<bigint, Commitment>()
 
-    generateCommitmentForTimestamp(): Omit<Commitment, "transactionIntentId"> {
+    generateCommitment(): Omit<Commitment, "transactionIntentId"> {
         const value = this.generateRandomness()
         const commitment = this.hashValue(value)
         const commitmentObject = { value, commitment }
diff --git a/packages/randomness-service/src/index.ts b/packages/randomness-service/src/index.ts
index e526796e07..8454fde8d2 100644
--- a/packages/randomness-service/src/index.ts
+++ b/packages/randomness-service/src/index.ts
@@ -41,7 +41,7 @@ class RandomnessService {
 
         // We try to commit the ramdomness POST_COMMIT_MARGIN to be safe that the transaction is included before the PRECOMMIT_DELAY
         const commitmentTimestamp = block.timestamp + env.PRECOMMIT_DELAY + env.POST_COMMIT_MARGIN
-        const commitment = this.commitmentManager.generateCommitmentForTimestamp()
+        const commitment = this.commitmentManager.generateCommitment()
 
         const commitmentTransaction = this.commitmentTransactionFactory.create(
             commitmentTimestamp,
@@ -61,7 +61,6 @@ class RandomnessService {
             const transaction = await this.txm.getTransaction(revealValueCommitment.transactionIntentId)
 
             if (transaction?.status === TransactionStatus.Success) {
-                console.log(transaction)
                 const revealValueTransaction = this.revealValueTransactionFactory.create(
                     block.timestamp + env.TIME_BLOCK,
                     revealValueCommitment.value,

From f5dfbf91e57175a70273cd9fbb5b7afcacb89a87 Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Tue, 12 Nov 2024 11:21:44 +0100
Subject: [PATCH 7/9] chore(txm): added comment

---
 packages/transaction-manager/lib/TransactionManager.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/transaction-manager/lib/TransactionManager.ts b/packages/transaction-manager/lib/TransactionManager.ts
index 5192ad6ad4..95bf4129a8 100644
--- a/packages/transaction-manager/lib/TransactionManager.ts
+++ b/packages/transaction-manager/lib/TransactionManager.ts
@@ -138,6 +138,12 @@ export class TransactionManager {
         this.blockTime = _config.blockTime || 2n
     }
 
+    /**
+     * Adds a collector to the transaction manager.
+     * A collector is a function that returns a list of transactions to be sent in the next block.
+     * It is important that the collector function is as fast as possible to avoid delays when sending transactions to the blockchain
+     * @param collector - The collector to add.
+     */
     public addTransactionCollector(collector: TransactionOriginator): void {
         this.collectors.push(collector)
     }

From 405cc6815993326c1436ab356d312d9d07d106f9 Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Tue, 3 Dec 2024 11:46:46 +0100
Subject: [PATCH 8/9] chore(txm): use function parameters instead of object in
 addHook method

---
 packages/transaction-manager/lib/HookManager.ts        | 2 +-
 packages/transaction-manager/lib/TransactionManager.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/transaction-manager/lib/HookManager.ts b/packages/transaction-manager/lib/HookManager.ts
index 96555278e2..ba1eee3f90 100644
--- a/packages/transaction-manager/lib/HookManager.ts
+++ b/packages/transaction-manager/lib/HookManager.ts
@@ -23,7 +23,7 @@ export class HookManager {
         eventBus.on(Topics.TransactionStatusChanged, this.onTransactionStatusChanged.bind(this))
     }
 
-    public async addHook({ type, handler }: { type?: TxmHookType; handler: TxmHookHandler }): Promise<void> {
+    public async addHook(handler: TxmHookHandler, type?: TxmHookType): Promise<void> {
         const mapKey = type ?? "All"
 
         if (!this.hooks[mapKey]) {
diff --git a/packages/transaction-manager/lib/TransactionManager.ts b/packages/transaction-manager/lib/TransactionManager.ts
index 95bf4129a8..801b5b332a 100644
--- a/packages/transaction-manager/lib/TransactionManager.ts
+++ b/packages/transaction-manager/lib/TransactionManager.ts
@@ -153,8 +153,8 @@ export class TransactionManager {
      * @param type - The type of hook to add. Defaults to All.
      * @param handler - The handler function to add.
      */
-    public async addHook(payload: { type?: TxmHookType; handler: TxmHookHandler }): Promise<void> {
-        await this.hookManager.addHook(payload)
+    public async addHook(handler: TxmHookHandler, type?: TxmHookType): Promise<void> {
+        await this.hookManager.addHook(handler, type)
     }
 
     public async getTransaction(txIntentId: UUID): Promise<Transaction | undefined> {

From a520cec8e3741718ad4f99f52a3acc9c55df67ac Mon Sep 17 00:00:00 2001
From: Gabriel Martinez Rodriguez <gabrielmartinezrdrgz@gmail.com>
Date: Thu, 5 Dec 2024 12:41:27 +0100
Subject: [PATCH 9/9] chore(txm): added All to TxmHookType

---
 .../transaction-manager/lib/HookManager.ts    | 19 +++++++++----------
 .../lib/TransactionManager.ts                 |  4 ++--
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/transaction-manager/lib/HookManager.ts b/packages/transaction-manager/lib/HookManager.ts
index ba1eee3f90..6846062df2 100644
--- a/packages/transaction-manager/lib/HookManager.ts
+++ b/packages/transaction-manager/lib/HookManager.ts
@@ -2,6 +2,7 @@ import { Topics, eventBus } from "./EventBus.js"
 import type { Transaction } from "./Transaction.js"
 
 export enum TxmHookType {
+    All = "All",
     TransactionStatusChanged = "TransactionStatusChanged",
 }
 
@@ -13,29 +14,27 @@ export type TxmHookPayload = {
 export type TxmHookHandler = (event: TxmHookPayload) => void
 
 export class HookManager {
-    private hooks: Record<TxmHookType | "All", TxmHookHandler[]>
+    private hooks: Record<TxmHookType, TxmHookHandler[]>
 
     constructor() {
         this.hooks = {
-            All: [],
-            TransactionStatusChanged: [],
+            [TxmHookType.All]: [],
+            [TxmHookType.TransactionStatusChanged]: [],
         }
         eventBus.on(Topics.TransactionStatusChanged, this.onTransactionStatusChanged.bind(this))
     }
 
-    public async addHook(handler: TxmHookHandler, type?: TxmHookType): Promise<void> {
-        const mapKey = type ?? "All"
-
-        if (!this.hooks[mapKey]) {
-            this.hooks[mapKey] = []
+    public async addHook(handler: TxmHookHandler, type: TxmHookType): Promise<void> {
+        if (!this.hooks[type]) {
+            this.hooks[type] = []
         }
-        this.hooks[mapKey].push(handler)
+        this.hooks[type].push(handler)
     }
 
     private async onTransactionStatusChanged(payload: {
         transaction: Transaction
     }): Promise<void> {
-        this.hooks[TxmHookType.TransactionStatusChanged].concat(this.hooks.All).map((h) =>
+        this.hooks[TxmHookType.TransactionStatusChanged].concat(this.hooks[TxmHookType.All]).map((h) =>
             h({
                 type: TxmHookType.TransactionStatusChanged,
                 transaction: payload.transaction,
diff --git a/packages/transaction-manager/lib/TransactionManager.ts b/packages/transaction-manager/lib/TransactionManager.ts
index 801b5b332a..d3f790cca6 100644
--- a/packages/transaction-manager/lib/TransactionManager.ts
+++ b/packages/transaction-manager/lib/TransactionManager.ts
@@ -150,10 +150,10 @@ export class TransactionManager {
 
     /**
      * Adds a hook to the hook manager.
-     * @param type - The type of hook to add. Defaults to All.
+     * @param type - The type of hook to add.
      * @param handler - The handler function to add.
      */
-    public async addHook(handler: TxmHookHandler, type?: TxmHookType): Promise<void> {
+    public async addHook(handler: TxmHookHandler, type: TxmHookType): Promise<void> {
         await this.hookManager.addHook(handler, type)
     }