@aztec/sequencer-client 0.1.0-alpha23 → 0.1.0-alpha40

package/src/config.ts

@@ -1,7 +1,9 @@
-import { SequencerConfig } from './sequencer/config.js';
-import { PublisherConfig, TxSenderConfig } from './publisher/config.js';
+import { PrivateKey } from '@aztec/circuits.js';
 import { EthAddress } from '@aztec/foundation/eth-address';
+
 import { GlobalReaderConfig } from './global_variable_builder/index.js';
+import { PublisherConfig, TxSenderConfig } from './publisher/config.js';
+import { SequencerConfig } from './sequencer/config.js';
 
 /**
  * Configuration settings for the SequencerClient.
@@ -19,8 +21,8 @@ export function getConfigEnvVars(): SequencerClientConfig {
     VERSION,
     API_KEY,
     SEQ_REQUIRED_CONFS,
-    SEQ_RETRY_INTERVAL,
-    SEQ_TX_POLLING_INTERVAL,
+    SEQ_PUBLISH_RETRY_INTERVAL_MS,
+    SEQ_TX_POLLING_INTERVAL_MS,
     SEQ_MAX_TX_PER_BLOCK,
     SEQ_MIN_TX_PER_BLOCK,
     ROLLUP_CONTRACT_ADDRESS,
@@ -34,14 +36,16 @@ export function getConfigEnvVars(): SequencerClientConfig {
     version: VERSION ? +VERSION : 1, // 1 is our default version
     apiKey: API_KEY,
     requiredConfirmations: SEQ_REQUIRED_CONFS ? +SEQ_REQUIRED_CONFS : 1,
-    retryIntervalMs: SEQ_RETRY_INTERVAL ? +SEQ_RETRY_INTERVAL : 1_000,
-    transactionPollingInterval: SEQ_TX_POLLING_INTERVAL ? +SEQ_TX_POLLING_INTERVAL : 1_000,
+    l1BlockPublishRetryIntervalMS: SEQ_PUBLISH_RETRY_INTERVAL_MS ? +SEQ_PUBLISH_RETRY_INTERVAL_MS : 1_000,
+    transactionPollingIntervalMS: SEQ_TX_POLLING_INTERVAL_MS ? +SEQ_TX_POLLING_INTERVAL_MS : 1_000,
     rollupContract: ROLLUP_CONTRACT_ADDRESS ? EthAddress.fromString(ROLLUP_CONTRACT_ADDRESS) : EthAddress.ZERO,
     inboxContract: INBOX_CONTRACT_ADDRESS ? EthAddress.fromString(INBOX_CONTRACT_ADDRESS) : EthAddress.ZERO,
     contractDeploymentEmitterContract: CONTRACT_DEPLOYMENT_EMITTER_ADDRESS
       ? EthAddress.fromString(CONTRACT_DEPLOYMENT_EMITTER_ADDRESS)
       : EthAddress.ZERO,
-    publisherPrivateKey: Buffer.from(SEQ_PUBLISHER_PRIVATE_KEY || '', 'hex'),
+    publisherPrivateKey: SEQ_PUBLISHER_PRIVATE_KEY
+      ? PrivateKey.fromString(SEQ_PUBLISHER_PRIVATE_KEY)
+      : new PrivateKey(Buffer.alloc(32)),
     maxTxsPerBlock: SEQ_MAX_TX_PER_BLOCK ? +SEQ_MAX_TX_PER_BLOCK : 32,
     minTxsPerBlock: SEQ_MIN_TX_PER_BLOCK ? +SEQ_MIN_TX_PER_BLOCK : 1,
   };

package/src/global_variable_builder/global_builder.ts

@@ -5,8 +5,20 @@ import { createDebugLogger } from '@aztec/foundation/log';
  * Reads values from L1 state that is used for the global values.
  */
 export interface L1GlobalReader {
+  /**
+   * Fetches the last timestamp that a block was processed by the contract.
+   * @returns The last timestamp that a block was processed by the contract.
+   */
   getLastTimestamp(): Promise<bigint>;
+  /**
+   * Fetches the version of the rollup contract.
+   * @returns The version of the rollup contract.
+   */
   getVersion(): Promise<bigint>;
+  /**
+   * Gets the chain id.
+   * @returns The chain id.
+   */
   getChainId(): Promise<bigint>;
 }
 
