Revert "refactor!: Use circuit builders"

.circleci/config.yml

@@ -319,6 +319,17 @@ jobs:
           name: "Build and test"
           command: build aztec-rpc
 
+  aztec-sandbox:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "Build and test"
+          command: build aztec-sandbox
+
   circuits-js:
     machine:
       image: ubuntu-2004:202010-01
@@ -535,6 +546,20 @@ jobs:
           name: "Noop"
           command: echo Noop
 
+  deploy:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: medium
+    steps:
+      - *checkout
+      - *setup_env
+      - run:
+          name: "deploy-sandbox"
+          working_directory: aztec-sandbox
+          command: |
+            deploy_ecr aztec-sandbox
+            deploy_dockerhub aztec-sandbox master
+
 # Repeatable config for defining the workflow below.
 tag_regex: &tag_regex /v[0-9]+(\.[0-9]+)*(-[a-zA-Z-]+\.[0-9]+)?/
 defaults: &defaults
@@ -615,6 +640,7 @@ workflows:
       - types: *yarn_project
       - circuits-js: *yarn_project
       - rollup-provider: *yarn_project
+      - aztec-sandbox: *yarn_project
 
       - e2e-join:
           requires:
@@ -667,3 +693,12 @@ workflows:
             - integration-archiver-l1-to-l2
             - e2e-p2p
           <<: *defaults
+
+      - deploy:
+          requires:
+            - e2e-end
+            - aztec-sandbox
+          filters:
+            branches:
+              only: master
+          <<: *defaults

build_manifest.json

@@ -142,6 +142,21 @@
       "types"
     ]
   },
