Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 35 additions & 1 deletion yarn-project/pxe/src/pxe.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { AztecLMDBStoreV2, openTmpStore } from '@aztec/kv-store/lmdb-v2';
import { TestContractArtifact } from '@aztec/noir-test-contracts.js/Test';
import { BundledProtocolContractsProvider } from '@aztec/protocol-contracts/providers/bundle';
import { WASMSimulator } from '@aztec/simulator/client';
import { EventSelector } from '@aztec/stdlib/abi';
import { EventSelector, FunctionType } from '@aztec/stdlib/abi';
import { AztecAddress } from '@aztec/stdlib/aztec-address';
import { BlockHash, GENESIS_BLOCK_HEADER_HASH, GENESIS_CHECKPOINT_HEADER_HASH } from '@aztec/stdlib/block';
import { getContractClassFromArtifact } from '@aztec/stdlib/contract';
Expand Down Expand Up @@ -161,6 +161,40 @@ describe('PXE', () => {
await expect(pxe.registerContract({ instance, artifact })).rejects.toThrow(/Artifact does not match/i);
});

it('does not call registerContractFunctionSignatures for contracts without public functions', async () => {
const { artifact, instance } = await randomDeployedContract();
node.registerContractFunctionSignatures.mockClear();

await pxe.registerContract({ artifact, instance });

expect(node.registerContractFunctionSignatures).not.toHaveBeenCalled();
});

it('calls registerContractFunctionSignatures for contracts with public functions', async () => {
const artifact = randomContractArtifact();
artifact.functions = [
{
name: 'my_public_fn',
functionType: FunctionType.PUBLIC,
isOnlySelf: false,
isStatic: false,
isInitializer: false,
parameters: [],
returnTypes: [],
errorTypes: {},
bytecode: Buffer.from(''),
debugSymbols: '',
},
];
const contractClass = await getContractClassFromArtifact(artifact);
const instance = await randomContractInstanceWithAddress({ contractClassId: contractClass.id });
node.registerContractFunctionSignatures.mockClear();

await pxe.registerContract({ artifact, instance });

expect(node.registerContractFunctionSignatures).toHaveBeenCalledWith(['my_public_fn()']);
});

// These tests are meant to quickly exercise PXE as a
// frontier API so we don't need to rely on slower E2E
// tests (which in turn are more meaningful for acceptance).
Expand Down
8 changes: 6 additions & 2 deletions yarn-project/pxe/src/pxe.ts
Original file line number Diff line number Diff line change
Expand Up @@ -693,7 +693,9 @@ export class PXE {
const publicFunctionSignatures = artifact.functions
.filter(fn => fn.functionType === FunctionType.PUBLIC)
.map(fn => decodeFunctionSignature(fn.name, fn.parameters));
await this.node.registerContractFunctionSignatures(publicFunctionSignatures);
if (publicFunctionSignatures.length > 0) {
await this.node.registerContractFunctionSignatures(publicFunctionSignatures);
}
} else {
// Otherwise, make sure there is an artifact already registered for that class id
artifact = await this.contractStore.getContractArtifact(instance.currentContractClassId);
Expand Down Expand Up @@ -740,7 +742,9 @@ export class PXE {
const publicFunctionSignatures = artifact.functions
.filter(fn => fn.functionType === FunctionType.PUBLIC)
.map(fn => decodeFunctionSignature(fn.name, fn.parameters));
await this.node.registerContractFunctionSignatures(publicFunctionSignatures);
if (publicFunctionSignatures.length > 0) {
await this.node.registerContractFunctionSignatures(publicFunctionSignatures);
}

currentInstance.currentContractClassId = contractClass.id;
await Promise.all([
Expand Down
Loading