Skip to content

fix(cli): fix tag resolution for aztec update --contract #12657

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
critesjosh merged 3 commits into from
Mar 12, 2025
Merged

fix(cli): fix tag resolution for aztec update --contract #12657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cfdc7d
fix tag
critesjosh Mar 11, 2025
094a1d6
Merge branch 'master' into jc/fix-aztec-update
critesjosh Mar 11, 2025
da19c40
rm github tag prefix
critesjosh Mar 12, 2025
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
3 changes: 1 addition & 2 deletions playground/src/components/contract/components/deployContractDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {
} from '@aztec/stdlib/abi';
import { AztecContext } from '../../../aztecEnv';
import { FunctionParameter } from '../../common/fnParameter';
import { GITHUB_TAG_PREFIX } from '../../../utils/constants';

const creationForm = css({
display: 'flex',
Expand Down Expand Up @@ -65,7 +64,7 @@ export function DeployContractDialog({
setLogsOpen(true);

const nodeInfo = await wallet.getNodeInfo();
const expectedAztecNrVersion = `${GITHUB_TAG_PREFIX}-v${nodeInfo.nodeVersion}`;
const expectedAztecNrVersion = `v${nodeInfo.nodeVersion}`;
if (contractArtifact.aztecNrVersion && contractArtifact.aztecNrVersion !== expectedAztecNrVersion) {
throw new Error(
`Contract was compiled with a different version of Aztec.nr: ${contractArtifact.aztecNrVersion}. Consider updating Aztec.nr to ${expectedAztecNrVersion}`,
Expand Down
3 changes: 1 addition & 2 deletions playground/src/components/contract/components/registerContractDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import Typography from '@mui/material/Typography';
import { css } from '@mui/styled-engine';
import { useContext, useState } from 'react';
import { AztecContext } from '../../../aztecEnv';
import { GITHUB_TAG_PREFIX } from '../../../utils/constants';

const creationForm = css({
display: 'flex',
Expand Down Expand Up @@ -43,7 +42,7 @@ export function RegisterContractDialog({
setRegistering(true);

const nodeInfo = await wallet.getNodeInfo();
const expectedAztecNrVersion = `${GITHUB_TAG_PREFIX}-v${nodeInfo.nodeVersion}`;
const expectedAztecNrVersion = `v${nodeInfo.nodeVersion}`;
if (contractArtifact.aztecNrVersion && contractArtifact.aztecNrVersion !== expectedAztecNrVersion) {
throw new Error(
`Contract was compiled with a different version of Aztec.nr: ${contractArtifact.aztecNrVersion}. Consider updating Aztec.nr to ${expectedAztecNrVersion}`,
Expand Down
1 change: 0 additions & 1 deletion playground/src/utils/constants.ts
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions yarn-project/cli-wallet/src/cmds/deploy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type AccountWalletWithSecretKey, ContractDeployer, type DeployMethod, Fr, type PXE } from '@aztec/aztec.js';
import { GITHUB_TAG_PREFIX, encodeArgs, getContractArtifact } from '@aztec/cli/utils';
import { encodeArgs, getContractArtifact } from '@aztec/cli/utils';
import type { LogFn, Logger } from '@aztec/foundation/log';
import { getInitializer } from '@aztec/stdlib/abi';
import { PublicKeys } from '@aztec/stdlib/keys';
Expand Down Expand Up @@ -30,7 +30,7 @@ export async function deploy(
const constructorArtifact = getInitializer(contractArtifact, initializer);

const nodeInfo = await client.getNodeInfo();
const expectedAztecNrVersion = `${GITHUB_TAG_PREFIX}-v${nodeInfo.nodeVersion}`;
const expectedAztecNrVersion = `$v${nodeInfo.nodeVersion}`;
if (contractArtifact.aztecNrVersion && contractArtifact.aztecNrVersion !== expectedAztecNrVersion) {
log(
`\nWarning: Contract was compiled with a different version of Aztec.nr: ${contractArtifact.aztecNrVersion}. Consider updating Aztec.nr to ${expectedAztecNrVersion}\n`,
Expand Down
7 changes: 1 addition & 6 deletions yarn-project/cli/src/cmds/misc/update.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { relative, resolve } from 'path';
import { parse } from 'semver';

import type { DependencyChanges } from './update/common.js';
import { GITHUB_TAG_PREFIX } from './update/github.js';
import { updateAztecNr } from './update/noir.js';
import { getNewestVersion, updateAztecDeps, updateLockfile } from './update/npm.js';

Expand Down Expand Up @@ -44,11 +43,7 @@ export async function updateProject(
for (const contract of contracts) {
try {
projectDependencyChanges.push(
await updateAztecNr(
resolve(process.cwd(), projectPath, contract),
`${GITHUB_TAG_PREFIX}-v${targetAztecVersion.version}`,
log,
),
await updateAztecNr(resolve(process.cwd(), projectPath, contract), `v${targetAztecVersion.version}`, log),
);
} catch (err) {
if (err instanceof Error && 'code' in err && err.code === 'ENOENT') {
Expand Down
1 change: 0 additions & 1 deletion yarn-project/cli/src/cmds/misc/update/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export const GITHUB_OWNER = 'AztecProtocol';
export const GITHUB_REPO = 'aztec-packages';
export const GITHUB_TAG_PREFIX = 'aztec-packages';
1 change: 0 additions & 1 deletion yarn-project/cli/src/utils/github.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
export const GITHUB_OWNER = 'AztecProtocol';
export const GITHUB_REPO = 'aztec-packages';
export const GITHUB_TAG_PREFIX = 'aztec-packages';