v3.15.0 (#641)

* reorg

* update dependencies

* update dependencies

* fix import

* v3.15.0

Author: kumaryash90

contracts/extension/SeaportEIP1271.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.11;
 
-import { ECDSA } from "solady/utils/ECDSA.sol";
+import { ECDSA } from "solady/src/utils/ECDSA.sol";
 import { SeaportOrderParser } from "./SeaportOrderParser.sol";
 import { OrderParameters } from "seaport-types/src/lib/ConsiderationStructs.sol";
 

contracts/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@thirdweb-dev/contracts",
   "description": "Collection of smart contracts deployable via the thirdweb SDK, dashboard and CLI",
-  "version": "3.14.0",
+  "version": "3.15.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -20,7 +20,8 @@
     "@openzeppelin/contracts": "^4.9.3",
     "@openzeppelin/contracts-upgradeable": "^4.9.3",
     "erc721a-upgradeable": "^3.3.0",
-    "@thirdweb-dev/dynamic-contracts": "^1.2.4"
+    "@thirdweb-dev/dynamic-contracts": "^1.2.4",
+    "solady": "0.0.180"
   },
   "engines": {
     "node": ">=18.0.0"

contracts/prebuilts/unaudited/airdrop/Airdrop.sol renamed to contracts/prebuilts/airdrop/Airdrop.sol

@@ -12,19 +12,19 @@ pragma solidity ^0.8.11;
 //   \$$$$  |$$ |  $$ |$$ |$$ |      \$$$$$$$ |\$$$$$\$$$$  |\$$$$$$$\ $$$$$$$  |
 //    \____/ \__|  \__|\__|\__|       \_______| \_____\____/  \_______|\_______/
 
-import "@solady/src/utils/MerkleProofLib.sol";
-import "@solady/src/utils/ECDSA.sol";
-import "@solady/src/utils/EIP712.sol";
-import "@solady/src/utils/SafeTransferLib.sol";
-import "@solady/src/utils/SignatureCheckerLib.sol";
-
-import { Initializable } from "../../../extension/Initializable.sol";
-import { Ownable } from "../../../extension/Ownable.sol";
-import { ContractMetadata } from "../../../extension/ContractMetadata.sol";
-
-import "../../../eip/interface/IERC20.sol";
-import "../../../eip/interface/IERC721.sol";
-import "../../../eip/interface/IERC1155.sol";
+import "solady/src/utils/MerkleProofLib.sol";
+import "solady/src/utils/ECDSA.sol";
+import "solady/src/utils/EIP712.sol";
+import "solady/src/utils/SafeTransferLib.sol";
+import "solady/src/utils/SignatureCheckerLib.sol";
+
+import { Initializable } from "../../extension/Initializable.sol";
+import { Ownable } from "../../extension/Ownable.sol";
+import { ContractMetadata } from "../../extension/ContractMetadata.sol";
+
+import "../../eip/interface/IERC20.sol";
+import "../../eip/interface/IERC721.sol";
+import "../../eip/interface/IERC1155.sol";
 
 contract Airdrop is EIP712, Initializable, Ownable, ContractMetadata {
     /*///////////////////////////////////////////////////////////////

foundry.toml

@@ -39,7 +39,7 @@ remappings = [
   'erc721a/=lib/ERC721A/',
   '@thirdweb-dev/dynamic-contracts/=lib/dynamic-contracts/',
   'lib/sstore2=lib/dynamic-contracts/lib/sstore2/',
-  '@solady/=lib/solady/',
+  'solady/=lib/solady/',
   '@seaport/=lib/seaport/contracts/',
   'seaport-types/=lib/seaport/lib/seaport-types/',
   'seaport-core/=lib/seaport/lib/seaport-core/'

package.json

@@ -29,6 +29,7 @@
     "mocha": "^9.2.2",
     "prettier": "^2.8.8",
     "prettier-plugin-solidity": "^1.2.0",
+    "solady": "0.0.180",
     "solhint": "^3.6.2",
     "solhint-plugin-prettier": "^0.0.5",
     "ts-node": "^10.9.1",

src/test/airdrop/Airdrop.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import { Airdrop, SafeTransferLib, ECDSA } from "contracts/prebuilts/unaudited/airdrop/Airdrop.sol";
+import { Airdrop, SafeTransferLib, ECDSA } from "contracts/prebuilts/airdrop/Airdrop.sol";
 
 // Test imports
 import { TWProxy } from "contracts/infra/TWProxy.sol";

src/test/benchmark/AirdropBenchmark.t.sol

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import { Airdrop } from "contracts/prebuilts/unaudited/airdrop/Airdrop.sol";
+import { Airdrop } from "contracts/prebuilts/airdrop/Airdrop.sol";
 
 // Test imports
 import { TWProxy } from "contracts/infra/TWProxy.sol";

yarn.lock

@@ -2476,6 +2476,11 @@ slice-ansi@^4.0.0:
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
+solady@0.0.180:
+  version "0.0.180"
+  resolved "https://registry.yarnpkg.com/solady/-/solady-0.0.180.tgz#d806c84a0bf8b6e3d85a8fb0978980de086ff59e"
+  integrity sha512-9QVCyMph+wk78Aq/GxtDAQg7dvNoVWx2dS2Zwf11XlwFKDZ+YJG2lrQsK9NEIth9NOebwjBXAYk4itdwOOE4aw==
+
 solhint-plugin-prettier@^0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/solhint-plugin-prettier/-/solhint-plugin-prettier-0.0.5.tgz#e3b22800ba435cd640a9eca805a7f8bc3e3e6a6b"