Skip to content
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

feat: Added script to compute hashes from L1, L2 and system contracts #1187

Merged
merged 27 commits into from
Jan 9, 2025
Merged

feat: Added script to compute hashes from L1, L2 and system contracts #1187

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
32b041b
Fixed hashed computation function
mm-zk Jan 4, 2025
50266dd
uncomment CI
mm-zk Jan 4, 2025
61ba0f0
all contract hashes part1
mm-zk Jan 4, 2025
8297c2f
Adding calculate hashes to main contracts
mm-zk Jan 4, 2025
3f603d8
cleanups
mm-zk Jan 4, 2025
7aab7a4
changed from undefined to null
mm-zk Jan 4, 2025
5fa0556
adapting calculate hashes to new foundry (in progress)
mm-zk Jan 5, 2025
c632483
fixed some missing contracts
mm-zk Jan 5, 2025
e0ece9a
use keccak, not sha
mm-zk Jan 5, 2025
26cc4e4
trying wihtout system contracts
mm-zk Jan 6, 2025
1d24f1a
more updates to calculate hashes
mm-zk Jan 8, 2025
d6f7227
calculate hashes for yul files too
mm-zk Jan 8, 2025
f4fe92c
reverted
mm-zk Jan 8, 2025
d1e66d4
Merge remote-tracking branch 'origin/sync-layer-stable' into mmzk_010…
mm-zk Jan 8, 2025
169ce68
move CI check to l1-contracts.
mm-zk Jan 8, 2025
8609b03
fixed lints
mm-zk Jan 8, 2025
5529175
experimenting with CI
mm-zk Jan 8, 2025
6db543a
fixed yaml lint issue
mm-zk Jan 8, 2025
1ad9788
another attempt
mm-zk Jan 8, 2025
9e0e056
added logs
mm-zk Jan 8, 2025
45ad04d
more
mm-zk Jan 8, 2025
a93adbd
desperation
mm-zk Jan 8, 2025
a752281
disable recursive that is causing trouble
mm-zk Jan 8, 2025
78d5636
added dir names to contract names (as there were some overlaps)
mm-zk Jan 8, 2025
6830087
fixed lint
mm-zk Jan 8, 2025
5d31d36
cleanup
mm-zk Jan 8, 2025
03b684f
lint + hash fix
mm-zk Jan 9, 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
Prev Previous commit
Next Next commit
calculate hashes for yul files too
  • Loading branch information
