Skip to content

Commit b613c09

Browse files
committed
fix: regenerate standard-contract fixtures for merged public-v5-next handshake changes
Resolve the public-v5-next -> v5-next conflict in the three generated standard-contract fixtures by regenerating them against the merged tree: - re-pinned standard contracts (pin-standard-build) with the merged handshake_registry source -> pinned-standard-contracts.tar.gz - regenerated standard_contract_data.ts and standard_addresses.nr via yarn generate:data (drift generator converged, no residual drift)
1 parent b21d43b commit b613c09

3 files changed

Lines changed: 20 additions & 84 deletions

File tree

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,33 +2,17 @@
22
use protocol_types::{address::AztecAddress, traits::FromField};
33

44
pub global STANDARD_AUTH_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
5-
<<<<<<< HEAD
6-
0x151fc83ed377f7f5eafba69c0dd923a27d3940c887a0c2738de3b3aad8539d37,
5+
0x2569ee73b0a3c3389e5e3fe65f4270ca9a8f72f558b02a3900640fd97385ad0f,
76
);
87

98
pub global STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = AztecAddress::from_field(
10-
0x24bf02e35ce6f82e3ce17b39c7400eeb16b48c76527207f236e1193f07b2d4f4,
9+
0x239810bd44cf7b3de73d0856309b6935d5ac56e1143e1fbc00689d712447cc62,
1110
);
1211

1312
pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
14-
0x27ead321a0a230af4bed665c30a6d85b3e0eddae03d5f3dc0c5d4687a7ecfb43,
13+
0x2570a715dfb01b4eccabd55264ac9b1f5eeae8abb481de71cec0a18e45d74ae4,
1514
);
1615

1716
pub global STANDARD_HANDSHAKE_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
18-
0x1954c59d82062c1c4733a33284fc81c7d0ed65de93b683f72430047224866484,
19-
=======
20-
0x0292b01f4e566555534c40ed729eb023cc08afaca647b8c3642738449673480c,
21-
);
22-
23-
pub global STANDARD_MULTI_CALL_ENTRYPOINT_ADDRESS: AztecAddress = AztecAddress::from_field(
24-
0x18470168ca7a775b442cde110b668732f7b6390a505f3784b50f39993c5f3dce,
25-
);
26-
27-
pub global STANDARD_PUBLIC_CHECKS_ADDRESS: AztecAddress = AztecAddress::from_field(
28-
0x2d7745526508f5ceb278bb773a49f776842d1d2f0854c4a385bb661a2fabb9a8,
29-
);
30-
31-
pub global STANDARD_HANDSHAKE_REGISTRY_ADDRESS: AztecAddress = AztecAddress::from_field(
32-
0x0bd62e76a9a3a103dae2e73040e05d3970ac900baff5637ae9f183396745ec7e,
33-
>>>>>>> origin/public-v5-next
17+
0x0193c31bd24d0347aa9ed889cd6d304832988625c2f21c411e7af9d703591aa5,
3418
);
20.8 KB
Binary file not shown.

yarn-project/standard-contracts/src/standard_contract_data.ts

Lines changed: 16 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -20,81 +20,45 @@ export const StandardContractSalt: Record<StandardContractName, Fr> = {
2020
};
2121

