Replace contracts submodule path with era-contracts-lambda fork

lambdaclass · Dec 21, 2023 · 02ec7c3 · 02ec7c3
1 parent dc19def
commit 02ec7c3
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 28 deletions.
diff --git a/core/bin/system-constants-generator/src/main.rs b/core/bin/system-constants-generator/src/main.rs
@@ -218,13 +218,13 @@ fn update_rust_system_constants(intrinsic_gas_constants: &IntrinsicSystemGasCons
 
 fn update_l1_system_constants(intrinsic_gas_constants: &IntrinsicSystemGasConstants) {
     let l1_system_config = generate_l1_contracts_system_config(intrinsic_gas_constants);
-    save_file("contracts/SystemConfig.json", l1_system_config);
+    save_file("era-contracts-lambda/SystemConfig.json", l1_system_config);
 }
 
 fn update_l2_system_constants(intrinsic_gas_constants: &IntrinsicSystemGasConstants) {
     let l2_system_config = generate_l2_contracts_system_config(intrinsic_gas_constants);
     save_file(
-        "contracts/system-contracts/SystemConfig.json",
+        "era-contracts-lambda/system-contracts/SystemConfig.json",
         l2_system_config,
     );
 }

diff --git a/core/bin/system-constants-generator/src/utils.rs b/core/bin/system-constants-generator/src/utils.rs
@@ -164,7 +164,7 @@ pub(super) fn get_l1_txs(number_of_txs: usize) -> (Vec<Transaction>, Vec<Transac
 
 fn read_bootloader_test_code(test: &str) -> Vec<u8> {
     read_zbin_bytecode(format!(
-        "contracts/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
+        "era-contracts-lambda/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
         test, test
     ))
 }

diff --git a/core/lib/contracts/src/lib.rs b/core/lib/contracts/src/lib.rs
@@ -26,19 +26,19 @@ pub enum ContractLanguage {
 }
 
 const GOVERNANCE_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/cache/solpp-generated-contracts/governance/IGovernance.sol/IGovernance.json";
+    "era-contracts-lambda/l1-contracts/artifacts/cache/solpp-generated-contracts/governance/IGovernance.sol/IGovernance.json";
 const ZKSYNC_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/cache/solpp-generated-contracts/zksync/interfaces/IZkSync.sol/IZkSync.json";
+    "era-contracts-lambda/l1-contracts/artifacts/cache/solpp-generated-contracts/zksync/interfaces/IZkSync.sol/IZkSync.json";
 const MULTICALL3_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/cache/solpp-generated-contracts/dev-contracts/Multicall3.sol/Multicall3.json";
+    "era-contracts-lambda/l1-contracts/artifacts/cache/solpp-generated-contracts/dev-contracts/Multicall3.sol/Multicall3.json";
 const VERIFIER_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/cache/solpp-generated-contracts/zksync/Verifier.sol/Verifier.json";
+    "era-contracts-lambda/l1-contracts/artifacts/cache/solpp-generated-contracts/zksync/Verifier.sol/Verifier.json";
 const IERC20_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/cache/solpp-generated-contracts/common/interfaces/IERC20.sol/IERC20.json";
+    "era-contracts-lambda/l1-contracts/artifacts/cache/solpp-generated-contracts/common/interfaces/IERC20.sol/IERC20.json";
 const FAIL_ON_RECEIVE_CONTRACT_FILE: &str =
-    "contracts/l1-contracts/artifacts/cache/solpp-generated-contracts/zksync/dev-contracts/FailOnReceive.sol/FailOnReceive.json";
+    "era-contracts-lambda/l1-contracts/artifacts/cache/solpp-generated-contracts/zksync/dev-contracts/FailOnReceive.sol/FailOnReceive.json";
 const L2_BRIDGE_CONTRACT_FILE: &str =
-    "contracts/l2-contracts/artifacts-zk/cache-zk/solpp-generated-contracts/bridge/interfaces/IL2Bridge.sol/IL2Bridge.json";
+    "era-contracts-lambda/l2-contracts/artifacts-zk/cache-zk/solpp-generated-contracts/bridge/interfaces/IL2Bridge.sol/IL2Bridge.json";
 const LOADNEXT_CONTRACT_FILE: &str =
     "etc/contracts-test-data/artifacts-zk/contracts/loadnext/loadnext_contract.sol/LoadnextContract.json";
 const LOADNEXT_SIMPLE_CONTRACT_FILE: &str =
@@ -70,7 +70,7 @@ pub fn load_contract<P: AsRef<Path> + std::fmt::Debug>(path: P) -> Contract {
 
 pub fn load_sys_contract(contract_name: &str) -> Contract {
     load_contract(format!(
-        "contracts/system-contracts/artifacts-zk/cache-zk/solpp-generated-contracts/{0}.sol/{0}.json",
+        "era-contracts-lambda/system-contracts/artifacts-zk/cache-zk/solpp-generated-contracts/{0}.sol/{0}.json",
         contract_name
     ))
 }
@@ -200,7 +200,7 @@ impl SystemContractsRepo {
         let zksync_home = std::env::var("ZKSYNC_HOME").unwrap_or_else(|_| ".".into());
         let zksync_home = PathBuf::from(zksync_home);
         SystemContractsRepo {
-            root: zksync_home.join("contracts/system-contracts"),
+            root: zksync_home.join("era-contracts-lambda/system-contracts"),
         }
     }
     pub fn read_sys_contract_bytecode(
@@ -224,7 +224,7 @@ impl SystemContractsRepo {
 
 pub fn read_bootloader_code(bootloader_type: &str) -> Vec<u8> {
     read_zbin_bytecode(format!(
-        "contracts/system-contracts/bootloader/build/artifacts/{}.yul/{}.yul.zbin",
+        "era-contracts-lambda/system-contracts/bootloader/build/artifacts/{}.yul/{}.yul.zbin",
         bootloader_type, bootloader_type
     ))
 }

diff --git a/core/lib/multivm/src/versions/vm_1_3_2/utils.rs b/core/lib/multivm/src/versions/vm_1_3_2/utils.rs
@@ -221,7 +221,7 @@ pub fn create_test_block_params() -> (BlockContext, BlockProperties) {
 
 pub fn read_bootloader_test_code(test: &str) -> Vec<u8> {
     read_zbin_bytecode(format!(
-        "contracts/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
+        "era-contracts-lambda/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
         test, test
     ))
 }

diff --git a/core/lib/multivm/src/versions/vm_latest/tests/utils.rs b/core/lib/multivm/src/versions/vm_latest/tests/utils.rs
@@ -60,7 +60,7 @@ pub(crate) fn read_test_contract() -> Vec<u8> {
 
 pub(crate) fn get_bootloader(test: &str) -> SystemContractCode {
     let bootloader_code = read_zbin_bytecode(format!(
-        "contracts/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
+        "era-contracts-lambda/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
         test, test
     ));
 

diff --git a/core/lib/multivm/src/versions/vm_m5/utils.rs b/core/lib/multivm/src/versions/vm_m5/utils.rs
@@ -255,7 +255,7 @@ pub fn create_test_block_params() -> (BlockContext, BlockProperties) {
 
 pub fn read_bootloader_test_code(test: &str) -> Vec<u8> {
     read_zbin_bytecode(format!(
-        "contracts/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
+        "era-contracts-lambda/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
         test, test
     ))
 }
diff --git a/core/lib/multivm/src/versions/vm_m6/utils.rs b/core/lib/multivm/src/versions/vm_m6/utils.rs
@@ -258,7 +258,7 @@ pub fn create_test_block_params() -> (BlockContext, BlockProperties) {
 
 pub fn read_bootloader_test_code(test: &str) -> Vec<u8> {
     read_zbin_bytecode(format!(
-        "contracts/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
+        "era-contracts-lambda/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
         test, test
     ))
 }

diff --git a/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/utils.rs b/core/lib/multivm/src/versions/vm_refunds_enhancement/tests/utils.rs
@@ -61,7 +61,7 @@ pub(crate) fn read_test_contract() -> Vec<u8> {
 
 pub(crate) fn get_bootloader(test: &str) -> SystemContractCode {
     let bootloader_code = read_zbin_bytecode(format!(
-        "contracts/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
+        "era-contracts-lambda/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
         test, test
     ));
 

diff --git a/core/lib/multivm/src/versions/vm_virtual_blocks/tests/utils.rs b/core/lib/multivm/src/versions/vm_virtual_blocks/tests/utils.rs
@@ -61,7 +61,7 @@ pub(crate) fn read_test_contract() -> Vec<u8> {
 
 pub(crate) fn get_bootloader(test: &str) -> SystemContractCode {
     let bootloader_code = read_zbin_bytecode(format!(
-        "contracts/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
+        "era-contracts-lambda/system-contracts/bootloader/tests/artifacts/{}.yul/{}.yul.zbin",
         test, test
     ));
 

diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml
@@ -41,7 +41,7 @@ L2_WETH_TOKEN_PROXY_ADDR="0x5E6D086F5eC079ADFF4FB3774CDf3e8D6a34F7E9"
 FRI_RECURSION_LEAF_LEVEL_VK_HASH ="0x14628525c227822148e718ca1138acfc6d25e759e19452455d89f7f610c3dcb8"
 FRI_RECURSION_NODE_LEVEL_VK_HASH ="0x5a3ef282b21e12fe1f4438e5bb158fc5060b160559c5158c6389d62d9fe3d080"
 FRI_RECURSION_SCHEDULER_LEVEL_VK_HASH ="0x61ed1ea338680a9f83945b300a4a4778dd76d74a015b43a3e9b7fedba914a3d0"
-SNARK_WRAPPER_VK_HASH = "0x750d8e21be7555a6841472a5cacd24c75a7ceb34261aea61e72bb7423a7d30fc"
+SNARK_WRAPPER_VK_HASH = "0x4be443afd605a782b6e56d199df2460a025c81b3dea144e135bece83612563f2"
 
 # Prover that should be used at genesis. 'fri' or 'snark'
 PROVER_AT_GENESIS="fri"

diff --git a/infrastructure/zk/src/run/run.ts b/infrastructure/zk/src/run/run.ts
@@ -22,7 +22,7 @@ export async function deployERC20(
             destinationFile = args[args.indexOf('--envFile') + 1];
             args.splice(args.indexOf('--envFile'), 2);
         }
-        await utils.spawn(`yarn --silent --cwd contracts/l1-contracts deploy-erc20 add-multi '
+        await utils.spawn(`yarn --silent --cwd era-contracts-lambda/l1-contracts deploy-erc20 add-multi '
             [
                 { "name": "DAI",  "symbol": "DAI",  "decimals": 18 },
                 { "name": "wBTC", "symbol": "wBTC", "decimals":  8, "implementation": "RevertTransferERC20" },
@@ -45,7 +45,7 @@ export async function deployERC20(
         env.modify('CONTRACTS_L1_WETH_TOKEN_ADDR', `CONTRACTS_L1_WETH_TOKEN_ADDR=${WETH.address}`);
     } else if (command == 'new') {
         await utils.spawn(
-            `yarn --silent --cwd contracts/l1-contracts deploy-erc20 add --token-name ${name} --symbol ${symbol} --decimals ${decimals}`
+            `yarn --silent --cwd era-contracts-lambda/l1-contracts deploy-erc20 add --token-name ${name} --symbol ${symbol} --decimals ${decimals}`
         );
     }
 }
@@ -105,11 +105,11 @@ export async function loadtest(...args: string[]) {
 export async function readVariable(address: string, contractName: string, variableName: string, file?: string) {
     if (file === undefined)
         await utils.spawn(
-            `yarn --silent --cwd contracts/l1-contracts read-variable read ${address} ${contractName} ${variableName}`
+            `yarn --silent --era-cwd-lambda contracts/l1-contracts read-variable read ${address} ${contractName} ${variableName}`
         );
     else
         await utils.spawn(
-            `yarn --silent --cwd contracts/l1-contracts read-variable read ${address} ${contractName} ${variableName} -f ${file}`
+            `yarn --silent --cwd era-contracts-lambda/l1-contracts read-variable read ${address} ${contractName} ${variableName} -f ${file}`
         );
 }
 
@@ -186,7 +186,7 @@ command
     .command('read-variable <address> <contractName> <variableName>')
     .option(
         '-f --file <file>',
-        'file with contract source code(default $ZKSYNC_HOME/contracts/contracts/${contractName}.sol)'
+        'file with contract source code(default $ZKSYNC_HOME/era-contracts-lambda/contracts/${contractName}.sol)'
     )
     .description('Read value of contract variable')
     .action(async (address: string, contractName: string, variableName: string, cmd: Command) => {

diff --git a/package.json b/package.json
@@ -6,9 +6,9 @@
   "workspaces": {
     "packages": [
       "contracts",
-      "contracts/l1-contracts",
-      "contracts/l2-contracts",
-      "contracts/system-contracts",
+      "era-contracts-lambda/l1-contracts",
+      "era-contracts-lambda/l2-contracts",
+      "era-contracts-lambda/system-contracts",
       "etc/contracts-test-data",
       "etc/ERC20",
       "infrastructure/zk",