chore: Delete ContractData (#5258)

Deletes the ContractData struct, in favor of using contract instances.
AztecProtocol · Mar 15, 2024 · e516f9b · e516f9b
1 parent 544e278
commit e516f9b
Show file tree

Hide file tree

Showing 29 changed files with 75 additions and 254 deletions.
diff --git a/yarn-project/archiver/src/archiver/archiver.ts b/yarn-project/archiver/src/archiver/archiver.ts
@@ -1,6 +1,4 @@
 import {
-  ContractData,
-  ContractDataSource,
   GetUnencryptedLogsResponse,
   L1ToL2Message,
   L1ToL2MessageSource,
@@ -25,7 +23,12 @@ import { DebugLogger, createDebugLogger } from '@aztec/foundation/log';
 import { RunningPromise } from '@aztec/foundation/running-promise';
 import { RollupAbi } from '@aztec/l1-artifacts';
 import { ClassRegistererAddress } from '@aztec/protocol-contracts/class-registerer';
-import { ContractClassPublic, ContractInstanceWithAddress, PublicFunction } from '@aztec/types/contracts';
+import {
+  ContractClassPublic,
+  ContractDataSource,
+  ContractInstanceWithAddress,
+  PublicFunction,
+} from '@aztec/types/contracts';
 
 import { Chain, HttpTransport, PublicClient, createPublicClient, getAddress, getContract, http } from 'viem';
 
@@ -423,29 +426,6 @@ export class Archiver implements ArchiveSource {
     return this.store.getSettledTxReceipt(txHash);
   }
 
-  /**
-   * Lookup the contract data for this contract.
-   * Contains contract address & the ethereum portal address.
-   * @param contractAddress - The contract data address.
-   * @returns ContractData with the portal address (if we didn't throw an error).
-   */
-  public getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return this.makeContractDataFor(contractAddress);
-  }
-
-  /**
-   * Temporary method for creating a fake contract data out of classes and instances registered in the node.
-   * Used as a fallback if the extended contract data is not found.
-   */
-  private async makeContractDataFor(address: AztecAddress): Promise<ContractData | undefined> {
-    const instance = await this.store.getContractInstance(address);
-    if (!instance) {
-      return undefined;
-    }
-
-    return new ContractData(address, instance.portalContractAddress);
-  }
-
   /**
    * Gets the public function data for a contract.
    * @param address - The contract address containing the function to fetch.

diff --git a/yarn-project/archiver/src/rpc/archiver_client.ts b/yarn-project/archiver/src/rpc/archiver_client.ts
@@ -1,5 +1,4 @@
 import {
-  ContractData,
   ExtendedUnencryptedL2Log,
   L1ToL2Message,
   L2Block,
@@ -16,7 +15,6 @@ export const createArchiverClient = (url: string, fetch = makeFetch([1, 2, 3], t
   createJsonRpcClient<ArchiveSource>(
     url,
     {
-      ContractData,
       EthAddress,
       ExtendedUnencryptedL2Log,
       Fr,

diff --git a/yarn-project/archiver/src/rpc/archiver_server.ts b/yarn-project/archiver/src/rpc/archiver_server.ts
@@ -1,5 +1,4 @@
 import {
-  ContractData,
   ExtendedUnencryptedL2Log,
   L1ToL2Message,
   L2Block,
@@ -22,7 +21,6 @@ export function createArchiverRpcServer(archiverService: Archiver): JsonRpcServe
   return new JsonRpcServer(
     archiverService,
     {
-      ContractData,
       EthAddress,
       ExtendedUnencryptedL2Log,
       Fr,

diff --git a/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts b/yarn-project/aztec-node/src/aztec-node/http_rpc_server.ts
@@ -1,6 +1,5 @@
 import {
   AztecNode,
-  ContractData,
   ExtendedUnencryptedL2Log,
   L1ToL2MessageAndIndex,
   L2Block,
@@ -31,7 +30,6 @@ export function createAztecNodeRpcServer(node: AztecNode) {
       AztecAddress,
       EthAddress,
       ExtendedUnencryptedL2Log,
-      ContractData,
       Fr,
       FunctionSelector,
       Header,

diff --git a/yarn-project/aztec-node/src/aztec-node/server.ts b/yarn-project/aztec-node/src/aztec-node/server.ts
@@ -1,8 +1,6 @@
 import { ArchiveSource, Archiver, KVArchiverDataStore, createArchiverClient } from '@aztec/archiver';
 import {
   AztecNode,
-  ContractData,
-  ContractDataSource,
   GetUnencryptedLogsResponse,
   L1ToL2MessageAndIndex,
   L1ToL2MessageSource,
@@ -54,7 +52,7 @@ import {
   getGlobalVariableBuilder,
   partitionReverts,
 } from '@aztec/sequencer-client';
-import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
+import { ContractClassPublic, ContractDataSource, ContractInstanceWithAddress } from '@aztec/types/contracts';
 import {
   MerkleTrees,
   ServerWorldStateSynchronizer,
@@ -231,16 +229,6 @@ export class AztecNodeService implements AztecNode {
     return Promise.resolve(this.chainId);
   }
 
-  /**
-   * Lookup the contract data for this contract.
-   * Contains the ethereum portal address .
-   * @param contractAddress - The contract data address.
-   * @returns The contract's address & portal address.
-   */
-  public async getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return await this.contractDataSource.getContractData(contractAddress);
-  }
-
   public getContractClass(id: Fr): Promise<ContractClassPublic | undefined> {
     return this.contractDataSource.getContractClass(id);
   }

