Use latest dynamic contracts deps (#475)

nkrishang · web-flow · commit 86cd91c03961 · 2023-08-17T20:33:40.000-04:00
* Use latest version of dynamic-contracts

* add dynamic-contracts deps in node modules and add foundry remapping

* Update dynamic-contracts version
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "lib/ds-test"]
 	path = lib/ds-test
 	url = https://github.com/dapphub/ds-test
-[submodule "lib/dynamic-contracts"]
-	path = lib/dynamic-contracts
-	url = https://github.com/thirdweb-dev/dynamic-contracts
 [submodule "lib/openzeppelin-contracts"]
 	path = lib/openzeppelin-contracts
 	url = https://github.com/openzeppelin/openzeppelin-contracts
@@ -24,3 +21,6 @@
 	path = lib/ERC721A
 	url = https://github.com/chiru-labs/ERC721A
 	branch = v3.3.0
+[submodule "lib/dynamic-contracts"]
+	path = lib/dynamic-contracts
+	url = https://github.com/thirdweb-dev/dynamic-contracts
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;
@@ -45,7 +45,7 @@ contract ExtensionRegistry is IExtensionRegistry, ExtensionState, PermissionsEnu
 
     /// @notice Returns all extensions stored.
     function getAllExtensions() external view returns (Extension[] memory allExtensions) {
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
 
         string[] memory names = data.extensionNames.values();
         uint256 len = names.length;
@@ -59,7 +59,7 @@ contract ExtensionRegistry is IExtensionRegistry, ExtensionState, PermissionsEnu
 
     /// @notice Returns the extension metadata and functions for a given extension.
     function getExtension(string memory _extensionName) public view returns (Extension memory) {
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
         require(data.extensionNames.contains(_extensionName), "ExtensionRegistry: extension does not exist.");
         return data.extensions[_extensionName];
     }
@@ -80,7 +80,7 @@ contract ExtensionRegistry is IExtensionRegistry, ExtensionState, PermissionsEnu
 
     /// @notice Returns the extension metadata for a given function.
     function getExtensionForFunction(bytes4 _functionSelector) external view returns (ExtensionMetadata memory) {
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
         ExtensionMetadata memory metadata = data.extensionMetadata[_functionSelector];
         require(metadata.implementation != address(0), "ExtensionRegistry: no extension for function.");
         return metadata;
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;
@@ -86,7 +86,7 @@ abstract contract TWRouter is ITWRouter, Multicall, ExtensionState, Router {
         Extension[] memory mapExtensions = IDefaultExtensionSet(defaultExtensionSet).getAllExtensions();
         uint256 mapExtensionsLen = mapExtensions.length;
 
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
         string[] memory names = data.extensionNames.values();
         uint256 namesLen = names.length;
 
@@ -118,7 +118,7 @@ abstract contract TWRouter is ITWRouter, Multicall, ExtensionState, Router {
 
     /// @dev Returns the extension metadata and functions for a given extension.
     function getExtension(string memory _extensionName) public view returns (Extension memory) {
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
         bool isLocalExtension = data.extensionNames.contains(_extensionName);
 
         return
@@ -143,7 +143,7 @@ abstract contract TWRouter is ITWRouter, Multicall, ExtensionState, Router {
 
     /// @dev Returns the Extension metadata for a given function.
     function getExtensionForFunction(bytes4 _functionSelector) public view returns (ExtensionMetadata memory) {
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
         ExtensionMetadata memory metadata = data.extensionMetadata[_functionSelector];
 
         bool isLocalExtension = metadata.implementation != address(0);
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/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/BaseRouterWithDefaults.sol";
 
 //   $$\     $$\       $$\                 $$\                         $$\
 //   $$ |    $$ |      \__|                $$ |                        $$ |
@@ -18,16 +18,14 @@ import "lib/dynamic-contracts/src/presets/BaseRouter.sol";
 //   \$$$$  |$$ |  $$ |$$ |$$ |      \$$$$$$$ |\$$$$$\$$$$  |\$$$$$$$\ $$$$$$$  |
 //    \____/ \__|  \__|\__|\__|       \_______| \_____\____/  \_______|\_______/
 
-contract DynamicAccount is AccountCore, BaseRouter {
+contract DynamicAccount is AccountCore, BaseRouterWithDefaults {
     /*///////////////////////////////////////////////////////////////
                                 Constructor
     //////////////////////////////////////////////////////////////*/
 
-    receive() external payable override(Router, AccountCore) {}
-
     constructor(IEntryPoint _entrypoint, Extension[] memory _defaultExtensions)
         AccountCore(_entrypoint, msg.sender)
-        BaseRouter(_defaultExtensions)
+        BaseRouterWithDefaults(_defaultExtensions)
     {
         _disableInitializers();
     }
@@ -37,7 +35,7 @@ contract DynamicAccount is AccountCore, BaseRouter {
     //////////////////////////////////////////////////////////////*/
 
     /// @dev Returns whether a extension can be set in the given execution context.
-    function _canSetExtension() internal view virtual override returns (bool) {
+    function _canSetExtension(Extension memory) internal view virtual override returns (bool) {
         return isAdmin(msg.sender);
     }
 }
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,14 +15,11 @@ 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) {}
 
-    // solhint-disable-next-line no-empty-blocks
-    receive() external payable virtual override(Router, AccountCore) {}
-
     /// @notice Returns the implementation contract address for a given function signature.
     function getImplementationForFunction(bytes4 _functionSelector) public view virtual override returns (address) {
         return Router(payable(factory)).getImplementationForFunction(_functionSelector);
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/BaseRouterWithDefaults.sol";
 import "../utils/BaseAccountFactory.sol";
 
 // Extensions
@@ -21,19 +21,19 @@ import { ManagedAccount, IEntryPoint } from "./ManagedAccount.sol";
 //   \$$$$  |$$ |  $$ |$$ |$$ |      \$$$$$$$ |\$$$$$\$$$$  |\$$$$$$$\ $$$$$$$  |
 //    \____/ \__|  \__|\__|\__|       \_______| \_____\____/  \_______|\_______/
 
-contract ManagedAccountFactory is BaseAccountFactory, ContractMetadata, PermissionsEnumerable, BaseRouter {
+contract ManagedAccountFactory is BaseAccountFactory, ContractMetadata, PermissionsEnumerable, BaseRouterWithDefaults {
     /*///////////////////////////////////////////////////////////////
                             Constructor
     //////////////////////////////////////////////////////////////*/
 
     constructor(IEntryPoint _entrypoint, Extension[] memory _defaultExtensions)
-        BaseRouter(_defaultExtensions)
+        BaseRouterWithDefaults(_defaultExtensions)
         BaseAccountFactory(payable(address(new ManagedAccount(_entrypoint, address(this)))), address(_entrypoint))
     {
         _setupRole(DEFAULT_ADMIN_ROLE, msg.sender);
     }
 
-    receive() external payable override {
+    receive() external payable {
         revert("Cannot accept ether.");
     }
 
@@ -51,7 +51,7 @@ contract ManagedAccountFactory is BaseAccountFactory, ContractMetadata, Permissi
     }
 
     /// @dev Returns whether an extension can be set in the given execution context.
-    function _canSetExtension() internal view virtual override returns (bool) {
+    function _canSetExtension(Extension memory) internal view virtual override returns (bool) {
         return hasRole(DEFAULT_ADMIN_ROLE, msg.sender);
     }
 
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;
@@ -27,7 +27,7 @@ abstract contract BaseRouter is IBaseRouter, Router, ExtensionState {
     //////////////////////////////////////////////////////////////*/
 
     /// @dev See {IERC165-supportsInterface}.
-    function supportsInterface(bytes4 interfaceId) public view virtual returns (bool) {
+    function supportsInterface(bytes4 interfaceId) public view virtual override returns (bool) {
         return interfaceId == type(IBaseRouter).interfaceId;
     }
 
@@ -65,7 +65,7 @@ abstract contract BaseRouter is IBaseRouter, Router, ExtensionState {
      *          given precedence over default extensions in DefaultExtensionSet.
      */
     function getAllExtensions() external view returns (Extension[] memory allExtensions) {
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
 
         string[] memory names = data.extensionNames.values();
         uint256 len = names.length;
@@ -79,7 +79,7 @@ abstract contract BaseRouter is IBaseRouter, Router, ExtensionState {
 
     /// @dev Returns the extension metadata and functions for a given extension.
     function getExtension(string memory _extensionName) public view returns (Extension memory) {
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
         return data.extensions[_extensionName];
     }
 
@@ -99,7 +99,7 @@ abstract contract BaseRouter is IBaseRouter, Router, ExtensionState {
 
     /// @dev Returns the extension metadata for a given function.
     function getExtensionForFunction(bytes4 _functionSelector) public view returns (ExtensionMetadata memory) {
-        ExtensionStateStorage.Data storage data = ExtensionStateStorage.extensionStateStorage();
+        ExtensionStateStorage.Data storage data = _extensionStateStorage();
         return data.extensionMetadata[_functionSelector];
     }
 
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/BaseRouterWithDefaults.sol";
 
 import "../../extension/Multicall.sol";
 
@@ -34,7 +34,7 @@ contract BurnToClaimDropERC721 is
     Initializable,
     Multicall,
     ERC2771ContextUpgradeable,
-    BaseRouter,
+    BaseRouterWithDefaults,
     DefaultOperatorFiltererInit,
     ContractMetadataInit,
     PlatformFeeInit,
@@ -48,7 +48,7 @@ contract BurnToClaimDropERC721 is
                     Constructor + initializer logic
     //////////////////////////////////////////////////////////////*/
 
-    constructor(Extension[] memory _extensions) BaseRouter(_extensions) {}
+    constructor(Extension[] memory _extensions) BaseRouterWithDefaults(_extensions) {}
 
     /// @dev Initiliazes the contract, like a constructor.
     function initialize(
@@ -128,7 +128,7 @@ contract BurnToClaimDropERC721 is
     //////////////////////////////////////////////////////////////*/
 
     /// @dev Returns whether an extension can be set in the given execution context.
-    function _canSetExtension() internal view virtual override returns (bool) {
+    function _canSetExtension(Extension memory) internal view virtual override returns (bool) {
         return _hasRole(keccak256("EXTENSION_ROLE"), msg.sender);
     }
 
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/BaseRouterWithDefaults.sol";
 
 import "../../extension/Multicall.sol";
 import "../../dynamic-contracts/extension/Initializable.sol";
@@ -27,7 +27,7 @@ import "../../dynamic-contracts/init/DefaultOperatorFiltererInit.sol";
 
 contract EvolvingNFT is
     Initializable,
-    BaseRouter,
+    BaseRouterWithDefaults,
     Multicall,
     ERC721AQueryableInit,
     ERC2771ContextInit,
@@ -41,7 +41,7 @@ contract EvolvingNFT is
     /// @dev Only MINTER_ROLE holders can sign off on `MintRequest`s.
     bytes32 private constant EXTENSION_ROLE = keccak256("EXTENSION_ROLE");
 
-    constructor(Extension[] memory _extensions) BaseRouter(_extensions) {}
+    constructor(Extension[] memory _extensions) BaseRouterWithDefaults(_extensions) {}
 
     /// @dev Initiliazes the contract, like a constructor.
     function initialize(
@@ -65,6 +65,7 @@ contract EvolvingNFT is
         _setupOperatorFilterer();
 
         _setupRole(DEFAULT_ADMIN_ROLE, _defaultAdmin);
+        _setupRole(EXTENSION_ROLE, _defaultAdmin);
         _setupRole(keccak256("MINTER_ROLE"), _defaultAdmin);
         _setupRole(_transferRole, _defaultAdmin);
         _setupRole(_transferRole, address(0));
@@ -83,7 +84,7 @@ contract EvolvingNFT is
     }
 
     /// @dev Returns whether a extension can be set in the given execution context.
-    function _canSetExtension() internal view virtual override returns (bool) {
+    function _canSetExtension(Extension memory) internal view virtual override returns (bool) {
         return _hasRole(EXTENSION_ROLE, msg.sender);
     }
 
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/lib/dynamic-contracts b/lib/dynamic-contracts
@@ -1 +1 @@
-Subproject commit fe6237cc6e37d723d8ab603d62dfc19da72b546a
+Subproject commit 35a084c66413b6e2401834220174f635bb34516a
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.1.2",
     "@thirdweb-dev/sdk": "3.10.33",
     "@typechain/ethers-v5": "^10.0.0",
     "@typechain/hardhat": "^4.0.0",
diff --git a/src/test/EvolvingNFT.t.sol b/src/test/EvolvingNFT.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import { IExtension } from "lib/dynamic-contracts/src/interface/IExtension.sol";
+import { IExtension } from "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
 
 import { EvolvingNFT } from "contracts/unaudited/evolving-nfts/EvolvingNFT.sol";
 import { EvolvingNFTLogic } from "contracts/unaudited/evolving-nfts/EvolvingNFTLogic.sol";
diff --git a/src/test/burn-to-claim-drop/BurnToClaimDropERC721.t.sol b/src/test/burn-to-claim-drop/BurnToClaimDropERC721.t.sol
diff --git a/src/test/dynamic-contracts/DefaultExtensionSet.t.sol b/src/test/dynamic-contracts/DefaultExtensionSet.t.sol
diff --git a/src/test/dynamic-contracts/PluginRegistry.t.sol b/src/test/dynamic-contracts/PluginRegistry.t.sol
diff --git a/src/test/dynamic-contracts/TWRouter.t.sol b/src/test/dynamic-contracts/TWRouter.t.sol
diff --git a/src/test/smart-wallet/DynamicAccount.t.sol b/src/test/smart-wallet/DynamicAccount.t.sol
diff --git a/src/test/smart-wallet/ManagedAccount.t.sol b/src/test/smart-wallet/ManagedAccount.t.sol
diff --git a/yarn.lock b/yarn.lock
