Skip to content

fix!: change protocol contracts deployer to be the contract address #20396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PhilWindle merged 1 commit into from
Feb 11, 2026
Merged

fix!: change protocol contracts deployer to be the contract address #20396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion yarn-project/protocol-contracts/src/make_protocol_contract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export async function makeProtocolContract(
const salt = ProtocolContractSalt[name];
// TODO(@spalladino): This computes the contract class from the artifact twice.
const contractClass = await getContractClassFromArtifact(artifact);
const instance = await getContractInstanceFromInstantiationParams(artifact, { salt });
const instance = await getContractInstanceFromInstantiationParams(artifact, { salt, deployer: address });
Copy link
Contributor Author

@alexghr alexghr Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this will be the low address, not the instance derived address

return {
instance: { ...instance, address },
contractClass,
Expand Down
6 changes: 3 additions & 3 deletions yarn-project/protocol-contracts/src/scripts/generate_data.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ async function copyArtifact(srcName: string, destName: string) {
return artifact;
}

async function computeAddress(artifact: NoirCompiledContract) {
const instance = await getContractInstanceFromInstantiationParams(loadContractArtifact(artifact), { salt });
async function computeAddress(artifact: NoirCompiledContract, deployer: AztecAddress) {
const instance = await getContractInstanceFromInstantiationParams(loadContractArtifact(artifact), { salt, deployer });
return instance.address;
}

Expand Down Expand Up @@ -179,7 +179,7 @@ async function main() {
const destName = destNames[i];
const artifact = await copyArtifact(srcName, destName);
await generateDeclarationFile(destName);
derivedAddresses.push(await computeAddress(artifact));
derivedAddresses.push(await computeAddress(artifact, AztecAddress.fromBigInt(contractAddressMapping[destName])));
}

await generateOutputFile(destNames, derivedAddresses);
Expand Down
Loading