diff --git a/yarn-project/aztec.js/src/index.ts b/yarn-project/aztec.js/src/index.ts
@@ -41,7 +41,6 @@ export {
   AztecAddressLike,
   FunctionSelectorLike,
   WrappedFieldLike,
-  isContractDeployed,
   EthCheatCodes,
   computeAuthWitMessageHash,
   computeInnerAuthWitHash,
@@ -83,7 +82,6 @@ export {
   AztecNode,
   Body,
   CompleteAddress,
-  ContractData,
   DeployedContract,
   ExtendedNote,
   FunctionCall,

diff --git a/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts b/yarn-project/aztec.js/src/rpc_clients/pxe_client.ts
@@ -1,6 +1,5 @@
 import {
   AuthWitness,
-  ContractData,
   ExtendedNote,
   ExtendedUnencryptedL2Log,
   L2Block,
@@ -39,7 +38,6 @@ export const createPXEClient = (url: string, fetch = makeFetch([1, 2, 3], false)
       AuthWitness,
       AztecAddress,
       CompleteAddress,
-      ContractData,
       FunctionSelector,
       EthAddress,
       ExtendedNote,

diff --git a/yarn-project/aztec.js/src/utils/index.ts b/yarn-project/aztec.js/src/utils/index.ts
@@ -1,6 +1,5 @@
 export * from './pub_key.js';
 export * from './l1_contracts.js';
-export * from './l2_contracts.js';
 export * from './abi_types.js';
 export * from './cheat_codes.js';
 export * from './authwit.js';

diff --git a/yarn-project/aztec.js/src/utils/l2_contracts.ts b/yarn-project/aztec.js/src/utils/l2_contracts.ts
diff --git a/yarn-project/aztec.js/src/wallet/base_wallet.ts b/yarn-project/aztec.js/src/wallet/base_wallet.ts
@@ -1,6 +1,5 @@
 import {
   AuthWitness,
-  ContractData,
   DeployedContract,
   ExtendedNote,
   FunctionCall,
@@ -102,9 +101,6 @@ export abstract class BaseWallet implements Wallet {
   viewTx(functionName: string, args: any[], to: AztecAddress, from?: AztecAddress | undefined): Promise<any> {
     return this.pxe.viewTx(functionName, args, to, from);
   }
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined> {
-    return this.pxe.getContractData(contractAddress);
-  }
   getUnencryptedLogs(filter: LogFilter): Promise<GetUnencryptedLogsResponse> {
     return this.pxe.getUnencryptedLogs(filter);
   }

diff --git a/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts b/yarn-project/circuit-types/src/aztec_node/rpc/aztec_node_client.ts
@@ -5,7 +5,6 @@ import { EthAddress } from '@aztec/foundation/eth-address';
 import { Fr } from '@aztec/foundation/fields';
 import { createJsonRpcClient, defaultFetch } from '@aztec/foundation/json-rpc/client';
 
-import { ContractData } from '../../contract_data.js';
 import { AztecNode } from '../../interfaces/aztec-node.js';
 import { NullifierMembershipWitness } from '../../interfaces/nullifier_tree.js';
 import { L1ToL2MessageAndIndex } from '../../l1_to_l2_message.js';
@@ -28,7 +27,6 @@ export function createAztecNodeClient(url: string, fetch = defaultFetch): AztecN
       AztecAddress,
       EthAddress,
       ExtendedUnencryptedL2Log,
-      ContractData,
       Fr,
       EventSelector,
       FunctionSelector,

diff --git a/yarn-project/circuit-types/src/contract_data.test.ts b/yarn-project/circuit-types/src/contract_data.test.ts
diff --git a/yarn-project/circuit-types/src/contract_data.ts b/yarn-project/circuit-types/src/contract_data.ts
diff --git a/yarn-project/circuit-types/src/index.ts b/yarn-project/circuit-types/src/index.ts
@@ -1,4 +1,3 @@
-export * from './contract_data.js';
 export * from './function_call.js';
 export * from './keys/index.js';
 export * from './notes/index.js';

diff --git a/yarn-project/circuit-types/src/interfaces/aztec-node.ts b/yarn-project/circuit-types/src/interfaces/aztec-node.ts
@@ -11,7 +11,6 @@ import { AztecAddress } from '@aztec/foundation/aztec-address';
 import { Fr } from '@aztec/foundation/fields';
 import { ContractClassPublic, ContractInstanceWithAddress } from '@aztec/types/contracts';
 
-import { ContractData } from '../contract_data.js';
 import { L1ToL2MessageAndIndex } from '../l1_to_l2_message.js';
 import { L2Block } from '../l2_block.js';
 import { GetUnencryptedLogsResponse, L2BlockL2Logs, LogFilter, LogType } from '../logs/index.js';
@@ -194,14 +193,6 @@ export interface AztecNode {
    */
   getL1ContractAddresses(): Promise<L1ContractAddresses>;
 
-  /**
-   * Lookup the contract data for this contract.
-   * Contains the ethereum portal address .
-   * @param contractAddress - The contract data address.
-   * @returns The contract's address & portal address.
-   */
-  getContractData(contractAddress: AztecAddress): Promise<ContractData | undefined>;
-
   /**
    * Gets up to `limit` amount of logs starting from `from`.
    * @param from - Number of the L2 block to which corresponds the first logs to be returned.