Merge branch 'main' into db/update-install-script-to-include-anvil-zk…

…sync

crates/forge/tests/fixtures/zk/Constructor.s.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT OR Apache-2.0
+pragma solidity ^0.8.18;
+
+import {Script} from "forge-std/Script.sol";
+import {Bank} from "../src/Bank.sol";
+
+contract ConstructorScript is Script {
+    function run() external {
+        vm.startBroadcast();
+
+        // Test constructor without value
+        Bank bankNoValue = new Bank();
+        assert(bankNoValue.balance() == 0);
+
+        // Test constructor with 1 ether
+        Bank bankWithEther = new Bank{value: 1 ether}();
+        assert(bankWithEther.balance() == 1 ether);
+
+        // Test constructor with smaller value
+        Bank bankSmallValue = new Bank{value: 0.1 ether}();
+        assert(bankSmallValue.balance() == 0.1 ether);
+
+        vm.stopBroadcast();
+    }
+}

crates/forge/tests/it/zk/constructor.rs

@@ -0,0 +1,36 @@
+//! Forge tests for constructor functionality with and without value.
+
+use crate::{config::*, test_helpers::TEST_DATA_DEFAULT};
+use foundry_test_utils::{forgetest_async, util, TestProject};
+
+use crate::test_helpers::run_zk_script_test;
+use forge::revm::primitives::SpecId;
+use foundry_test_utils::Filter;
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_zk_constructor_works() {
+    let runner = TEST_DATA_DEFAULT.runner_zksync();
+    let filter = Filter::new("testZkConstructor", "ZkConstructorTest", ".*");
+
+    TestConfig::with_filter(runner, filter).evm_spec(SpecId::SHANGHAI).run().await;
+}
+
+forgetest_async!(test_zk_constructor_works_in_script, |prj, cmd| {
+    setup_deploy_prj(&mut prj);
+    run_zk_script_test(
+        prj.root(),
+        &mut cmd,
+        "./script/Constructor.s.sol",
+        "ConstructorScript",
+        None,
+        3,
+        Some(&["-vvvvv", "--broadcast"]),
+    );
+});
+
+fn setup_deploy_prj(prj: &mut TestProject) {
+    util::initialize(prj.root());
+    prj.add_script("Constructor.s.sol", include_str!("../../fixtures/zk/Constructor.s.sol"))
+        .unwrap();
+    prj.add_source("Bank.sol", include_str!("../../../../../testdata/zk/Bank.sol")).unwrap();
+}

crates/forge/tests/it/zk/mod.rs

@@ -1,6 +1,7 @@
 //! Forge tests for zkysnc functionality.
 mod basic;
 mod cheats;
+mod constructor;
 mod contracts;
 mod create;
 mod create2;

crates/verify/src/provider.rs

@@ -166,7 +166,7 @@ pub enum VerificationProviderType {
     Sourcify,
     Blockscout,
     Oklink,
-    #[value(alias = "zksync")]
+    #[clap(name = "zksync")]
     ZKsync,
 }
 

testdata/zk/Bank.sol

@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.18;
+
+contract Bank {
+    function balance() public view returns (uint256) {
+        return address(this).balance;
+    }
+
+    constructor() payable {}
+
+    receive() external payable {}
+}

testdata/zk/Constructor.t.sol

@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity ^0.8.18;
+
+import "ds-test/test.sol";
+import "../cheats/Vm.sol";
+import "../default/logs/console.sol";
+import "./Bank.sol";
+
+contract ZkConstructorTest is DSTest {
+    function testZkConstructorWorksWithValue() public {
+        Bank bank = new Bank{value: 1 ether}();
+        assertEq(bank.balance(), 1 ether);
+    }
+
+    function testZkConstructorWorksWithoutValue() public {
+        Bank bank = new Bank();
+        assertEq(bank.balance(), 0);
+    }
+}