@@ -14,6 +26,11 @@ export interface L1GlobalReader {
  * Builds global variables from L1 state.
  */
 export interface GlobalVariableBuilder {
+  /**
+   * Builds global variables.
+   * @param blockNumber - The block number to build global variables for.
+   * @returns The global variables for the given block number.
+   */
   buildGlobalVariables(blockNumber: Fr): Promise<GlobalVariables>;
 }
 

package/src/global_variable_builder/viem-reader.ts

@@ -1,15 +1,17 @@
 import { createEthereumChain } from '@aztec/ethereum';
 import { RollupAbi } from '@aztec/l1-artifacts';
+
 import {
   GetContractReturnType,
-  PublicClient,
   HttpTransport,
+  PublicClient,
   createPublicClient,
-  http,
-  getContract,
   getAddress,
+  getContract,
+  http,
 } from 'viem';
 import * as chains from 'viem/chains';
+
 import { GlobalReaderConfig } from './config.js';
 import { L1GlobalReader } from './global_builder.js';
 
@@ -37,26 +39,14 @@ export class ViemReader implements L1GlobalReader {
     });
   }
 
-  /**
-   * Fetches the last timestamp that a block was processed by the contract.
-   * @returns The last timestamp that a block was processed by the contract.
-   */
   public async getLastTimestamp(): Promise<bigint> {
     return BigInt(await this.rollupContract.read.lastBlockTs());
   }
 
-  /**
-   * Fetches the version of the rollup contract.
-   * @returns The version of the rollup contract.
-   */
   public async getVersion(): Promise<bigint> {
     return BigInt(await this.rollupContract.read.VERSION());
   }
 
-  /**
-   * Gets the chain id.
-   * @returns The chain id.
-   */
   public async getChainId(): Promise<bigint> {
     return await Promise.resolve(BigInt(this.publicClient.chain.id));
   }

package/src/prover/empty.ts

@@ -10,6 +10,7 @@ import {
   RootRollupInputs,
   RootRollupPublicInputs,
 } from '@aztec/circuits.js';
+
 import { PublicProver, RollupProver } from './index.js';
 
 const EMPTY_PROOF_SIZE = 42;

package/src/prover/index.ts

