Skip to content

Commit 54fa4bc

Browse files
committed
fix(public_checks): point at collapsed standard_addresses module
PUBLIC_CHECKS_ADDRESS now lives in aztec/src/standard_addresses.nr (and its aztec_sublib twin), not the deleted standard_addresses crate.
1 parent 4754446 commit 54fa4bc

6 files changed

Lines changed: 12 additions & 8 deletions

File tree

noir-projects/aztec-nr/aztec/src/public_checks.nr

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::context::calls::PublicStaticCall;
22
use crate::context::PrivateContext;
33
use crate::protocol::abis::function_selector::FunctionSelector;
4-
use standard_addresses::PUBLIC_CHECKS_ADDRESS;
4+
use crate::standard_addresses::STANDARD_PUBLIC_CHECKS_ADDRESS;
55

66
// docs:start:helper_public_checks_functions
77
/// Asserts that the current timestamp in the enqueued public call enqueued by `check_timestamp` satisfies
@@ -12,7 +12,7 @@ use standard_addresses::PUBLIC_CHECKS_ADDRESS;
1212
pub fn privately_check_timestamp(operation: u8, value: u64, context: &mut PrivateContext) {
1313
let selector = comptime { FunctionSelector::from_signature("check_timestamp(u8,u64)") };
1414
PublicStaticCall::<15, 2, ()>::new(
15-
PUBLIC_CHECKS_ADDRESS,
15+
STANDARD_PUBLIC_CHECKS_ADDRESS,
1616
selector,
1717
"check_timestamp",
1818
[operation as Field, value as Field],
@@ -29,7 +29,7 @@ pub fn privately_check_block_number(operation: u8, value: u32, context: &mut Pri
2929
// docs:start:enqueueing
3030
let selector = comptime { FunctionSelector::from_signature("check_block_number(u8,u32)") };
3131
PublicStaticCall::<18, 2, ()>::new(
32-
PUBLIC_CHECKS_ADDRESS,
32+
STANDARD_PUBLIC_CHECKS_ADDRESS,
3333
selector,
3434
"check_block_number",
3535
[operation as Field, value as Field],

noir-projects/aztec-nr/aztec/src/standard_addresses.nr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@ pub global STANDARD_AUTH_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_fie
55
0x130fb3e9097456e6d3c486381ec788599d293fd5c0f178bc7e3724c0434faf42,
66
);
77

8-
pub global PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
8+
pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
99
0x0ed9aa9b8262bd0afb923764799e058ad10cf0de3e01dcf955055b11fdb20d70,
1010
);

noir-projects/noir-contracts/contracts/protocol/aztec_sublib/src/standard_addresses.nr

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,7 @@ use protocol_types::{address::AztecAddress, traits::FromField};
44
pub global STANDARD_AUTH_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
55
0x130fb3e9097456e6d3c486381ec788599d293fd5c0f178bc7e3724c0434faf42,
66
);
7+
8+
pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
9+
0x0ed9aa9b8262bd0afb923764799e058ad10cf0de3e01dcf955055b11fdb20d70,
10+
);

yarn-project/standard-contracts/src/public-checks/address.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
// `PublicChecks.json` static import.
44
import { StandardContractAddress, StandardContractClassId } from '../standard_contract_data.js';
55

6-
export const PUBLIC_CHECKS_ADDRESS = StandardContractAddress.PublicChecks;
7-
export const PUBLIC_CHECKS_CLASS_ID = StandardContractClassId.PublicChecks;
6+
export const STANDARD_PUBLIC_CHECKS_ADDRESS = StandardContractAddress.PublicChecks;
7+
export const STANDARD_PUBLIC_CHECKS_CLASS_ID = StandardContractClassId.PublicChecks;

yarn-project/standard-contracts/src/public-checks/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import PublicChecksJson from '../../artifacts/PublicChecks.json' with { type: 'j
55
import { makeStandardContract } from '../make_standard_contract.js';
66
import type { StandardContract } from '../standard_contract.js';
77

8-
export { PUBLIC_CHECKS_ADDRESS, PUBLIC_CHECKS_CLASS_ID } from './address.js';
8+
export { STANDARD_PUBLIC_CHECKS_ADDRESS, STANDARD_PUBLIC_CHECKS_CLASS_ID } from './address.js';
99

1010
export const PublicChecksArtifact = loadContractArtifact(PublicChecksJson as NoirCompiledContract);
1111

yarn-project/standard-contracts/src/public-checks/lazy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { type ContractArtifact, loadContractArtifact } from '@aztec/stdlib/abi';
33
import { makeStandardContract } from '../make_standard_contract.js';
44
import type { StandardContract } from '../standard_contract.js';
55

6-
export { PUBLIC_CHECKS_ADDRESS, PUBLIC_CHECKS_CLASS_ID } from './address.js';
6+
export { STANDARD_PUBLIC_CHECKS_ADDRESS, STANDARD_PUBLIC_CHECKS_CLASS_ID } from './address.js';
77

88
let standardContract: StandardContract;
99
let standardContractArtifact: ContractArtifact;

0 commit comments

Comments
 (0)