refactor: pass fn signatures

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

@@ -774,8 +774,8 @@ export class Archiver implements ArchiveSource, Traceable {
     return;
   }
 
-  registerContractFunctionNames(address: AztecAddress, names: Record<string, string>): Promise<void> {
-    return this.store.registerContractFunctionName(address, names);
+  registerContractFunctionSignatures(address: AztecAddress, signatures: string[]): Promise<void> {
+    return this.store.registerContractFunctionSignatures(address, signatures);
   }
 
   getContractFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
@@ -1082,8 +1082,8 @@ class ArchiverStoreHelper
   getContractClassIds(): Promise<Fr[]> {
     return this.store.getContractClassIds();
   }
-  registerContractFunctionName(address: AztecAddress, names: Record<string, string>): Promise<void> {
-    return this.store.registerContractFunctionName(address, names);
+  registerContractFunctionSignatures(address: AztecAddress, signatures: string[]): Promise<void> {
+    return this.store.registerContractFunctionSignatures(address, signatures);
   }
   getContractFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined> {
     return this.store.getContractFunctionName(address, selector);

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

@@ -264,7 +264,7 @@ export interface ArchiverDataStore {
   // TODO:  These function names are in memory only as they are for development/debugging. They require the full contract
   //        artifact supplied to the node out of band. This should be reviewed and potentially removed as part of
   //        the node api cleanup process.
-  registerContractFunctionName(address: AztecAddress, names: Record<string, string>): Promise<void>;
+  registerContractFunctionSignatures(address: AztecAddress, signatures: string[]): Promise<void>;
   getContractFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
 
   /**

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

@@ -17,7 +17,7 @@ import {
   type PrivateLog,
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
-import { type FunctionSelector } from '@aztec/foundation/abi';
+import { FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { createLogger } from '@aztec/foundation/log';
 import { type AztecKVStore } from '@aztec/kv-store';
@@ -62,9 +62,14 @@ export class KVArchiverDataStore implements ArchiverDataStore {
     return Promise.resolve(this.functionNames.get(selector.toString()));
   }
 
-  registerContractFunctionName(_address: AztecAddress, names: Record<string, string>): Promise<void> {
-    for (const [selector, name] of Object.entries(names)) {
-      this.functionNames.set(selector, name);
+  registerContractFunctionSignatures(_address: AztecAddress, signatures: string[]): Promise<void> {
+    for (const sig of signatures) {
+      try {
+        const selector = FunctionSelector.fromSignature(sig);
+        this.functionNames.set(selector.toString(), sig.slice(0, sig.indexOf('(')));
+      } catch {
+        this.#log.warn(`Failed to parse signature: ${sig}. Ignoring`);
+      }
     }
 
     return Promise.resolve();

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

@@ -28,7 +28,7 @@ import {
   type PrivateLog,
   type UnconstrainedFunctionWithMembershipProof,
 } from '@aztec/circuits.js';
-import { type FunctionSelector } from '@aztec/foundation/abi';
+import { FunctionSelector } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
 import { createLogger } from '@aztec/foundation/log';
 
@@ -734,9 +734,14 @@ export class MemoryArchiverStore implements ArchiverDataStore {
     return Promise.resolve(this.functionNames.get(selector.toString()));
   }
 
-  public registerContractFunctionName(_address: AztecAddress, names: Record<string, string>): Promise<void> {
-    for (const [selector, name] of Object.entries(names)) {
-      this.functionNames.set(selector, name);
+  public registerContractFunctionSignatures(_address: AztecAddress, signatures: string[]): Promise<void> {
+    for (const sig of signatures) {
+      try {
+        const selector = FunctionSelector.fromSignature(sig);
+        this.functionNames.set(selector.toString(), sig.slice(0, sig.indexOf('(')));
+      } catch {
+        this.#log.warn(`Failed to parse signature: ${sig}. Ignoring`);
+      }
     }
 
     return Promise.resolve();

yarn-project/archiver/src/factory.ts

@@ -4,7 +4,7 @@ import {
   computePublicBytecodeCommitment,
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
-import { FunctionSelector, FunctionType } from '@aztec/foundation/abi';
+import { FunctionType, decodeFunctionSignature } from '@aztec/foundation/abi';
 import { createLogger } from '@aztec/foundation/log';
 import { type Maybe } from '@aztec/foundation/types';
 import { type DataStoreConfig } from '@aztec/kv-store/config';
@@ -47,14 +47,11 @@ async function registerProtocolContracts(store: KVArchiverDataStore) {
       unconstrainedFunctions: [],
     };
 
-    const functionNames: Record<string, string> = {};
-    for (const fn of contract.artifact.functions) {
-      if (fn.functionType === FunctionType.PUBLIC) {
-        functionNames[FunctionSelector.fromNameAndParameters(fn.name, fn.parameters).toString()] = fn.name;
-      }
-    }
+    const publicFunctionSignatures = contract.artifact.functions
+      .filter(fn => fn.functionType === FunctionType.PUBLIC)
+      .map(fn => decodeFunctionSignature(fn.name, fn.parameters));
 
-    await store.registerContractFunctionName(contract.address, functionNames);
+    await store.registerContractFunctionSignatures(contract.address, publicFunctionSignatures);
     const bytecodeCommitment = computePublicBytecodeCommitment(contractClassPublic.packedBytecode);
     await store.addContractClasses([contractClassPublic], [bytecodeCommitment], blockNumber);
     await store.addContractInstances([contract.instance], blockNumber);

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

@@ -904,8 +904,8 @@ export class AztecNodeService implements AztecNode, Traceable {
     return this.contractDataSource.addContractClass(contractClass);
   }
 
-  public registerContractFunctionNames(_address: AztecAddress, names: Record<string, string>): Promise<void> {
-    return this.contractDataSource.registerContractFunctionNames(_address, names);
+  public registerContractFunctionSignatures(_address: AztecAddress, signatures: string[]): Promise<void> {
+    return this.contractDataSource.registerContractFunctionSignatures(_address, signatures);
   }
 
   public flushTxs(): Promise<void> {

yarn-project/circuit-types/src/interfaces/archiver.test.ts

@@ -222,10 +222,8 @@ describe('ArchiverApiSchema', () => {
     expect(result).toBe(1n);
   });
 
-  it('registerContractFunctionNames', async () => {
-    await context.client.registerContractFunctionNames(AztecAddress.random(), {
-      [FunctionSelector.random().toString()]: 'test_fn',
-    });
+  it('registerContractFunctionSignatures', async () => {
+    await context.client.registerContractFunctionSignatures(AztecAddress.random(), ['test()']);
   });
 
   it('getContract', async () => {
@@ -374,9 +372,9 @@ class MockArchiver implements ArchiverApi {
     expect(address).toBeInstanceOf(AztecAddress);
     return Promise.resolve(this.artifact);
   }
-  registerContractFunctionNames(address: AztecAddress, names: Record<string, string>): Promise<void> {
+  registerContractFunctionSignatures(address: AztecAddress, signatures: string[]): Promise<void> {
     expect(address).toBeInstanceOf(AztecAddress);
-    expect(names).toEqual(expect.any(Object));
+    expect(Array.isArray(signatures)).toBe(true);
     return Promise.resolve();
   }
   getL1ToL2Messages(blockNumber: bigint): Promise<Fr[]> {

yarn-project/circuit-types/src/interfaces/archiver.ts

@@ -68,10 +68,7 @@ export const ArchiverApiSchema: ApiSchemaFor<ArchiverApi> = {
   getBytecodeCommitment: z.function().args(schemas.Fr).returns(schemas.Fr),
   getContract: z.function().args(schemas.AztecAddress).returns(ContractInstanceWithAddressSchema.optional()),
   getContractClassIds: z.function().args().returns(z.array(schemas.Fr)),
-  registerContractFunctionNames: z
-    .function()
-    .args(schemas.AztecAddress, z.record(z.string(), z.string()))
-    .returns(z.void()),
+  registerContractFunctionSignatures: z.function().args(schemas.AztecAddress, z.array(z.string())).returns(z.void()),
   getL1ToL2Messages: z.function().args(schemas.BigInt).returns(z.array(schemas.Fr)),
   getL1ToL2MessageIndex: z.function().args(schemas.Fr).returns(schemas.BigInt.optional()),
   // TODO(#10007): Remove this method

yarn-project/circuit-types/src/interfaces/aztec-node.test.ts

@@ -19,7 +19,7 @@ import {
   getContractClassFromArtifact,
 } from '@aztec/circuits.js';
 import { type L1ContractAddresses, L1ContractsNames } from '@aztec/ethereum';
-import { type ContractArtifact, FunctionSelector } from '@aztec/foundation/abi';
+import { type ContractArtifact } from '@aztec/foundation/abi';
 import { memoize } from '@aztec/foundation/decorators';
 import { type JsonRpcTestContext, createJsonRpcTestSetup } from '@aztec/foundation/json-rpc/test';
 import { fileURLToPath } from '@aztec/foundation/url';
@@ -223,10 +223,8 @@ describe('AztecNodeApiSchema', () => {
     expect(response).toEqual(Object.fromEntries(ProtocolContractsNames.map(name => [name, expect.any(AztecAddress)])));
   });
 
-  it('registerContractFunctionNames', async () => {
-    await context.client.registerContractFunctionNames(AztecAddress.random(), {
-      [FunctionSelector.random().toString()]: 'test_fn',
-    });
+  it('registerContractFunctionSignatures', async () => {
+    await context.client.registerContractFunctionSignatures(AztecAddress.random(), ['test()']);
   });
 
   it('getPrivateLogs', async () => {
@@ -506,7 +504,7 @@ class MockAztecNode implements AztecNode {
       ) as ProtocolContractAddresses,
     );
   }
-  registerContractFunctionNames(_address: AztecAddress, _names: Record<string, string>): Promise<void> {
+  registerContractFunctionSignatures(_address: AztecAddress, _signatures: string[]): Promise<void> {
     return Promise.resolve();
   }
   getPrivateLogs(_from: number, _limit: number): Promise<PrivateLog[]> {

yarn-project/circuit-types/src/interfaces/aztec-node.ts

@@ -286,7 +286,7 @@ export interface AztecNode
    * @param aztecAddress
    * @param artifact
    */
-  registerContractFunctionNames(address: AztecAddress, names: Record<string, string>): Promise<void>;
+  registerContractFunctionSignatures(address: AztecAddress, functionSignatures: string[]): Promise<void>;
 
   /**
    * Retrieves all private logs from up to `limit` blocks, starting from the block number `from`.
@@ -533,10 +533,7 @@ export const AztecNodeApiSchema: ApiSchemaFor<AztecNode> = {
 
   getProtocolContractAddresses: z.function().returns(ProtocolContractAddressesSchema),
 
-  registerContractFunctionNames: z
-    .function()
-    .args(schemas.AztecAddress, z.record(z.string(), z.string()))
-    .returns(z.void()),
+  registerContractFunctionSignatures: z.function().args(schemas.AztecAddress, z.array(z.string())).returns(z.void()),
 
   getPrivateLogs: z.function().args(z.number(), z.number()).returns(z.array(PrivateLog.schema)),
 

yarn-project/circuits.js/src/contract/interfaces/contract_data_source.ts

@@ -48,5 +48,5 @@ export interface ContractDataSource {
   /** Returns a function's name */
   getContractFunctionName(address: AztecAddress, selector: FunctionSelector): Promise<string | undefined>;
   /** Registers a function names. Useful for debugging. */
-  registerContractFunctionNames(address: AztecAddress, names: Record<string, string>): Promise<void>;
+  registerContractFunctionSignatures(address: AztecAddress, signatures: string[]): Promise<void>;
 }

yarn-project/pxe/src/pxe_service/pxe_service.ts

@@ -54,6 +54,7 @@ import {
   EventSelector,
   FunctionSelector,
   FunctionType,
+  decodeFunctionSignature,
   encodeArguments,
 } from '@aztec/foundation/abi';
 import { type AztecAddress } from '@aztec/foundation/aztec-address';
@@ -243,14 +244,10 @@ export class PXEService implements PXE {
 
       await this.db.addContractArtifact(contractClassId, artifact);
 
-      const functionNames: Record<string, string> = {};
-      for (const fn of artifact.functions) {
-        if (fn.functionType === FunctionType.PUBLIC) {
-          functionNames[FunctionSelector.fromNameAndParameters(fn.name, fn.parameters).toString()] = fn.name;
-        }
-      }
-
-      await this.node.registerContractFunctionNames(instance.address, functionNames);
+      const publicFunctionSignatures = artifact.functions
+        .filter(fn => fn.functionType === FunctionType.PUBLIC)
+        .map(fn => decodeFunctionSignature(fn.name, fn.parameters));
+      await this.node.registerContractFunctionSignatures(instance.address, publicFunctionSignatures);
 
       // TODO(#10007): Node should get public contract class from the registration event, not from PXE registration
       await this.node.addContractClass({ ...contractClass, privateFunctions: [], unconstrainedFunctions: [] });

yarn-project/simulator/src/public/fixtures/index.ts

@@ -226,7 +226,7 @@ export class MockedAvmTestContractDataSource implements ContractDataSource {
     return Promise.resolve(this.fnName);
   }
 
-  registerContractFunctionNames(_address: AztecAddress, _names: Record<string, string>): Promise<void> {
+  registerContractFunctionSignatures(_address: AztecAddress, _signatures: string[]): Promise<void> {
     return Promise.resolve();
   }
 }

yarn-project/txe/src/node/txe_node.ts

@@ -450,7 +450,7 @@ export class TXENode implements AztecNode {
    * @param aztecAddress
    * @param artifact
    */
-  registerContractFunctionNames(_address: AztecAddress, _names: Record<string, string>): Promise<void> {
+  registerContractFunctionSignatures(_address: AztecAddress, _signatures: string[]): Promise<void> {
     throw new Error('TXE Node method addContractArtifact not implemented');
   }
 

yarn-project/txe/src/util/txe_public_contract_data_source.ts

@@ -85,7 +85,7 @@ export class TXEPublicContractDataSource implements ContractDataSource {
     return Promise.resolve(func?.name);
   }
 
-  registerContractFunctionNames(_address: AztecAddress, _names: Record<string, string>): Promise<void> {
+  registerContractFunctionSignatures(_address: AztecAddress, _signatures: []): Promise<void> {
     return Promise.resolve();
   }