Specify dependencies for solidity sdk

thirdweb-dev · Aug 16, 2023 · 18fe5a4 · 18fe5a4
1 parent 8d50a49
commit 18fe5a4
Show file tree

Hide file tree

Showing 21 changed files with 40 additions and 26 deletions.
diff --git a/contracts/dynamic-contracts/ExtensionRegistry.sol b/contracts/dynamic-contracts/ExtensionRegistry.sol
@@ -6,8 +6,8 @@ import "./interface/IExtensionRegistry.sol";
 
 // Extensions
 import "../extension/PermissionsEnumerable.sol";
-import "lib/dynamic-contracts/src/presets/utils/ExtensionState.sol";
-import "lib/dynamic-contracts/src/presets/utils/StringSet.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/utils/ExtensionState.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/utils/StringSet.sol";
 
 contract ExtensionRegistry is IExtensionRegistry, ExtensionState, PermissionsEnumerable {
     using StringSet for StringSet.Set;

diff --git a/contracts/dynamic-contracts/TWRouter.sol b/contracts/dynamic-contracts/TWRouter.sol
@@ -9,10 +9,10 @@ import "./interface/IExtensionRegistry.sol";
 import "../extension/Multicall.sol";
 
 // Extension pattern imports
-import "lib/dynamic-contracts/src/presets/utils/StringSet.sol";
-import "lib/dynamic-contracts/src/core/Router.sol";
-import "lib/dynamic-contracts/src/presets/utils/DefaultExtensionSet.sol";
-import "lib/dynamic-contracts/src/presets/utils/ExtensionState.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/utils/StringSet.sol";
+import "@thirdweb-dev/dynamic-contracts/src/core/Router.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/utils/DefaultExtensionSet.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/utils/ExtensionState.sol";
 
 abstract contract TWRouter is ITWRouter, Multicall, ExtensionState, Router {
     using StringSet for StringSet.Set;

diff --git a/contracts/dynamic-contracts/interface/IExtensionRegistry.sol b/contracts/dynamic-contracts/interface/IExtensionRegistry.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "lib/dynamic-contracts/src/interface/IDefaultExtensionSet.sol";
+import "@thirdweb-dev/dynamic-contracts/src/interface/IDefaultExtensionSet.sol";
 
 interface IExtensionRegistry is IDefaultExtensionSet {
     /*///////////////////////////////////////////////////////////////

diff --git a/contracts/dynamic-contracts/interface/ITWRouter.sol b/contracts/dynamic-contracts/interface/ITWRouter.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "lib/dynamic-contracts/src/interface/IDefaultExtensionSet.sol";
+import "@thirdweb-dev/dynamic-contracts/src/interface/IDefaultExtensionSet.sol";
 
 interface ITWRouter is IDefaultExtensionSet {
     /*///////////////////////////////////////////////////////////////

diff --git a/contracts/package.json b/contracts/package.json
@@ -15,5 +15,12 @@
   "files": [
     "**/*.sol",
     "/abi"
-  ]
+  ],
+  "dependencies": {
+    "@chainlink/contracts": "^0.6.1",
+    "@openzeppelin/contracts": "4.7.3",
+    "@openzeppelin/contracts-upgradeable": "4.7.3",
+    "erc721a-upgradeable": "^3.3.0",
+    "@thirdweb-dev/dynamic-contracts": "1.0.0"
+  }
 }
diff --git a/contracts/smart-wallet/dynamic/DynamicAccount.sol b/contracts/smart-wallet/dynamic/DynamicAccount.sol
@@ -7,7 +7,7 @@ pragma solidity ^0.8.11;
 
 import "../utils/AccountCore.sol";
 
-import "lib/dynamic-contracts/src/presets/BaseRouter.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/BaseRouter.sol";
 
 //   $$\     $$\       $$\                 $$\                         $$\
 //   $$ |    $$ |      \__|                $$ |                        $$ |

diff --git a/contracts/smart-wallet/dynamic/DynamicAccountFactory.sol b/contracts/smart-wallet/dynamic/DynamicAccountFactory.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.12;
 
 // Utils
 import "../utils/BaseAccountFactory.sol";
-import "lib/dynamic-contracts/src/interface/IExtension.sol";
+import "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
 
 // Extensions
 import "../../dynamic-contracts/extension/PermissionsEnumerable.sol";

diff --git a/contracts/smart-wallet/managed/ManagedAccount.sol b/contracts/smart-wallet/managed/ManagedAccount.sol
@@ -15,7 +15,7 @@ pragma solidity ^0.8.11;
 //    \____/ \__|  \__|\__|\__|       \_______| \_____\____/  \_______|\_______/
 
 import "../utils/AccountCore.sol";
-import "lib/dynamic-contracts/src/core/Router.sol";
+import "@thirdweb-dev/dynamic-contracts/src/core/Router.sol";
 
 contract ManagedAccount is AccountCore, Router {
     constructor(IEntryPoint _entrypoint, address _factory) AccountCore(_entrypoint, _factory) {}

diff --git a/contracts/smart-wallet/managed/ManagedAccountFactory.sol b/contracts/smart-wallet/managed/ManagedAccountFactory.sol
@@ -2,7 +2,7 @@
 pragma solidity ^0.8.12;
 
 // Utils
-import "lib/dynamic-contracts/src/presets/BaseRouter.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/BaseRouter.sol";
 import "../utils/BaseAccountFactory.sol";
 
 // Extensions

diff --git a/contracts/smart-wallet/utils/BaseRouter.sol b/contracts/smart-wallet/utils/BaseRouter.sol
@@ -4,14 +4,14 @@
 pragma solidity ^0.8.0;
 
 // Interface
-import "lib/dynamic-contracts/src/interface/IBaseRouter.sol";
+import "@thirdweb-dev/dynamic-contracts/src/interface/IBaseRouter.sol";
 
 // Core
-import "lib/dynamic-contracts/src/core/Router.sol";
+import "@thirdweb-dev/dynamic-contracts/src/core/Router.sol";
 
 // Utils
-import "lib/dynamic-contracts/src/presets/utils/StringSet.sol";
-import "lib/dynamic-contracts/src/presets/utils/ExtensionState.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/utils/StringSet.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/utils/ExtensionState.sol";
 
 abstract contract BaseRouter is IBaseRouter, Router, ExtensionState {
     using StringSet for StringSet.Set;

diff --git a/contracts/unaudited/burn-to-claim-drop/BurnToClaimDropERC721.sol b/contracts/unaudited/burn-to-claim-drop/BurnToClaimDropERC721.sol
@@ -12,7 +12,7 @@ pragma solidity ^0.8.11;
 //   \$$$$  |$$ |  $$ |$$ |$$ |      \$$$$$$$ |\$$$$$\$$$$  |\$$$$$$$\ $$$$$$$  |
 //    \____/ \__|  \__|\__|\__|       \_______| \_____\____/  \_______|\_______/
 
-import "lib/dynamic-contracts/src/presets/BaseRouter.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/BaseRouter.sol";
 
 import "../../extension/Multicall.sol";
 

diff --git a/contracts/unaudited/evolving-nfts/EvolvingNFT.sol b/contracts/unaudited/evolving-nfts/EvolvingNFT.sol
@@ -12,7 +12,7 @@ pragma solidity ^0.8.11;
 //   \$$$$  |$$ |  $$ |$$ |$$ |      \$$$$$$$ |\$$$$$\$$$$  |\$$$$$$$\ $$$$$$$  |
 //    \____/ \__|  \__|\__|\__|       \_______| \_____\____/  \_______|\_______/
 
-import "lib/dynamic-contracts/src/presets/BaseRouter.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/BaseRouter.sol";
 
 import "../../extension/Multicall.sol";
 import "../../dynamic-contracts/extension/Initializable.sol";

diff --git a/foundry.toml b/foundry.toml
@@ -36,6 +36,7 @@ remappings = [
   'contracts/=contracts/',
   'erc721a-upgradeable/=lib/ERC721A-Upgradeable/',
   'erc721a/=lib/ERC721A/',
+  '@thirdweb-dev/dynamic-contracts/=lib/dynamic-contracts/',
 ]
 src = 'contracts'
 test = 'src/test'

diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "@openzeppelin/contracts": "4.7.3",
     "@openzeppelin/contracts-upgradeable": "4.7.3",
     "@primitivefi/hardhat-dodoc": "^0.2.0",
+    "@thirdweb-dev/dynamic-contracts": "1.0.0",
     "@thirdweb-dev/sdk": "3.10.33",
     "@typechain/ethers-v5": "^10.0.0",
     "@typechain/hardhat": "^4.0.0",

diff --git a/src/test/burn-to-claim-drop/BurnToClaimDropERC721.t.sol b/src/test/burn-to-claim-drop/BurnToClaimDropERC721.t.sol
@@ -9,7 +9,7 @@ import { Royalty } from "contracts/dynamic-contracts/extension/Royalty.sol";
 import { BatchMintMetadata } from "contracts/dynamic-contracts/extension/BatchMintMetadata.sol";
 import { IBurnToClaim } from "contracts/extension/interface/IBurnToClaim.sol";
 
-import "lib/dynamic-contracts/src/interface/IExtension.sol";
+import "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
 
 import { TWProxy } from "contracts/TWProxy.sol";
 

diff --git a/src/test/dynamic-contracts/DefaultExtensionSet.t.sol b/src/test/dynamic-contracts/DefaultExtensionSet.t.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "lib/dynamic-contracts/src/interface/IExtension.sol";
-import "lib/dynamic-contracts/src/presets/utils/DefaultExtensionSet.sol";
+import "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
+import "@thirdweb-dev/dynamic-contracts/src/presets/utils/DefaultExtensionSet.sol";
 import "../mocks/MockERC20.sol";
 import "../mocks/MockERC721.sol";
 import "../mocks/MockERC1155.sol";

diff --git a/src/test/dynamic-contracts/PluginRegistry.t.sol b/src/test/dynamic-contracts/PluginRegistry.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "lib/dynamic-contracts/src/interface/IExtension.sol";
+import "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
 import "contracts/dynamic-contracts/ExtensionRegistry.sol";
 import { BaseTest } from "../utils/BaseTest.sol";
 

diff --git a/src/test/dynamic-contracts/TWRouter.t.sol b/src/test/dynamic-contracts/TWRouter.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "lib/dynamic-contracts/src/interface/IExtension.sol";
+import "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
 import "contracts/dynamic-contracts/ExtensionRegistry.sol";
 import "contracts/dynamic-contracts/TWRouter.sol";
 

diff --git a/src/test/smart-wallet/DynamicAccount.t.sol b/src/test/smart-wallet/DynamicAccount.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 // // Test utils
 // import "../utils/BaseTest.sol";
-// import "lib/dynamic-contracts/src/interface/IExtension.sol";
+// import "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
 // import { IAccountPermissions } from "contracts/extension/interface/IAccountPermissions.sol";
 // import { AccountPermissions } from "contracts/dynamic-contracts/extension/AccountPermissions.sol";
 // import { AccountExtension } from "contracts/smart-wallet/utils/AccountExtension.sol";

diff --git a/src/test/smart-wallet/ManagedAccount.t.sol b/src/test/smart-wallet/ManagedAccount.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
 
 // // Test utils
 // import "../utils/BaseTest.sol";
-// import "lib/dynamic-contracts/src/interface/IExtension.sol";
+// import "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
 // import { IAccountPermissions } from "contracts/extension/interface/IAccountPermissions.sol";
 // import { AccountPermissions } from "contracts/dynamic-contracts/extension/AccountPermissions.sol";
 // import { AccountExtension } from "contracts/smart-wallet/utils/AccountExtension.sol";

diff --git a/yarn.lock b/yarn.lock
@@ -1178,6 +1178,11 @@
   resolved "https://registry.yarnpkg.com/@thirdweb-dev/contracts/-/contracts-3.6.0.tgz#f85cf5468f387fa436fef826e07a6b6c7ea29279"
   integrity sha512-WPKyTb4Pqz8WZpQQ2RZEboIQIiki0YZruJBOvW20VfTZIt5rGUT2g9TkF6ca9O/SCdd1FM6ziQ7k0SV12QSxwg==
 
+"@thirdweb-dev/[email protected]":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@thirdweb-dev/dynamic-contracts/-/dynamic-contracts-1.0.0.tgz#f5c306bf84098c8a472e898962ae49607df29cc7"
+  integrity sha512-4hmvTIt9niJKjSfwIiz2uNnceQXK7nkRy65YY4k3ppxKgielG+D0IDTwVf4YpKambO6jc2lnSOlHf9uy83kFYg==
+
 "@thirdweb-dev/[email protected]":
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/@thirdweb-dev/generated-abis/-/generated-abis-0.0.1.tgz#0d788d6aff0ac08f11e9eeb9ae4c8321845272a8"