@@ -13,8 +13,25 @@ import {
  * Generates proofs for the base, merge, and root rollup circuits.
  */
 export interface RollupProver {
+  /**
+   * Creates a proof for the given input.
+   * @param input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
   getBaseRollupProof(input: BaseRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof>;
+
+  /**
+   * Creates a proof for the given input.
+   * @param input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
   getMergeRollupProof(input: MergeRollupInputs, publicInputs: BaseOrMergeRollupPublicInputs): Promise<Proof>;
+
+  /**
+   * Creates a proof for the given input.
+   * @param input - Input to the circuit.
+   * @param publicInputs - Public inputs of the circuit obtained via simulation, modified by this call.
+   */
   getRootRollupProof(input: RootRollupInputs, publicInputs: RootRollupPublicInputs): Promise<Proof>;
 }
 
@@ -22,6 +39,15 @@ export interface RollupProver {
  * Generates proofs for the public and public kernel circuits.
  */
 export interface PublicProver {
+  /**
+   * Creates a proof for the given input.
+   * @param publicInputs - Public inputs obtained via simulation.
+   */
   getPublicCircuitProof(publicInputs: PublicCircuitPublicInputs): Promise<Proof>;
+
+  /**
+   * Creates a proof for the given input.
+   * @param publicInputs - Public inputs obtained via simulation.
+   */
   getPublicKernelCircuitProof(publicInputs: PublicKernelPublicInputs): Promise<Proof>;
 }

package/src/publisher/config.ts

@@ -1,3 +1,4 @@
+import { PrivateKey } from '@aztec/circuits.js';
 import { L1Addresses } from '@aztec/types';
 
 /**
@@ -7,7 +8,7 @@ export interface TxSenderConfig extends L1Addresses {
   /**
    * The private key to be used by the publisher.
    */
-  publisherPrivateKey: Buffer;
+  publisherPrivateKey: PrivateKey;
 
   /**
    * The RPC Url of the ethereum host.
@@ -32,5 +33,5 @@ export interface PublisherConfig {
   /**
    * The interval to wait between publish retries.
    */
-  retryIntervalMs: number;
+  l1BlockPublishRetryIntervalMS: number;
 }

package/src/publisher/l1-publisher.test.ts

@@ -1,5 +1,6 @@
 import { L2Block } from '@aztec/types';
-import { mock, MockProxy } from 'jest-mock-extended';
+
+import { MockProxy, mock } from 'jest-mock-extended';
 
 import { sleep } from '../utils.js';
 import { L1Publisher, L1PublisherTxSender, MinimalTransactionReceipt } from './l1-publisher.js';
@@ -24,7 +25,7 @@ describe('L1Publisher', () => {
     txSender.sendProcessTx.mockResolvedValueOnce(txHash);
     txSender.getTransactionReceipt.mockResolvedValueOnce(txReceipt);
 
-    publisher = new L1Publisher(txSender, { retryIntervalMs: 1 });
+    publisher = new L1Publisher(txSender, { l1BlockPublishRetryIntervalMS: 1 });
   });
 
   it('publishes l2 block to l1', async () => {

package/src/publisher/l1-publisher.ts

@@ -1,9 +1,9 @@
-import { ContractPublicData, L2Block } from '@aztec/types';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { InterruptableSleep } from '@aztec/foundation/sleep';
+import { ContractDataAndBytecode, L2Block } from '@aztec/types';
 
 import { L2BlockReceiver } from '../receiver.js';
 import { PublisherConfig } from './config.js';
-import { InterruptableSleep } from '@aztec/foundation/sleep';
-import { createDebugLogger } from '@aztec/foundation/log';
 
 /**
  * Minimal information from a tx receipt returned by an L1PublisherTxSender.
@@ -40,7 +40,7 @@ export interface L1PublisherTxSender {
   sendEmitContractDeploymentTx(
     l2BlockNum: number,
     l2BlockHash: Buffer,
-    contractData: ContractPublicData[],
+    contractData: ContractDataAndBytecode[],
   ): Promise<(string | undefined)[]>;
 
   /**
@@ -90,7 +90,7 @@ export class L1Publisher implements L2BlockReceiver {
   private log = createDebugLogger('aztec:sequencer');
 
   constructor(private txSender: L1PublisherTxSender, config?: PublisherConfig) {
-    this.sleepTimeMs = config?.retryIntervalMs ?? 60_000;
+    this.sleepTimeMs = config?.l1BlockPublishRetryIntervalMS ?? 60_000;
   }
 
   /**
@@ -139,8 +139,12 @@ export class L1Publisher implements L2BlockReceiver {
    * @param contractData - The new contract data to publish.
    * @returns True once the tx has been confirmed and is successful, false on revert or interrupt, blocks otherwise.
    */
-  public async processNewContractData(l2BlockNum: number, l2BlockHash: Buffer, contractData: ContractPublicData[]) {
-    let _contractData: ContractPublicData[] = [];
+  public async processNewContractData(
+    l2BlockNum: number,
+    l2BlockHash: Buffer,
+    contractData: ContractDataAndBytecode[],
+  ) {
+    let _contractData: ContractDataAndBytecode[] = [];
     while (!this.interrupted) {
       if (!(await this.checkFeeDistributorBalance())) {
         this.log(`Fee distributor ETH balance too low, awaiting top up...`);
@@ -187,12 +191,14 @@ export class L1Publisher implements L2BlockReceiver {
   }
 
   // TODO: Check fee distributor has at least 0.5 ETH.
+  // Related to https://github.com/AztecProtocol/aztec-packages/issues/1588
   // eslint-disable-next-line require-await
   private async checkFeeDistributorBalance(): Promise<boolean> {
     return true;
   }
 
   // TODO: Fail if blockchainStatus.nextBlockNum > thisBlockNum.
+  // Related to https://github.com/AztecProtocol/aztec-packages/issues/1588
   private checkNextL2BlockNum(_thisBlockNum: number): Promise<boolean> {
     return Promise.resolve(true);
   }
@@ -208,7 +214,11 @@ export class L1Publisher implements L2BlockReceiver {
     }
   }
 
-  private async sendEmitNewContractDataTx(l2BlockNum: number, l2BlockHash: Buffer, contractData: ContractPublicData[]) {
+  private async sendEmitNewContractDataTx(
+    l2BlockNum: number,
+    l2BlockHash: Buffer,
+    contractData: ContractDataAndBytecode[],
+  ) {
     while (!this.interrupted) {
       try {
         return await this.txSender.sendEmitContractDeploymentTx(l2BlockNum, l2BlockHash, contractData);

package/src/publisher/viem-tx-sender.ts

@@ -1,6 +1,7 @@
-import { TxSenderConfig } from './config.js';
-import { L1ProcessArgs as ProcessTxArgs, L1PublisherTxSender, MinimalTransactionReceipt } from './l1-publisher.js';
-import { ContractPublicData } from '@aztec/types';
+import { createEthereumChain } from '@aztec/ethereum';
+import { createDebugLogger } from '@aztec/foundation/log';
+import { ContractDeploymentEmitterAbi, RollupAbi } from '@aztec/l1-artifacts';
+import { ContractDataAndBytecode } from '@aztec/types';
 
 import {
   GetContractReturnType,
@@ -14,11 +15,11 @@ import {
   getContract,
   http,
 } from 'viem';
-import { RollupAbi, ContractDeploymentEmitterAbi } from '@aztec/l1-artifacts';
 import { PrivateKeyAccount, privateKeyToAccount } from 'viem/accounts';
 import * as chains from 'viem/chains';
-import { createDebugLogger } from '@aztec/foundation/log';
-import { createEthereumChain } from '@aztec/ethereum';
+
+import { TxSenderConfig } from './config.js';
+import { L1PublisherTxSender, MinimalTransactionReceipt, L1ProcessArgs as ProcessTxArgs } from './l1-publisher.js';
 
 /**
  * Pushes transactions to the L1 rollup contract using viem.
@@ -48,7 +49,7 @@ export class ViemTxSender implements L1PublisherTxSender {
       contractDeploymentEmitterContract: contractDeploymentEmitterContractAddress,
     } = config;
     const chain = createEthereumChain(rpcUrl, apiKey);
-    this.account = privateKeyToAccount(`0x${publisherPrivateKey.toString('hex')}`);
+    this.account = privateKeyToAccount(`0x${publisherPrivateKey.toString()}`);
     const walletClient = createWalletClient({
       account: this.account,
       chain: chain.chainInfo,
@@ -119,22 +120,22 @@ export class ViemTxSender implements L1PublisherTxSender {
    * Sends a tx to the contract deployment emitter contract with contract deployment data such as bytecode. Returns once the tx has been mined.
    * @param l2BlockNum - Number of the L2 block that owns this encrypted logs.
    * @param l2BlockHash - The hash of the block corresponding to this data.
-   * @param newContractData - Data to publish.
+   * @param newContractDataAndBytecode - Data to publish.
    * @returns The hash of the mined tx.
    */
   async sendEmitContractDeploymentTx(
     l2BlockNum: number,
     l2BlockHash: Buffer,
-    newContractData: ContractPublicData[],
+    newContractDataAndBytecode: ContractDataAndBytecode[],
   ): Promise<(string | undefined)[]> {
     const hashes: string[] = [];
-    for (const contractPublicData of newContractData) {
+    for (const contractDataAndBytecode of newContractDataAndBytecode) {
       const args = [
         BigInt(l2BlockNum),
-        contractPublicData.contractData.contractAddress.toString() as Hex,
-        contractPublicData.contractData.portalContractAddress.toString() as Hex,
+        contractDataAndBytecode.contractData.contractAddress.toString() as Hex,
+        contractDataAndBytecode.contractData.portalContractAddress.toString() as Hex,
         `0x${l2BlockHash.toString('hex')}`,
-        `0x${contractPublicData.bytecode.toString('hex')}`,
+        `0x${contractDataAndBytecode.bytecode.toString('hex')}`,
       ] as const;
 
       const gas = await this.contractDeploymentEmitterContract.estimateGas.emitContractDeployment(args, {

package/src/sequencer/config.ts

@@ -5,7 +5,7 @@ export interface SequencerConfig {
   /**
    * The number of ms to wait between polling for pending txs.
    */
-  transactionPollingInterval?: number;
+  transactionPollingIntervalMS?: number;
   /**
    * The maximum number of txs to include in a block.
    */

package/src/sequencer/processed_tx.ts

@@ -1,4 +1,4 @@
-import { KernelCircuitPublicInputs, Proof, CombinedHistoricTreeRoots, makeEmptyProof, Fr } from '@aztec/circuits.js';
+import { Fr, HistoricBlockData, KernelCircuitPublicInputs, Proof, makeEmptyProof } from '@aztec/circuits.js';
 import { Tx, TxHash, TxL2Logs } from '@aztec/types';
 
 /**
@@ -60,12 +60,12 @@ export async function makeProcessedTx(
  * @returns A processed empty tx.
  */
 export function makeEmptyProcessedTx(
-  historicTreeRoots: CombinedHistoricTreeRoots,
+  historicTreeRoots: HistoricBlockData,
   chainId: Fr,
   version: Fr,
 ): Promise<ProcessedTx> {
   const emptyKernelOutput = KernelCircuitPublicInputs.empty();
-  emptyKernelOutput.constants.historicTreeRoots = historicTreeRoots;
+  emptyKernelOutput.constants.blockData = historicTreeRoots;
   emptyKernelOutput.constants.txContext.chainId = chainId;
   emptyKernelOutput.constants.txContext.version = version;
   const emptyProof = makeEmptyProof();

package/src/sequencer/public_processor.test.ts

@@ -1,12 +1,14 @@
 import { PublicExecution, PublicExecutionResult, PublicExecutor } from '@aztec/acir-simulator';
 import {
   ARGS_LENGTH,
+  AztecAddress,
   CallContext,
   CircuitsWasm,
   EthAddress,
   Fr,
   FunctionData,
   GlobalVariables,
+  HistoricBlockData,
   MAX_PRIVATE_CALL_STACK_LENGTH_PER_TX,
   MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX,
   PUBLIC_DATA_TREE_HEIGHT,
@@ -23,21 +25,23 @@ import {
   makeSelector,
 } from '@aztec/circuits.js/factories';
 import { padArrayEnd } from '@aztec/foundation/collection';
-import { SiblingPath } from '@aztec/merkle-tree';
 import {
+  ContractDataAndBytecode,
   ContractDataSource,
-  ContractPublicData,
   EncodedContractFunction,
-  ExecutionRequest,
+  FunctionCall,
   FunctionL2Logs,
-  mockTx,
+  SiblingPath,
   Tx,
   TxL2Logs,
+  mockTx,
 } from '@aztec/types';
 import { MerkleTreeOperations, TreeInfo } from '@aztec/world-state';
+
 import { MockProxy, mock } from 'jest-mock-extended';
 import pick from 'lodash.pick';
 import times from 'lodash.times';
+
 import { PublicProver } from '../prover/index.js';
 import { PublicKernelCircuitSimulator } from '../simulator/index.js';
 import { WasmPublicKernelCircuitSimulator } from '../simulator/public_kernel.js';
@@ -50,7 +54,7 @@ describe('public_processor', () => {
   let contractDataSource: MockProxy<ContractDataSource>;
 
   let publicFunction: EncodedContractFunction;
-  let contractData: ContractPublicData;
+  let contractData: ContractDataAndBytecode;
   let proof: Proof;
   let root: Buffer;
 
@@ -62,7 +66,7 @@ describe('public_processor', () => {
     publicProver = mock<PublicProver>();
     contractDataSource = mock<ContractDataSource>();
 
-    contractData = ContractPublicData.random();
+    contractData = ContractDataAndBytecode.random();
     publicFunction = EncodedContractFunction.random();
     proof = makeEmptyProof();
     root = Buffer.alloc(32, 5);
@@ -70,7 +74,7 @@ describe('public_processor', () => {
     publicProver.getPublicCircuitProof.mockResolvedValue(proof);
     publicProver.getPublicKernelCircuitProof.mockResolvedValue(proof);
     db.getTreeInfo.mockResolvedValue({ root } as TreeInfo);
-    contractDataSource.getL2ContractPublicData.mockResolvedValue(contractData);
+    contractDataSource.getContractDataAndBytecode.mockResolvedValue(contractData);
     contractDataSource.getPublicFunction.mockResolvedValue(publicFunction);
   });
 
@@ -79,14 +83,22 @@ describe('public_processor', () => {
 
     beforeEach(() => {
       publicKernel = mock<PublicKernelCircuitSimulator>();
-      processor = new PublicProcessor(db, publicExecutor, publicKernel, publicProver, contractDataSource);
+      processor = new PublicProcessor(
+        db,
+        publicExecutor,
+        publicKernel,
+        publicProver,
+        contractDataSource,
+        GlobalVariables.empty(),
+        HistoricBlockData.empty(),
+      );
     });
 
     it('skips txs without public execution requests', async function () {
       const tx = mockTx();
       tx.data.end.publicCallStack = makeTuple(MAX_PUBLIC_CALL_STACK_LENGTH_PER_TX, Fr.zero);
       const hash = await tx.getTxHash();
-      const [processed, failed] = await processor.process([tx], GlobalVariables.empty());
+      const [processed, failed] = await processor.process([tx]);
 
       expect(processed).toEqual([
         { isEmpty: false, hash, ...pick(tx, 'data', 'proof', 'encryptedLogs', 'unencryptedLogs') },
@@ -98,7 +110,7 @@ describe('public_processor', () => {
       publicExecutor.execute.mockRejectedValue(new Error(`Failed`));
 
       const tx = mockTx();
-      const [processed, failed] = await processor.process([tx], GlobalVariables.empty());
+      const [processed, failed] = await processor.process([tx]);
 
       expect(processed).toEqual([]);
       expect(failed).toEqual([tx]);
@@ -117,7 +129,15 @@ describe('public_processor', () => {
       const path = times(PUBLIC_DATA_TREE_HEIGHT, i => Buffer.alloc(32, i));
       db.getSiblingPath.mockResolvedValue(new SiblingPath<number>(PUBLIC_DATA_TREE_HEIGHT, path));
       publicKernel = new WasmPublicKernelCircuitSimulator();
-      processor = new PublicProcessor(db, publicExecutor, publicKernel, publicProver, contractDataSource);
+      processor = new PublicProcessor(
+        db,
+        publicExecutor,
+        publicKernel,
+        publicProver,
+        contractDataSource,
+        GlobalVariables.empty(),
+        HistoricBlockData.empty(),
+      );
     });
 
     const expectedTxByHash = async (tx: Tx) =>
@@ -146,7 +166,7 @@ describe('public_processor', () => {
         throw new Error(`Unexpected execution request: ${execution}`);
       });
 
-      const [processed, failed] = await processor.process([tx], GlobalVariables.empty());
+      const [processed, failed] = await processor.process([tx]);
 
       expect(processed).toHaveLength(1);
       expect(processed).toEqual([await expectedTxByHash(tx)]);
@@ -167,16 +187,15 @@ describe('public_processor', () => {
 
       const publicExecutionResult = makePublicExecutionResultFromRequest(callRequest);
       publicExecutionResult.nestedExecutions = [
-        makePublicExecutionResult({
-          from: publicExecutionResult.execution.contractAddress,
+        makePublicExecutionResult(publicExecutionResult.execution.contractAddress, {
           to: makeAztecAddress(30),
-          functionData: new FunctionData(makeSelector(5), false, false),
+          functionData: new FunctionData(makeSelector(5), false, false, false),
           args: new Array(ARGS_LENGTH).fill(Fr.ZERO),
         }),
       ];
       publicExecutor.execute.mockResolvedValue(publicExecutionResult);
 
-      const [processed, failed] = await processor.process([tx], GlobalVariables.empty());
+      const [processed, failed] = await processor.process([tx]);
 
       expect(processed).toHaveLength(1);
       expect(processed).toEqual([await expectedTxByHash(tx)]);
@@ -201,10 +220,11 @@ function makePublicExecutionResultFromRequest(item: PublicCallRequest): PublicEx
 }
 
 function makePublicExecutionResult(
-  tx: ExecutionRequest,
+  from: AztecAddress,
+  tx: FunctionCall,
   nestedExecutions: PublicExecutionResult[] = [],
 ): PublicExecutionResult {
-  const callContext = new CallContext(tx.from, tx.to, EthAddress.ZERO, false, false, false);
+  const callContext = new CallContext(from, tx.to, EthAddress.ZERO, false, false, false);
   const execution: PublicExecution = {
     callContext,
     contractAddress: tx.to,