diff --git a/.gitignore b/.gitignore
index 7f3a0e5d..d3e1aa36 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
 node_modules
 .env
 coverage.json
+coverage-hh/
+coverage-forge/
 typechain
 typechain-types
 cache
@@ -10,6 +12,7 @@ artifacts
 dist
 .DS_Store
 out/
+zkout/
 lcov.info
 lcov.info.pruned
 coverage/
@@ -18,4 +21,4 @@ broadcast/
 *collections*
 *whitelist*
 *invalid*
-*.tmp
\ No newline at end of file
+*.tmp
diff --git a/contracts/nft/erc1155m/clones/ERC1155ConduitPreapprovedCloneable.sol b/contracts/nft/erc1155m/clones/ERC1155ConduitPreapprovedCloneable.sol
index 514fea0a..80ab0d02 100644
--- a/contracts/nft/erc1155m/clones/ERC1155ConduitPreapprovedCloneable.sol
+++ b/contracts/nft/erc1155m/clones/ERC1155ConduitPreapprovedCloneable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.22;
 
-import {ERC1155} from "solady/src/tokens/ERC1155.sol";
+import {ERC1155} from "solady/src/tokens/ext/zksync/ERC1155.sol";
 
 /// @title ERC1155ConduitPreapprovedCloneable
 /// @notice ERC1155 token with the MagicEden conduit preapproved for seamless transactions.
diff --git a/contracts/nft/erc1155m/clones/ERC1155MagicDropMetadataCloneable.sol b/contracts/nft/erc1155m/clones/ERC1155MagicDropMetadataCloneable.sol
index 0a448c04..765a89c1 100644
--- a/contracts/nft/erc1155m/clones/ERC1155MagicDropMetadataCloneable.sol
+++ b/contracts/nft/erc1155m/clones/ERC1155MagicDropMetadataCloneable.sol
@@ -5,7 +5,7 @@ import {ERC2981} from "solady/src/tokens/ERC2981.sol";
 import {Ownable} from "solady/src/auth/Ownable.sol";
 import {Initializable} from "solady/src/utils/Initializable.sol";
 
-import {ERC1155} from "solady/src/tokens/ERC1155.sol";
+import {ERC1155} from "solady/src/tokens/ext/zksync/ERC1155.sol";
 import {IERC1155MagicDropMetadata} from "../interfaces/IERC1155MagicDropMetadata.sol";
 import {ERC1155ConduitPreapprovedCloneable} from "./ERC1155ConduitPreapprovedCloneable.sol";
 
diff --git a/lib/solady b/lib/solady
index 6122858a..d355d147 160000
--- a/lib/solady
+++ b/lib/solady
@@ -1 +1 @@
-Subproject commit 6122858a3aed96ee9493b99f70a245237681a95f
+Subproject commit d355d147f150844ddf55ffbb63fcd0130ac73fb4
diff --git a/package-lock.json b/package-lock.json
index dd1ad76a..c70400f4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,10 +16,7 @@
         "erc721a": "^4.2.3",
         "erc721a-upgradeable": "^4.3.0",
         "operator-filter-registry": "^1.4.2",
-        "solady": "^0.0.249"
-      },
-      "bin": {
-        "generateMerkleRoot": "scripts/utils/generateMerkleRoot.ts"
+        "solady": "^0.0.298"
       },
       "devDependencies": {
         "@ethersproject/abstract-provider": "^5.7.0",
@@ -21201,9 +21198,9 @@
       }
     },
     "node_modules/solady": {
-      "version": "0.0.249",
-      "resolved": "https://registry.npmjs.org/solady/-/solady-0.0.249.tgz",
-      "integrity": "sha512-35xhSV9aU6xaoRKvtba8TcYdsC571czhnF/vH3iCZu6AsWZebneuZv2ExT4UZbM9SrUGIt+ESygDBQ1ZNSQUaw=="
+      "version": "0.0.298",
+      "resolved": "https://registry.npmjs.org/solady/-/solady-0.0.298.tgz",
+      "integrity": "sha512-wHdtoSAyEsAJwHiG1amQ2IxhZk8XxL/YaYF8hf0yT51E5tWwWAohgEDmFwM8RT6Qt6XSsJBC2//kwIoCz/hFQQ=="
     },
     "node_modules/solc": {
       "version": "0.6.12",
diff --git a/package.json b/package.json
index 284e842a..d4907bc1 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "erc721a": "^4.2.3",
     "erc721a-upgradeable": "^4.3.0",
     "operator-filter-registry": "^1.4.2",
-    "solady": "^0.0.249"
+    "solady": "^0.0.298"
   },
   "peerDependencies": {
     "ethers": "^5.0.0"
@@ -99,4 +99,4 @@
       "prettier --write --plugin=prettier-plugin-solidity contracts"
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/scripts-foundry/deploy1155m.s.sol b/scripts-foundry/deploy1155m.s.sol
new file mode 100644
index 00000000..34a2b169
--- /dev/null
+++ b/scripts-foundry/deploy1155m.s.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+import "forge-std/Script.sol";
+import "../contracts/nft/erc1155m/clones/ERC1155MagicDropCloneable.sol";
+
+contract testDeploy is Script {
+    function run() external {
+        uint256 deployerPrivateKey = vm.envUint("PRIVATE_KEY");
+        vm.startBroadcast(deployerPrivateKey);
+        ERC1155MagicDropCloneable erc1155blahblahblah = new ERC1155MagicDropCloneable();
+
+        console.log(address(erc1155blahblahblah));
+
+        vm.stopBroadcast();
+    }
+}
diff --git a/test/erc1155m/clones/ERC1155MagicDropMetadataCloneable.t.sol b/test/erc1155m/clones/ERC1155MagicDropMetadataCloneable.t.sol
index 900f5c75..aa4e0682 100644
--- a/test/erc1155m/clones/ERC1155MagicDropMetadataCloneable.t.sol
+++ b/test/erc1155m/clones/ERC1155MagicDropMetadataCloneable.t.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.22;
 
 import {Test} from "forge-std/Test.sol";
-import {ERC1155} from "solady/src/tokens/ERC1155.sol";
+import {ERC1155} from "solady/src/tokens/ext/zksync/ERC1155.sol";
 
 import {Ownable} from "solady/src/auth/Ownable.sol";
 import {LibClone} from "solady/src/utils/LibClone.sol";