+  "aztec-sandbox": {
+    "buildDir": "yarn-project",
+    "projectDir": "yarn-project/aztec-sandbox",
+    "dockerfile": "aztec-sandbox/Dockerfile",
+    "rebuildPatterns": [
+      "^yarn-project/aztec-sandbox/"
+    ],
+    "dependencies": [
+      "aztec-node",
+      "aztec-rpc",
+      "aztec.js",
+      "ethereum",
+      "foundation"
+    ]
+  },
   "aztec.js": {
     "buildDir": "yarn-project",
     "projectDir": "yarn-project/aztec.js",

build_manifest.sh

@@ -14,6 +14,8 @@
 
 PROJECTS=(
   circuits:circuits/cpp:./dockerfiles/Dockerfile.wasm-linux-clang:circuits-wasm-linux-clang
+  l1-contracts:l1-contracts
   yarn-project-base:yarn-project
   end-to-end:yarn-project
+  aztec-sandbox:yarn-project
 )

yarn-project/archiver/src/archiver/archiver.ts

@@ -47,6 +47,11 @@ export class Archiver implements L2BlockSource, L2LogsSource, ContractDataSource
    */
   private lastProcessedBlockNumber = 0n;
 
+  /**
+   * Use this to track logged block in order to avoid repeating the same message.
+   */
+  private lastLoggedBlockNumber = 0n;
+
   /**
    * Creates a new instance of the Archiver.
    * @param publicClient - A client for interacting with the Ethereum node.
@@ -123,7 +128,11 @@ export class Archiver implements L2BlockSource, L2LogsSource, ContractDataSource
   private async sync(blockUntilSynced: boolean) {
     const currentBlockNumber = await this.publicClient.getBlockNumber();
     if (currentBlockNumber <= this.lastProcessedBlockNumber) {
-      this.log(`No new blocks to process, current block number: ${currentBlockNumber}`);
+      // reducing logs, otherwise this gets triggered on every loop (1s)
+      if (currentBlockNumber !== this.lastLoggedBlockNumber) {
+        this.log(`No new blocks to process, current block number: ${currentBlockNumber}`);
+        this.lastLoggedBlockNumber = currentBlockNumber;
+      }
       return;
     }
 

yarn-project/aztec-node/src/aztec-node/http-node.ts

@@ -33,6 +33,7 @@ export function txToJson(tx: Tx) {
   return {
     data: tx.data?.toBuffer().toString('hex'),
     encryptedLogs: tx.encryptedLogs?.toBuffer().toString('hex'),
+    unencryptedLogs: tx.unencryptedLogs?.toBuffer().toString('hex'),
     proof: tx.proof?.toBuffer().toString('hex'),
     newContractPublicFunctions: tx.newContractPublicFunctions?.map(f => f.toBuffer().toString('hex')) ?? [],
     enqueuedPublicFunctions: tx.enqueuedPublicFunctionCalls?.map(f => f.toBuffer().toString('hex')) ?? [],
@@ -49,10 +50,10 @@ export function txFromJson(json: any) {
   const encryptedLogs = TxL2Logs.fromBuffer(Buffer.from(json.encryptedLogs, 'hex'));
   const unencryptedLogs = TxL2Logs.fromBuffer(Buffer.from(json.unencryptedLogs, 'hex'));
   const proof = Buffer.from(json.proof, 'hex');
-  const newContractPublicFunctions = json.newContractPublicFunctions
+  const newContractPublicFunctions = json.newContractPublicFunctions?.length
     ? json.newContractPublicFunctions.map((x: string) => EncodedContractFunction.fromBuffer(Buffer.from(x, 'hex')))
     : [];
-  const enqueuedPublicFunctions = json.enqueuedPublicFunctions
+  const enqueuedPublicFunctions = json.enqueuedPublicFunctions?.length
     ? json.enqueuedPublicFunctions.map((x: string) => PublicCallRequest.fromBuffer(Buffer.from(x, 'hex')))
     : [];
   return Tx.createTx(

yarn-project/aztec-rpc/package.json

@@ -16,7 +16,8 @@
     "clean": "rm -rf ./dest .tsbuildinfo",
     "formatting": "run -T prettier --check ./src && run -T eslint ./src",
     "formatting:fix": "run -T prettier -w ./src",
-    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests"
+    "test": "NODE_NO_WARNINGS=1 node --experimental-vm-modules $(yarn bin jest) --passWithNoTests",
+    "start:http": "DEBUG='aztec:*' && node ./dest/aztec_rpc_http/aztec_rpc_http_server.js"
   },
   "inherits": [
     "../package.common.json"

yarn-project/aztec-rpc/src/aztec_rpc_client/aztec_rpc_client.ts → yarn-project/aztec-rpc/src/aztec_rpc/aztec_rpc.ts

@@ -1,7 +1,15 @@
 import { AztecAddress, EthAddress, Fr } from '@aztec/circuits.js';
 import { ContractAbi } from '@aztec/foundation/abi';
 import { Point } from '@aztec/foundation/fields';
-import { ContractDeploymentTx, PartialContractAddress, Tx, TxHash } from '@aztec/types';
+import {
+  ContractData,
+  ContractDeploymentTx,
+  ContractPublicData,
+  L2BlockL2Logs,
+  PartialContractAddress,
+  Tx,
+  TxHash,
+} from '@aztec/types';
 import { TxReceipt } from '../tx/index.js';
 import { CurveType, SignerType } from '../crypto/types.js';
 
@@ -25,12 +33,12 @@ export interface DeployedContract {
 }
 
 /**
- * Represents an Aztec RPC client implementation.
+ * Represents an Aztec RPC implementation.
  * Provides functionality for all the operations needed to interact with the Aztec network,
  * including account management, contract deployment, transaction creation, and execution,
  * as well as storage and view functions for smart contracts.
  */
-export interface AztecRPCClient {
+export interface AztecRPC {
   createSmartAccount(
     privKey?: Buffer,
     curve?: CurveType,
@@ -66,4 +74,8 @@ export interface AztecRPCClient {
   getTxReceipt(txHash: TxHash): Promise<TxReceipt>;
   getStorageAt(contract: AztecAddress, storageSlot: Fr): Promise<any>;
   viewTx(functionName: string, args: any[], to: AztecAddress, from?: AztecAddress): Promise<any>;
+  getContractData(contractAddress: AztecAddress): Promise<ContractPublicData | undefined>;
+  getContractInfo(contractAddress: AztecAddress): Promise<ContractData | undefined>;
+  getUnencryptedLogs(from: number, take: number): Promise<L2BlockL2Logs[]>;
+  getBlockNum(): Promise<number>;
 }

yarn-project/aztec-rpc/src/aztec_rpc/index.ts

@@ -0,0 +1 @@
+export * from './aztec_rpc.js';

yarn-project/aztec-rpc/src/aztec_rpc_http/aztec_rpc_http_server.ts

@@ -0,0 +1,33 @@
+import { foundry } from 'viem/chains';
+import { Tx, TxHash, ContractDeploymentTx } from '@aztec/types';
+import { JsonRpcServer } from '@aztec/foundation/json-rpc';
+import { AztecAddress } from '@aztec/foundation/aztec-address';
+import { Fr, Point } from '@aztec/foundation/fields';
+import { AztecNodeConfig, AztecNodeService } from '@aztec/aztec-node';
+
+import { EthAddress, createAztecRPCServer } from '../index.js';
+
+export const localAnvil = foundry;
+
+/**
+ * Wraps an instance of the Aztec RPC Server implementation to a JSON RPC HTTP interface.
+ * @returns A new instance of the HTTP server.
+ */
+export async function getHttpRpcServer(nodeConfig: AztecNodeConfig): Promise<JsonRpcServer> {
+  const aztecNode = await AztecNodeService.createAndSync(nodeConfig);
+  const aztecRpcServer = await createAztecRPCServer(aztecNode);
+  const generatedRpcServer = new JsonRpcServer(
+    aztecRpcServer,
+    {
+      AztecAddress,
+      TxHash,
+      EthAddress,
+      Point,
+      Fr,
+    },
+    { Tx, ContractDeploymentTx },
+    false,
+    ['start', 'stop'],
+  );
+  return generatedRpcServer;
+}

yarn-project/aztec-rpc/src/aztec_rpc_http/index.ts

@@ -0,0 +1 @@
+export * from './aztec_rpc_http_server.js';