@mm-zk
mm-zk committed Jan 8, 2025
commit d6f72275d7ab62f6970917510c8fccc7a73bf341
136 changes: 136 additions & 0 deletions AllContractsHashes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1958,5 +1958,141 @@
"evmDeployedBytecodeHash": "0xbcf2d0de342544f95c33cddbc122cd29455067219c60555a59ee680745879fa7",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "CodeOracle.yul",
"zkBytecodePath": "/system-contracts/zkout/CodeOracle.yul/contracts-preprocessed/precompiles/CodeOracle.yul.json",
"zkBytecodeHash": "0x010000230498c3128f0f86bd5cebbce502948ae06b526559d7ed432312ea5673",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "EcAdd.yul",
"zkBytecodePath": "/system-contracts/zkout/EcAdd.yul/contracts-preprocessed/precompiles/EcAdd.yul.json",
"zkBytecodeHash": "0x010000859ed3467fe4da584e9d993f04d8df6c1d1e078db908cbaac1b6b9d84a",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "EcMul.yul",
"zkBytecodePath": "/system-contracts/zkout/EcMul.yul/contracts-preprocessed/precompiles/EcMul.yul.json",
"zkBytecodeHash": "0x010000bb45be5491bfa96eac012e6edbcd393863c753de44e1ddf364e490d2e5",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "EcPairing.yul",
"zkBytecodePath": "/system-contracts/zkout/EcPairing.yul/contracts-preprocessed/precompiles/EcPairing.yul.json",
"zkBytecodeHash": "0x01000f1df321417e6094bb72944163e3e3f6073c4a08723bcd75851a4af87cd7",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "Ecrecover.yul",
"zkBytecodePath": "/system-contracts/zkout/Ecrecover.yul/contracts-preprocessed/precompiles/Ecrecover.yul.json",
"zkBytecodeHash": "0x01000013344fb47b40c38eddb93142d381a1716cdb99a76aca64b31a3f83c7e5",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "EventWriter.yul",
"zkBytecodePath": "/system-contracts/zkout/EventWriter.yul/contracts-preprocessed/EventWriter.yul.json",
"zkBytecodeHash": "0x010000175f50060e9307a151fac7759407acd83eff7b387dce4e24814a09cb9f",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "Keccak256.yul",
"zkBytecodePath": "/system-contracts/zkout/Keccak256.yul/contracts-preprocessed/precompiles/Keccak256.yul.json",
"zkBytecodeHash": "0x0100000f9c77ddf3e1baef9df0c1a497858d24b0ea1cf76f04c9fe3f8b323098",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "Keccak256Mock.yul",
"zkBytecodePath": "/system-contracts/zkout/Keccak256Mock.yul/contracts-preprocessed/precompiles/test-contracts/Keccak256Mock.yul.json",
"zkBytecodeHash": "0x0100000b42fb03a0a603be54b1e742a9ebbe755c886cf193e5d98d35982f420c",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "P256Verify.yul",
"zkBytecodePath": "/system-contracts/zkout/P256Verify.yul/contracts-preprocessed/precompiles/P256Verify.yul.json",
"zkBytecodeHash": "0x0100000f40b6e168450d59aaf4283e70c5a26deb4b396a49e3a014b3f7433267",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "SHA256.yul",
"zkBytecodePath": "/system-contracts/zkout/SHA256.yul/contracts-preprocessed/precompiles/SHA256.yul.json",
"zkBytecodeHash": "0x010000172dd8b6099b59bc284647851340b609bcb9514fa1fad85aa64dedbbc1",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "bootloader_test.yul",
"zkBytecodePath": "/system-contracts/zkout/bootloader_test.yul/contracts-preprocessed/bootloader/bootloader_test.yul.json",
"zkBytecodeHash": "0x010003d38aadb86b0c0838a921dbc600728dfe529279491a3d316797482326e2",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "dummy.yul",
"zkBytecodePath": "/system-contracts/zkout/dummy.yul/contracts-preprocessed/bootloader/dummy.yul.json",
"zkBytecodeHash": "0x01000007c0dc61224c33c91f692c670202b257d4549c1b7801ecf5b1fc7a1c7d",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "fee_estimate.yul",
"zkBytecodePath": "/system-contracts/zkout/fee_estimate.yul/contracts-preprocessed/bootloader/fee_estimate.yul.json",
"zkBytecodeHash": "0x01000965ea0451253feaf6dafe12c6e12fba7cf279afa46e335e74fb45a7f063",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "gas_test.yul",
"zkBytecodePath": "/system-contracts/zkout/gas_test.yul/contracts-preprocessed/bootloader/gas_test.yul.json",
"zkBytecodeHash": "0x010008d5e797ddae2bc4f5780cf02ea88ae6c2eec8424c65e0113c317fc86e3e",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "playground_batch.yul",
"zkBytecodePath": "/system-contracts/zkout/playground_batch.yul/contracts-preprocessed/bootloader/playground_batch.yul.json",
"zkBytecodeHash": "0x0100096b2595be6c8c50405093d1e3bcf4a362b9345dfe2eee3ed7fa49209ae6",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "proved_batch.yul",
"zkBytecodePath": "/system-contracts/zkout/proved_batch.yul/contracts-preprocessed/bootloader/proved_batch.yul.json",
"zkBytecodeHash": "0x010008e5b883de8897598e83d383e332b87d09164363816c15f22353c3cd910d",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
},
{
"contractName": "transfer_test.yul",
"zkBytecodePath": "/system-contracts/zkout/transfer_test.yul/contracts-preprocessed/bootloader/transfer_test.yul.json",
"zkBytecodeHash": "0x010000152e84d6f348a177d29d0f11e03c8058ee3198e587051b59db424a75af",
"evmBytecodePath": null,
"evmBytecodeHash": null,
"evmDeployedBytecodeHash": null
}
]
48 changes: 43 additions & 5 deletions scripts/calculate-hashes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,10 +226,48 @@ const getYulContractDetails = (dir: string, contractName: string): ContractsInfo
};

