Skip to content

Commit

Permalink
Merge pull request #1077 from matter-labs/evm-emulator/merge-dev
Browse files Browse the repository at this point in the history 
chore(EVM): Merge dev
  • Loading branch information
@0xVolosnikov
0xVolosnikov authored Nov 20, 2024
2 parents 2af36d8 + c5ff569 commit 348e84a
Show file tree
Hide file tree
Showing 7 changed files with 43 additions and 59 deletions.
2 changes: 1 addition & 1 deletion l2-contracts/foundry.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ remappings = [
]

[profile.default.zksync]
zksolc = "1.5.6"
zksolc = "1.5.7"
2 changes: 1 addition & 1 deletion l2-contracts/hardhat.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if (!process.env.CHAIN_ETH_NETWORK) {

export default {
zksolc: {
version: "1.5.0",
version: "1.5.7",
compilerSource: "binary",
settings: {
isSystem: true,
Expand Down
70 changes: 35 additions & 35 deletions system-contracts/SystemContractsHashes.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,245 +3,245 @@
"contractName": "AccountCodeStorage",
"bytecodePath": "zkout/AccountCodeStorage.sol/AccountCodeStorage.json",
"sourceCodePath": "contracts-preprocessed/AccountCodeStorage.sol",
"bytecodeHash": "0x010000771fe52d0c3549739647ab6e8f375522a1db0188c2bd817337e4f97a21",
"bytecodeHash": "0x0100007780de9dddbd3da02c056b91ad5d01021c0272d1dd27e38c85be45f3d4",
"sourceCodeHash": "0xfdac12f45b5cfd4abd12923206f2d6f253d11a6624783e079b55e975d573ceb6"
},
{
"contractName": "BootloaderUtilities",
"bytecodePath": "zkout/BootloaderUtilities.sol/BootloaderUtilities.json",
"sourceCodePath": "contracts-preprocessed/BootloaderUtilities.sol",
"bytecodeHash": "0x010006f18933c40f61d00c5d3d7cd62a6a4e5f43a570e8406968cebca58c9cee",
"bytecodeHash": "0x010006f11cb97db853fb46dd01e679db89935588782b80c3084c427d093b5a18",
"sourceCodeHash": "0xed45097b2eaa4e47cd83f6feb3671d44adb49bac64c267844e76b3444605be19"
},
{
"contractName": "ComplexUpgrader",
"bytecodePath": "zkout/ComplexUpgrader.sol/ComplexUpgrader.json",
"sourceCodePath": "contracts-preprocessed/ComplexUpgrader.sol",
"bytecodeHash": "0x01000047a02183424005c945aaa56508fa915e0fc456b5af2b3a69fb511c9986",
"bytecodeHash": "0x010000479ec3174e7edbf5369412199c3ff17a48e77e607f226fdcf67207843a",
"sourceCodeHash": "0x796046a914fb676ba2bbd337b2924311ee2177ce54571c18a2c3945755c83614"
},
{
"contractName": "Compressor",
"bytecodePath": "zkout/Compressor.sol/Compressor.json",
"sourceCodePath": "contracts-preprocessed/Compressor.sol",
"bytecodeHash": "0x0100013f93ff6c87529264ab6f849af9e3d8501b236a6cd329f7c5eed13d89f0",
"bytecodeHash": "0x0100013fd2cd1bd37fc9ed112a69359d30dc9c40882c87de1b7af64d62613914",
"sourceCodeHash": "0xc6f7cd8b21aae52ed3dd5083c09b438a7af142a4ecda6067c586770e8be745a5"
},
{
"contractName": "ContractDeployer",
"bytecodePath": "zkout/ContractDeployer.sol/ContractDeployer.json",
"sourceCodePath": "contracts-preprocessed/ContractDeployer.sol",
"bytecodeHash": "0x010006713afcd2083d2511fb8e0b4ff6aa1f4a6f4ac52e93382b352a23196834",
"bytecodeHash": "0x010006719baa3a0e4e111366d448c79adb46ff2f998e043568d7b95117bd5619",
"sourceCodeHash": "0x3a03e66288c63fb72abe909ae829fa9495dce051753687d4395d41971847826b"
},
{
"contractName": "Create2Factory",
"bytecodePath": "zkout/Create2Factory.sol/Create2Factory.json",
"sourceCodePath": "contracts-preprocessed/Create2Factory.sol",
"bytecodeHash": "0x0100003f4a41044ce23b381f86c0bdae97386a6af7427d0abdf23257c473591f",
"bytecodeHash": "0x0100003fc288d0f1eafca23362a2ea07e786ff71ae01c543100bbf4784b8fe54",
"sourceCodeHash": "0x114d9322a9ca654989f3e0b3b21f1311dbc4db84f443d054cd414f6414d84de3"
},
{
"contractName": "DefaultAccount",
"bytecodePath": "zkout/DefaultAccount.sol/DefaultAccount.json",
"sourceCodePath": "contracts-preprocessed/DefaultAccount.sol",
"bytecodeHash": "0x01000509541bc77ac7b80bffca30d1f055e23444d1eef75237cdad33d9640a65",
"bytecodeHash": "0x01000509e7947a94bd0bb3c7269859bb7b2f289b47cdd989ed5acbf860521f01",
"sourceCodeHash": "0xef448fac6b6f1c217b6495ee134a3553e02dfb920fd46bc71de33672e64d9ab8"
},
{
"contractName": "EmptyContract",
"bytecodePath": "zkout/EmptyContract.sol/EmptyContract.json",
"sourceCodePath": "contracts-preprocessed/EmptyContract.sol",
"bytecodeHash": "0x01000007150d65a7f607873013a4241fc90ae6357cc061983c2615f369d7ec56",
"bytecodeHash": "0x01000007eb54e2d3bac886a8bc01a7fa41d3c1effb129cc72edc600bd9866af9",
"sourceCodeHash": "0xcac36c5afafbcff83601f4fbfdff660aa66d8c80ed97b9322d3011c1926b554d"
},
{
"contractName": "ImmutableSimulator",
"bytecodePath": "zkout/ImmutableSimulator.sol/ImmutableSimulator.json",
"sourceCodePath": "contracts-preprocessed/ImmutableSimulator.sol",
"bytecodeHash": "0x0100003399fcfebcf86405f3042d660ac10035046f54053206aed71bc79deebe",
"bytecodeHash": "0x01000033e14187c8f85799a7bd6d59193352b707e5794bd70b17e8afcae4172e",
"sourceCodeHash": "0x9659e69f7db09e8f60a8bb95314b1ed26afcc689851665cf27f5408122f60c98"
},
{
"contractName": "KnownCodesStorage",
"bytecodePath": "zkout/KnownCodesStorage.sol/KnownCodesStorage.json",
"sourceCodePath": "contracts-preprocessed/KnownCodesStorage.sol",
"bytecodeHash": "0x010000cdf16e2bc07f27fe381c07118a8dc74af8057aa405a8fef6abc45276cb",
"bytecodeHash": "0x010000cd1538f9a3418025676a99c9ce36b4e6e70ad823bd600e36882d5dc188",
"sourceCodeHash": "0x851fb5e170dfde39f1f9bc74654ec0b8f8f1d4c2fb20c06c77844c1e3ee0659a"
},
{
"contractName": "L1Messenger",
"bytecodePath": "zkout/L1Messenger.sol/L1Messenger.json",
"sourceCodePath": "contracts-preprocessed/L1Messenger.sol",
"bytecodeHash": "0x010002654afa780e927e7480444952e64e4fbc1ae6c4e213c6f012a230d9d540",
"bytecodeHash": "0x0100026558794f82978b3d29a3327ccab77f742e9f79e36ffc93e66994fc39ca",
"sourceCodeHash": "0xa8768fdaac6d8804782f14e2a51bbe2b6be31dee9103b6d02d149ea8dc46eb6a"
},
{
"contractName": "L2BaseToken",
"bytecodePath": "zkout/L2BaseToken.sol/L2BaseToken.json",
"sourceCodePath": "contracts-preprocessed/L2BaseToken.sol",
"bytecodeHash": "0x010000db21d61724e8661c3408695636966e31fd804b04adb0c9a4d6c6bba805",
"bytecodeHash": "0x010000db4abe83a75377dbf217a1c8d6d9fc26908765ffb47fbfab4aa92cf69f",
"sourceCodeHash": "0xdea518b1ea16718b0f0ec6155b227a8bc8f51374a9eebf7bc17cfe84433df740"
},
{
"contractName": "MsgValueSimulator",
"bytecodePath": "zkout/MsgValueSimulator.sol/MsgValueSimulator.json",
"sourceCodePath": "contracts-preprocessed/MsgValueSimulator.sol",
"bytecodeHash": "0x0100005981495abcb1cb1cd8255d8e6638d44feba1ce7b492428c68890c76bdb",
"bytecodeHash": "0x01000059c4299cd7ab15bf9351db6ae362d28665c5cf2674b655ee54415ec8fe",
"sourceCodeHash": "0x082f3dcbc2fe4d93706c86aae85faa683387097d1b676e7ebd00f71ee0f13b71"
},
{
"contractName": "NonceHolder",
"bytecodePath": "zkout/NonceHolder.sol/NonceHolder.json",
"sourceCodePath": "contracts-preprocessed/NonceHolder.sol",
"bytecodeHash": "0x010000cffe86563fef453fc3d3b6fd4ce64b833c8c3e543348727c2128d92b78",
"bytecodeHash": "0x010000cfbdc4f0313c148014f051e2ab25f989ee1c8257457954d5343125261a",
"sourceCodeHash": "0xcd0c0366effebf2c98c58cf96322cc242a2d1c675620ef5514b7ed1f0a869edc"
},
{
"contractName": "PubdataChunkPublisher",
"bytecodePath": "zkout/PubdataChunkPublisher.sol/PubdataChunkPublisher.json",
"sourceCodePath": "contracts-preprocessed/PubdataChunkPublisher.sol",
"bytecodeHash": "0x01000041d737da26e9cd50e031b84841f7a5e46a7577c9192e185a936538309d",
"bytecodeHash": "0x01000041a54610aa9ac7259adbe837383ed1d1aefd7cfb0446413f679e0b8767",
"sourceCodeHash": "0xd7161e2c8092cf57b43c6220bc605c0e7e540bddcde1af24e2d90f75633b098e"
},
{
"contractName": "SystemContext",
"bytecodePath": "zkout/SystemContext.sol/SystemContext.json",
"sourceCodePath": "contracts-preprocessed/SystemContext.sol",
"bytecodeHash": "0x010001c5586ccbd00914acc256e20f4c401afce55cf5977c42de51fac1ece58e",
"bytecodeHash": "0x010001c516d2f256a0394133c07f8b5793d791f363ffd989fb90be614ca78411",
"sourceCodeHash": "0xe2f6eb015d260aafe9405b28ef3ec27921add4de7f329b7ef61e0aa6c9365e29"
},
{
"contractName": "EventWriter",
"bytecodePath": "zkout/EventWriter.yul/contracts-preprocessed/EventWriter.yul.json",
"sourceCodePath": "contracts-preprocessed/EventWriter.yul",
"bytecodeHash": "0x0100001739ee6f13091800b6cac4bd0c2c81dd81b449b6ddf3e663ce098c60ad",
"bytecodeHash": "0x01000017575446d56eb4e640189c5e356449975b957ae5262924567f4f664d75",
"sourceCodeHash": "0xfcf4828bcc109dea5f88c38f428d9ac5e18d5a2767fa4909277802c7e38c1f93"
},
{
"contractName": "EvmEmulator",
"bytecodePath": "zkout/EvmEmulator.yul/contracts-preprocessed/EvmEmulator.yul.json",
"sourceCodePath": "contracts-preprocessed/EvmEmulator.yul",
"bytecodeHash": "0x01000c070693d072058711a75fc0be958972d87e902cbce0fb7540ad24d2d367",
"bytecodeHash": "0x01000c0750cd078b79c3bcf0ac3074e75a6824fe05e0e563e6df442feb879847",
"sourceCodeHash": "0x86296ecb81fc9edf5aac32613dfd645b538535e264e02a12ec7cdc751018de5d"
},
{
"contractName": "EvmGasManager",
"bytecodePath": "zkout/EvmGasManager.yul/contracts-preprocessed/EvmGasManager.yul.json",
"sourceCodePath": "contracts-preprocessed/EvmGasManager.yul",
"bytecodeHash": "0x01000073f07635332a31f5a0f84ae277e3462b0240ced32b9def9785c67e6a99",
"bytecodeHash": "0x01000073ec5f4ae42b87e9ef80c92506f25710cce88d32a510f79093633260bf",
"sourceCodeHash": "0x825dc1d9bec5128457a8b96eaf7ebf7c89dbb95a9bd7aab0f1601bc06455abfb"
},
{
"contractName": "CodeOracle",
"bytecodePath": "zkout/CodeOracle.yul/contracts-preprocessed/precompiles/CodeOracle.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/CodeOracle.yul",
"bytecodeHash": "0x01000023e6a0f618c73d49c0ef7f231343b2d82b35d0f3048c2fad6fd6efaccb",
"bytecodeHash": "0x01000023fa893b49736f6009966b73613fe2b1ffd6d57ffb7a03dd4cd48940a9",
"sourceCodeHash": "0xf4b21b6712a6e2a001a1b8214ac15959e670bd0ff125984486a28e128cb8846d"
},
{
"contractName": "EcAdd",
"bytecodePath": "zkout/EcAdd.yul/contracts-preprocessed/precompiles/EcAdd.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/EcAdd.yul",
"bytecodeHash": "0x01000085f63553694e753270541123b5e2c2b809f1b883db3ceb830366524a40",
"bytecodeHash": "0x01000085bf765ff04ad45979da71816fba3bdee901366c5cce73c94f3ee37bb9",
"sourceCodeHash": "0xdfec1c5f8c6a93df1c8821f1ac15058a18a640bcbdeb67dc4a017f2153ff1c86"
},
{
"contractName": "EcMul",
"bytecodePath": "zkout/EcMul.yul/contracts-preprocessed/precompiles/EcMul.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/EcMul.yul",
"bytecodeHash": "0x010000bbf677d3be4dbbf5dad75e63e87f2b1baf1b457d2507cb58025e26a2bf",
"bytecodeHash": "0x010000bbb84f463e70d100c271744ab9827d4c9b66ee4356a0c697dcb54e3b87",
"sourceCodeHash": "0x0e3f320c8a9532425b85809bf0a2136e707046a01bf20491ec03c77887516c43"
},
{
"contractName": "EcPairing",
"bytecodePath": "zkout/EcPairing.yul/contracts-preprocessed/precompiles/EcPairing.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/EcPairing.yul",
"bytecodeHash": "0x01000ef38d94382bae33b3ffc36660e56b2df54c49c32963f49153830c36121e",
"bytecodeHash": "0x01000ef37666c6447ad953d8be7ca75d4a0de3d5fd57a3966906d2c5577111ab",
"sourceCodeHash": "0x5d008cedc44e0e52c2567fd2b877916b2ec5e7c80294cf99b66485e50a6f2c12"
},
{
"contractName": "Ecrecover",
"bytecodePath": "zkout/Ecrecover.yul/contracts-preprocessed/precompiles/Ecrecover.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/Ecrecover.yul",
"bytecodeHash": "0x01000013ffc212bb76a7b9108abff6be1d0746154e36d32e9c69268ef95e556a",
"bytecodeHash": "0x01000013409fe778437b58e5819ee48a658fb09b86bb7badf93cb334c16cc632",
"sourceCodeHash": "0x21e03ab7a5f518a21258669c82506b1d4d1141f8fd4f30bb385f9730580ddd3c"
},
{
"contractName": "Identity",
"bytecodePath": "zkout/Identity.yul/contracts-preprocessed/precompiles/Identity.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/Identity.yul",
"bytecodeHash": "0x0100000d3cc11217da589db87c1cb3fda76701b7923b334b465eafd2e018b1b1",
"bytecodeHash": "0x0100000d9a79ff7daa1faef10d70906e871307162ea56e796c674a6c123e719f",
"sourceCodeHash": "0xcdf59308c83593ed41d9742411fdf41cfd9863932f948d20d08a11f6dcbd8f46"
},
{
"contractName": "Keccak256",
"bytecodePath": "zkout/Keccak256.yul/contracts-preprocessed/precompiles/Keccak256.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/Keccak256.yul",
"bytecodeHash": "0x0100000f16ef9261284d26f08a560cd482ff7eb7944fe37ac99113aa4eb75188",
"bytecodeHash": "0x0100000fb95dd6f46682ea2f0b187124613531b459091a6c38dc9d0260e5fff1",
"sourceCodeHash": "0xb454e7760732ce1fffc75174c8cf54dca422206cf1e52a29d274b310b574f26d"
},
{
"contractName": "P256Verify",
"bytecodePath": "zkout/P256Verify.yul/contracts-preprocessed/precompiles/P256Verify.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/P256Verify.yul",
"bytecodeHash": "0x0100000ff914846f07b729f21be741f039c13d9c8e7c53e4db3a4c9a9f7e022d",
"bytecodeHash": "0x0100000f72c45ba0985fe38394a29445cb337c127afb0da5e94211d518a00949",
"sourceCodeHash": "0x976b68d0362307313fd1aaea309eaa2d849187f37da451618c70dd3a6ac3cf3c"
},
{
"contractName": "SHA256",
"bytecodePath": "zkout/SHA256.yul/contracts-preprocessed/precompiles/SHA256.yul.json",
"sourceCodePath": "contracts-preprocessed/precompiles/SHA256.yul",
"bytecodeHash": "0x01000017cac2faad1aa8a1fd865fa464fbf092dbd8031dedb52fa6b8632e5b97",
"bytecodeHash": "0x010000176a7caf23abe1829a27684e6172e72e3b8a1d201364c5bbe53615202b",
"sourceCodeHash": "0xfd4290467e26e992f39db9ca132e78ce99ce042b0254a368f1d7832dc94ddefb"
},
{
"contractName": "bootloader_test",
"bytecodePath": "zkout/bootloader_test.yul/contracts-preprocessed/bootloader/bootloader_test.yul.json",
"sourceCodePath": "bootloader/build/bootloader_test.yul",
"bytecodeHash": "0x010003adf0d7654575286de7e85d6ceb7572ca71498e5708313a9e9b3d7918e1",
"bytecodeHash": "0x010003ad063d9ac388d3d8bd3739eb77d74589a0b2b50abb279203200f8a293a",
"sourceCodeHash": "0x4cac84261775ca327cf22d8b7595e020d03415e7c13311a8601b81543da1d94d"
},
{
"contractName": "dummy",
"bytecodePath": "zkout/dummy.yul/contracts-preprocessed/bootloader/dummy.yul.json",
"sourceCodePath": "bootloader/build/dummy.yul",
"bytecodeHash": "0x01000007b6aafb589f3b3d53466cb263cb237e75169fba7ba728aba0134007f9",
"bytecodeHash": "0x0100000799df180103cb4323acaa77800d219c3e00d3eeed7774d1fbdad4b930",
"sourceCodeHash": "0xfac5ca11a9882425af93fe5bac6d10055b119cf13af79e6a2f4e74e8411b9c85"
},
{
"contractName": "fee_estimate",
"bytecodePath": "zkout/fee_estimate.yul/contracts-preprocessed/bootloader/fee_estimate.yul.json",
"sourceCodePath": "bootloader/build/fee_estimate.yul",
"bytecodeHash": "0x010008fd08bbea54c1315eb3e83d04f4fe3807d86b6e07a57e1bc22006a1aeda",
"bytecodeHash": "0x010008fd2a790cf99a83a7fd8741851411b7c5d7bd016474d6f97416065803f2",
"sourceCodeHash": "0xaa1836b407eae63dcac7b99cfb91defdbac7baa6f4c049f9118181fff58c37ec"
},
{
"contractName": "gas_test",
"bytecodePath": "zkout/gas_test.yul/contracts-preprocessed/bootloader/gas_test.yul.json",
"sourceCodePath": "bootloader/build/gas_test.yul",
"bytecodeHash": "0x0100086956002b1d347b18a1a4b6d0cbb6136afc0a3cf6cd4371bf087caec0e5",
"bytecodeHash": "0x0100086961ed6952306ea7ccc5f6b4d06575714980e05d9d597d9f18306df17b",
"sourceCodeHash": "0x8c224e2e3c6e7c516ce5fbbbe841ecaaeb239e15e24ac0f2f7b4a8a11e9d9dfa"
},
{
"contractName": "playground_batch",
"bytecodePath": "zkout/playground_batch.yul/contracts-preprocessed/bootloader/playground_batch.yul.json",
"sourceCodePath": "bootloader/build/playground_batch.yul",
"bytecodeHash": "0x01000903ffd673549dcae99cd0f01a33fc5679fa600084f084179f9cbe7bf506",
"bytecodeHash": "0x01000903a83cceb9cea9f84fd73f41cec5e689679311844e55d4689e725ae75c",
"sourceCodeHash": "0x04d534fd13610e0a82531f4d2a466e5b6caf814a50fb3a1b0f7d77918f078d26"
},
{
"contractName": "proved_batch",
"bytecodePath": "zkout/proved_batch.yul/contracts-preprocessed/bootloader/proved_batch.yul.json",
"sourceCodePath": "bootloader/build/proved_batch.yul",
"bytecodeHash": "0x0100087b232b86e32e87f8acfb75c98a50363eb7ccbe504aae3f7b7e8dd94dbf",
"bytecodeHash": "0x0100087b1be05b8e462c1dc50e99eead337f09d42f26be0b4c643da5ba269bc1",
"sourceCodeHash": "0x72564482cf4e0e31bd47dbd15729952dd6994508c06f5065c2106920ad8e5a33"
},
{
"contractName": "transfer_test",
"bytecodePath": "zkout/transfer_test.yul/contracts-preprocessed/bootloader/transfer_test.yul.json",
"sourceCodePath": "bootloader/build/transfer_test.yul",
"bytecodeHash": "0x0100001532ccf5b061252699f6d2c677d987c775f48152271d5be4f02e41e454",
"bytecodeHash": "0x01000015904f1cc3ac2c66713ca1eaf00c27988a8d00515a743fb81a9919bdcc",
"sourceCodeHash": "0xb828600c6f7366971580b68da39c3e449b9a0f922f52dd9841f33ae7f51ee71c"
}
]
2 changes: 1 addition & 1 deletion system-contracts/foundry.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ remappings = [
]

[profile.default.zksync]
zksolc = "1.5.6"
zksolc = "1.5.7"
enable_eravm_extensions = true
suppressed_errors = ["sendtransfer"]
18 changes: 1 addition & 17 deletions system-contracts/hardhat.config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,11 @@ import "@matterlabs/hardhat-zksync-verify";
import "@nomiclabs/hardhat-ethers";
import "hardhat-typechain";

// This version of system contracts requires a pre release of the compiler
const COMPILER_VERSION = "v1.5.6";
const PRE_RELEASE_VERSION = "1.5.6";
function getZksolcUrl(): string {
// @ts-ignore
const platform = { darwin: "macosx", linux: "linux", win32: "windows" }[process.platform];
// @ts-ignore
const toolchain = { linux: "-musl", win32: "-gnu", darwin: "" }[process.platform];
const arch = process.arch === "x64" ? "amd64" : process.arch;
const ext = process.platform === "win32" ? ".exe" : "";

return `https://github.com/matter-labs/era-compiler-solidity/releases/download/${PRE_RELEASE_VERSION}/zksolc-${platform}-${arch}${toolchain}-${COMPILER_VERSION}${ext}`;
}

console.log(`Using zksolc from ${getZksolcUrl()}`);

export default {
zksolc: {
version: "1.5.7",
compilerSource: "binary",
settings: {
compilerPath: getZksolcUrl(),
enableEraVMExtensions: true,
suppressedErrors: ["sendtransfer"],
},
Expand Down
4 changes: 2 additions & 2 deletions system-contracts/scripts/compile-yul.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import * as fs from "fs";
import { Command } from "commander";
import * as _path from "path";

const COMPILER_VERSION = "1.5.6";
const IS_COMPILER_PRE_RELEASE = true;
const COMPILER_VERSION = "1.5.7";
const IS_COMPILER_PRE_RELEASE = false;
const CONTRACTS_DIR = "contracts-preprocessed";
const BOOTLOADER_DIR = "bootloader";
const TIMESTAMP_FILE_YUL = "last_compilation_yul.timestamp";
Expand Down
4 changes: 2 additions & 2 deletions system-contracts/scripts/compile-zasm.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import type { CompilerPaths } from "./utils";
import { spawn, compilerLocation, prepareCompilerPaths } from "./utils";
import * as fs from "fs";

const COMPILER_VERSION = "1.5.6";
const IS_COMPILER_PRE_RELEASE = true;
const COMPILER_VERSION = "1.5.7";
const IS_COMPILER_PRE_RELEASE = false;

export async function compileZasm(paths: CompilerPaths, file: string) {
const zksolcLocation = await compilerLocation(COMPILER_VERSION, IS_COMPILER_PRE_RELEASE);
Expand Down

0 comments on commit 348e84a

Please sign in to comment.