diff --git a/yarn-project/circuit-types/src/tx_execution_request.ts b/yarn-project/circuit-types/src/tx_execution_request.ts index ea633eabb33..bdd90e28550 100644 --- a/yarn-project/circuit-types/src/tx_execution_request.ts +++ b/yarn-project/circuit-types/src/tx_execution_request.ts @@ -144,6 +144,6 @@ export class TxExecutionRequest { } [inspect.custom]() { - return `TxExecutionRequest(${this.functionSelector}(${this.argsOfCalls.map(arg => arg.toString()).join(', ')}))`; + return `TxExecutionRequest(${this.origin} called ${this.functionSelector})`; } } diff --git a/yarn-project/end-to-end/src/spartan/utils.ts b/yarn-project/end-to-end/src/spartan/utils.ts index 10d8c6829f8..3152de9c53d 100644 --- a/yarn-project/end-to-end/src/spartan/utils.ts +++ b/yarn-project/end-to-end/src/spartan/utils.ts @@ -355,8 +355,8 @@ export async function awaitL2BlockNumber( await sleep(1000); tips = await rollupCheatCodes.getTips(); } - if (Date.now() >= endTime) { - throw new Error(`Timeout waiting for L2 Block ${blockNumber}`); + if (tips.pending < blockNumber) { + throw new Error(`Timeout waiting for L2 Block ${blockNumber}, only reached ${tips.pending}`); } else { logger.info(`Reached L2 Block ${tips.pending}`); }