Skip to content

Commit

Permalink
fix: ts codegen (#8267)
Browse files Browse the repository at this point in the history
Original PR is #8226
by @olehmisar

Another attempt, this time with the branch local to this repository,
instead of trying to merge across forks.

---------

Co-authored-by: oleh <olehmisar@gmail.com>
  • Loading branch information
spalladino and olehmisar authored Aug 29, 2024
1 parent 2323cd5 commit cb58800
Showing 1 changed file with 18 additions and 15 deletions.
33 changes: 18 additions & 15 deletions yarn-project/builder/src/contract-interface-gen/typescript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,10 @@ function generateEvents(events: any[] | undefined) {
* @returns The corresponding ts code.
*/
export function generateTypescriptContractInterface(input: ContractArtifact, artifactImportPath?: string) {
const methods = input.functions.filter(f => !f.isInternal).map(generateMethod);
const methods = input.functions
.filter(f => !f.isInternal)
.sort((a, b) => a.name.localeCompare(b.name))
.map(generateMethod);
const deploy = artifactImportPath && generateDeploy(input);
const ctor = artifactImportPath && generateConstructor(input.name);
const at = artifactImportPath && generateAt(input.name);
Expand All @@ -332,31 +335,31 @@ export function generateTypescriptContractInterface(input: ContractArtifact, art
/* eslint-disable */
import {
AztecAddress,
AztecAddressLike,
type AztecAddressLike,
CompleteAddress,
Contract,
ContractArtifact,
type ContractArtifact,
ContractBase,
ContractFunctionInteraction,
ContractInstanceWithAddress,
ContractMethod,
ContractStorageLayout,
ContractNotes,
type ContractInstanceWithAddress,
type ContractMethod,
type ContractStorageLayout,
type ContractNotes,
DeployMethod,
EthAddress,
EthAddressLike,
type EthAddressLike,
EventSelector,
FieldLike,
type FieldLike,
Fr,
FunctionSelectorLike,
type FunctionSelectorLike,
L1EventPayload,
loadContractArtifact,
NoirCompiledContract,
type NoirCompiledContract,
NoteSelector,
Point,
PublicKey,
Wallet,
WrappedFieldLike,
type PublicKey,
type Wallet,
type WrappedFieldLike,
} from '@aztec/aztec.js';
${artifactStatement}
Expand All @@ -379,7 +382,7 @@ export class ${input.name}Contract extends ContractBase {
${notesGetter}
/** Type-safe wrappers for the public methods exposed by the contract. */
public override methods!: {
public declare methods: {
${methods.join('\n')}
};
Expand Down

0 comments on commit cb58800

Please sign in to comment.