const getYulContractsDetails = (dir: string): ContractsInfo[] => {
const filesEndingWithYul = findFilesEndingWith(dir, ".yul");
const bytecodesDir = join(dir, SOLIDITY_ARTIFACTS_ZK_DIR);
console.log(bytecodesDir);
const dirsEndingWithYul = findDirsEndingWith(bytecodesDir, ".yul").filter((dirent) => !dirent.name.endsWith(".t.sol"));

const compiledFiles = dirsEndingWithYul.map((d) => {
const contractFiles = fs.readdirSync(join(d.path, d.name), { withFileTypes: true, recursive: true })
.filter((dirent) => dirent.isFile() && dirent.name.endsWith(".json") && !dirent.name.includes("dbg"));



return contractFiles.map((c) => {
return join(c.path, c.name)
});
}).flat();

return compiledFiles.map((jsonFile) => {
const jsonFileContents = JSON.parse(fs.readFileSync(jsonFile, "utf8"));
const zkBytecodeHash =
getBytecodeHashFromZkJson(jsonFileContents);

const zkBytecodePath = jsonFile.startsWith(join(__dirname, '..'))
? jsonFile.replace(join(__dirname, '..'), "")
: jsonFile;


const contractName = (jsonFile.split('/').pop() || "").replace(".json", "");

return ({
contractName,
zkBytecodePath,
zkBytecodeHash,
evmBytecodePath: null,
evmBytecodeHash: null,
evmDeployedBytecodeHash: null,
});
// Filter out the interfaces (that don't have any bytecode).
}).filter((c) => c.zkBytecodeHash != "0x");

/*const filesEndingWithYul = findFilesEndingWith(dir, ".yul");
const contractNames = filesEndingWithYul.map((d) => d.replace(".yul", ""));
const yulContractsDetails = contractNames.map((c) => getYulContractDetails(dir, c));
return yulContractsDetails;
return yulContractsDetails;*/
};

const makePathAbsolute = (path: string): string => {
Expand Down Expand Up @@ -292,7 +330,7 @@ const SOLIDITY_SOURCE_CODE_PATHS = [
"l2-contracts/",
"l1-contracts/"
];
const YUL_SOURCE_CODE_PATHS = ["system-contracts/contracts-preprocessed", "system-contracts/contracts-preprocessed/precompiles", "system-contracts/bootloader/build"];
const YUL_SOURCE_CODE_PATHS = ["system-contracts/"];
const OUTPUT_FILE_PATH = "AllContractsHashes.json";

const main = async () => {
Expand All @@ -306,8 +344,8 @@ const main = async () => {
const checkOnly = args.includes("--check-only");

const solidityContractsDetails = _.flatten(SOLIDITY_SOURCE_CODE_PATHS.map(getSolidityContractsDetails));
//const yulContractsDetails = _.flatten(YUL_SOURCE_CODE_PATHS.map(getYulContractsDetails));
const systemContractsDetails = [...solidityContractsDetails];//, ...yulContractsDetails];
const yulContractsDetails = _.flatten(YUL_SOURCE_CODE_PATHS.map(getYulContractsDetails));
const systemContractsDetails = [...solidityContractsDetails, ...yulContractsDetails];

const newSystemContractsHashes = systemContractsDetails;
const oldSystemContractsHashes = readSystemContractsHashesFile(OUTPUT_FILE_PATH);
Expand Down