2222
export const StandardContractAddress: Record<StandardContractName, AztecAddress> = {
23-
<<<<<<< HEAD
24-
AuthRegistry: AztecAddress.fromStringUnsafe('0x151fc83ed377f7f5eafba69c0dd923a27d3940c887a0c2738de3b3aad8539d37'),
23+
AuthRegistry: AztecAddress.fromStringUnsafe('0x2569ee73b0a3c3389e5e3fe65f4270ca9a8f72f558b02a3900640fd97385ad0f'),
2524
MultiCallEntrypoint: AztecAddress.fromStringUnsafe(
26-
'0x24bf02e35ce6f82e3ce17b39c7400eeb16b48c76527207f236e1193f07b2d4f4',
25+
'0x239810bd44cf7b3de73d0856309b6935d5ac56e1143e1fbc00689d712447cc62',
2726
),
28-
PublicChecks: AztecAddress.fromStringUnsafe('0x27ead321a0a230af4bed665c30a6d85b3e0eddae03d5f3dc0c5d4687a7ecfb43'),
27+
PublicChecks: AztecAddress.fromStringUnsafe('0x2570a715dfb01b4eccabd55264ac9b1f5eeae8abb481de71cec0a18e45d74ae4'),
2928
HandshakeRegistry: AztecAddress.fromStringUnsafe(
30-
'0x1954c59d82062c1c4733a33284fc81c7d0ed65de93b683f72430047224866484',
31-
=======
32-
AuthRegistry: AztecAddress.fromStringUnsafe('0x0292b01f4e566555534c40ed729eb023cc08afaca647b8c3642738449673480c'),
33-
MultiCallEntrypoint: AztecAddress.fromStringUnsafe(
34-
'0x18470168ca7a775b442cde110b668732f7b6390a505f3784b50f39993c5f3dce',
35-
),
36-
PublicChecks: AztecAddress.fromStringUnsafe('0x2d7745526508f5ceb278bb773a49f776842d1d2f0854c4a385bb661a2fabb9a8'),
37-
HandshakeRegistry: AztecAddress.fromStringUnsafe(
38-
'0x0bd62e76a9a3a103dae2e73040e05d3970ac900baff5637ae9f183396745ec7e',
39-
>>>>>>> origin/public-v5-next
29+
'0x0193c31bd24d0347aa9ed889cd6d304832988625c2f21c411e7af9d703591aa5',
4030
),
4131
};
4232

4333
export const StandardContractClassId: Record<StandardContractName, Fr> = {
44-
<<<<<<< HEAD
45-
AuthRegistry: Fr.fromString('0x151d75f71db863281277cea8d9fb901509e735abee16e3c415b2de1cbe35d0a2'),
46-
MultiCallEntrypoint: Fr.fromString('0x0c29e321de18a6d87363a54e927444079675f4b44ccc2baaef93432c003a740d'),
47-
PublicChecks: Fr.fromString('0x119aed3bd453156b28f9455a56283a419bd74ec314ac1e78f603f4f15bfaa424'),
48-
HandshakeRegistry: Fr.fromString('0x1e5b9549f480de778b5a715880d977ffae790239b659168f5e53cda9c2218ae8'),
49-
=======
50-
AuthRegistry: Fr.fromString('0x1f8810cff8690ef53281da87fcda9d4820154d6dcd76012c90bf459b3ba3ab7a'),
51-
MultiCallEntrypoint: Fr.fromString('0x282930170063677f616bcf9dc9fbfd4968a577dbbcdec0ea3c06283a44bcc743'),
52-
PublicChecks: Fr.fromString('0x2a0f1592c7f4c979b328ed030039a4e9a469aab30afa3a036735c338067abbcd'),
53-
HandshakeRegistry: Fr.fromString('0x10fbd0602fe72a04c86e25728c8c2b94a359c684738768cbe4e44fb05f6a908c'),
54-
>>>>>>> origin/public-v5-next
34+
AuthRegistry: Fr.fromString('0x1c37c286f6b020b17dfd3b89a11a6982b08eda4b3abfb42d2f4a340861d0cd8a'),
35+
MultiCallEntrypoint: Fr.fromString('0x2a1aa136e793e3243d322f4ad81883fbf43946a73c7a15cee1cafa70fe099f16'),
36+
PublicChecks: Fr.fromString('0x1a2fe8b88cbecf39956d9a0d80b37083baf3c25f228c8b231e2c65b571d9f3c2'),
37+
HandshakeRegistry: Fr.fromString('0x13d3abc9b8e4486e0176f1697c2fe95a8051b69c18e2dd5622bd632c3dffe32b'),
5538
};
5639

5740
export const StandardContractClassIdPreimage: Record<
5841
StandardContractName,
5942
{ artifactHash: Fr; privateFunctionsRoot: Fr; publicBytecodeCommitment: Fr }
6043
> = {
6144
AuthRegistry: {
62-
<<<<<<< HEAD
63-
artifactHash: Fr.fromString('0x080d146ee61f80f37e18a2a4c2483744c828e9384e716398f3b9fedb5b4a5cbc'),
45+
artifactHash: Fr.fromString('0x22c9be71305b276fe067a365e82de86f239b9e37ae37b067dbc42730a770b0f5'),
6446
privateFunctionsRoot: Fr.fromString('0x1b16157ab0b322bcaf3de5cb197b276c5e29ca3668a0c440668ca56aa7dfff77'),
6547
publicBytecodeCommitment: Fr.fromString('0x0c7984b020afc901da3b5898b8f94d1d9a09ea2b37d6e0043409abc0b0332906'),
6648
},
6749
MultiCallEntrypoint: {
68-
artifactHash: Fr.fromString('0x0e2d5d2b2e024ae79d4df7cf4ebceb1b8dc98a049b05a79353feb76c9c2785a5'),
50+
artifactHash: Fr.fromString('0x1237faf7f1ecbcb847433c53087951934491f57637e29917c8435b04ce8900a5'),
6951
privateFunctionsRoot: Fr.fromString('0x10228bc99b6715f15c866a1df0d9cb63c31920cb8e61a6b79058bf98658d7f39'),
7052
publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
7153
},
7254
PublicChecks: {
73-
artifactHash: Fr.fromString('0x07dc17311a81557c8d63369e7ca1eb2c121e98407b338ef61e406003e2246928'),
74-
=======
75-
artifactHash: Fr.fromString('0x1bfa3469d2f70892f9ba54117abcf4ca52bb758e66be19b5d0ab86600202ab73'),
76-
privateFunctionsRoot: Fr.fromString('0x17b584350f4c3ccafd8f688729afb9feab8976114fb40012e9dee65022c072a4'),
77-
publicBytecodeCommitment: Fr.fromString('0x2545f39893766508ce37bb5cea5e4dcab04c6f7f79f3089b1c076876e9d268b2'),
78-
},
79-
MultiCallEntrypoint: {
80-
artifactHash: Fr.fromString('0x05d7e89374f90684063f132a79de9b0f9553508de9ec1b83b8f6110d6ebbc21f'),
81-
privateFunctionsRoot: Fr.fromString('0x0e68dfbb256e80b08b3aef47aca1f2669e97a9c6259787893c1223ac083ad5d5'),
82-
publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
83-
},
84-
PublicChecks: {
85-
artifactHash: Fr.fromString('0x0636977743e164f84fbd38ca408ad33794768c994f28dd8609729a8406d352dc'),
86-
>>>>>>> origin/public-v5-next
55+
artifactHash: Fr.fromString('0x26448d3d954099d3d00cb5d7257853c9ede487ed726df87229ed40b844f98bf4'),
8756
privateFunctionsRoot: Fr.fromString('0x202860adb1b8975971eeaf571aaaa88a27f4035290d58532ae7d60b0dfaad54c'),
8857
publicBytecodeCommitment: Fr.fromString('0x013c4f854a5c87c9daf86c5f9bc07a42c2a061f1d924a5b3564ec7edc8e18cb7'),
8958
},
9059
HandshakeRegistry: {
91-
<<<<<<< HEAD
92-
artifactHash: Fr.fromString('0x294711bb2ef12f26c51f754db9111ff4a5ebd7171d42e7ba7c6b638a8b09b650'),
93-
privateFunctionsRoot: Fr.fromString('0x143d27f4e317c85f2838e6ab75a01abc21ebf70ee72383925c4c93fbdf60427b'),
94-
=======
95-
artifactHash: Fr.fromString('0x2fc28e54f5f227307378f4620d793db72a4e1a7937e8cb31396b61a48ea7abef'),
96-
privateFunctionsRoot: Fr.fromString('0x14f4bfbedd0d76e9b66d1f836a71457cb0f5b4f40280eec4a3ed40439440e252'),
97-
>>>>>>> origin/public-v5-next
60+
artifactHash: Fr.fromString('0x062da141c4114bcc93ac6cbe2fe30f0e8cbf820780b2225e958fe806d0e347a9'),
61+
privateFunctionsRoot: Fr.fromString('0x2fa128fc7f3b5aa6c4b9dc065f251c73bd947b65f2c00f784a68114de621228a'),
9862
publicBytecodeCommitment: Fr.fromString('0x0ce4c618c3ed7f3a20410e618c06bb701e150af7fe28a3e92f68e7733809f33e'),
9963
},
10064
};
@@ -132,31 +96,19 @@ export const StandardContractPrivateFunctions: Record<
13296
selector: FunctionSelector.fromField(
13397
Fr.fromString('0x0000000000000000000000000000000000000000000000000000000019f8b409'),
13498
),
135-
<<<<<<< HEAD
136-
vkHash: Fr.fromString('0x0158cac20cbeac38d25cd99c907644549abb7e668496f06cb2c6fd5da47b8f32'),
137-
=======
138-
vkHash: Fr.fromString('0x0b9ec5c76f08f8025800691659d7ba1432ddb8a30e40fdbd4d8f5c398b8c9ab7'),
139-
>>>>>>> origin/public-v5-next
99+
vkHash: Fr.fromString('0x0357aa2db339c32ac5157260db378af0053d904960b764c85498547df9b94c90'),
140100
},
141101
{
142102
selector: FunctionSelector.fromField(
143103
Fr.fromString('0x00000000000000000000000000000000000000000000000000000000db548fcf'),
144104
),
145-
<<<<<<< HEAD
146-
vkHash: Fr.fromString('0x0dd0ed2bb842c543e34b12c98ed56686dce0bae7e7aa7527dc5d42f36f039947'),
147-
=======
148-
vkHash: Fr.fromString('0x1c0f79ad358fc72c0f8cbac535d2d67f49dcea2f7d6c658eb38c7669f8ae2f93'),
149-
>>>>>>> origin/public-v5-next
105+
vkHash: Fr.fromString('0x00281e870a222de82b949de3d569793275c258a50b137f48b8f3c8982319b0e2'),
150106
},
151107
{
152108
selector: FunctionSelector.fromField(
153109
Fr.fromString('0x00000000000000000000000000000000000000000000000000000000f1ff839b'),
154110
),
155-
<<<<<<< HEAD
156-
vkHash: Fr.fromString('0x25f309ba580e48ec868bb75656274359f8a597a0ead0739c94444b9e609e475f'),
157-
=======
158-
vkHash: Fr.fromString('0x2c2961a5e83daa909242c9ce441526c0a95379fda0976877acba4ffe7be949f3'),
159-
>>>>>>> origin/public-v5-next
111+
vkHash: Fr.fromString('0x049120d4c9a12a2286c83df31064637b53746ea13868b0756174dcb3e036bb9d'),
160112
},
161113
],
162114
};

0 commit comments

Comments
 (0)