added explicit imports

Anotherblock · Dec 18, 2023 · dabb2a1 · dabb2a1
1 parent 2d80202
commit dabb2a1
Show file tree

Hide file tree

Showing 25 changed files with 53 additions and 50 deletions.
diff --git a/forge-cache/solidity-files-cache.json b/forge-cache/solidity-files-cache.json
diff --git a/script/base-goerli/create-publisher.s.sol b/script/base-goerli/create-publisher.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {AnotherCloneFactory} from "src/factory/AnotherCloneFactory.sol";
 

diff --git a/script/base-goerli/deploy-implementations.s.sol b/script/base-goerli/deploy-implementations.s.sol
@@ -6,7 +6,7 @@ forge script script/base-goerli/deploy-implementations.s.sol:DeployImplementatio
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {ERC1155AB} from "src/token/ERC1155/ERC1155AB.sol";
 import {ERC721ABLE} from "src/token/ERC721/ERC721ABLE.sol";

diff --git a/script/base-goerli/deploy-kyc-upgrade.s.sol b/script/base-goerli/deploy-kyc-upgrade.s.sol
@@ -6,7 +6,7 @@ forge script script/base-goerli/deploy-kyc-upgrade.s.sol:DeployUpgrade --rpc-url
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";

diff --git a/script/base-goerli/deploy-platform.s.sol b/script/base-goerli/deploy-platform.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
@@ -83,11 +83,12 @@ contract DeployPlatformBaseGoerli is Script {
         anotherCloneFactoryProxy = new TransparentUpgradeableProxy(
             address(new AnotherCloneFactory()),
             address(proxyAdmin),
-            abi.encodeWithSelector(AnotherCloneFactory.initialize.selector,
-                address(abDataRegistryProxy), 
-                address(abVerifierProxy), 
-                address(erc721Impl), 
-                address(erc1155Impl), 
+            abi.encodeWithSelector(
+                AnotherCloneFactory.initialize.selector,
+                address(abDataRegistryProxy),
+                address(abVerifierProxy),
+                address(erc721Impl),
+                address(erc1155Impl),
                 address(royaltyImpl)
             )
         );

diff --git a/script/base-goerli/deploy-royalty.s.sol b/script/base-goerli/deploy-royalty.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 

diff --git a/script/base-goerli/deploy-upgrade.s.sol b/script/base-goerli/deploy-upgrade.s.sol
@@ -6,7 +6,7 @@ forge script script/base-goerli/deploy-upgrade.s.sol:DeployUpgrade --rpc-url bas
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {ABDataRegistry} from "src/utils/ABDataRegistry.sol";
 import {ERC721ABOE} from "src/token/ERC721/ERC721ABOE.sol";

diff --git a/script/base/create-publisher.s.sol b/script/base/create-publisher.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {AnotherCloneFactory} from "src/factory/AnotherCloneFactory.sol";
 

diff --git a/script/base/deploy-implementations.s.sol b/script/base/deploy-implementations.s.sol
@@ -6,7 +6,7 @@ forge script script/base/deploy-implementations.s.sol:DeployImplementation --rpc
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {ERC1155AB} from "src/token/ERC1155/ERC1155AB.sol";
 import {ERC721ABLE} from "src/token/ERC721/ERC721ABLE.sol";

diff --git a/script/base/deploy-platform.s.sol b/script/base/deploy-platform.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";

diff --git a/script/base/deploy-royalty.s.sol b/script/base/deploy-royalty.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 

diff --git a/script/base/deploy-v1_1.s.sol b/script/base/deploy-v1_1.s.sol
@@ -6,7 +6,7 @@ forge script script/base/deploy-v1_1.s.sol:DeployUpgrade --rpc-url base --broadc
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {ERC721ABLE} from "src/token/ERC721/ERC721ABLE.sol";
 import {ERC721ABOE} from "src/token/ERC721/ERC721ABOE.sol";

diff --git a/script/goerli/fireblocks/create-publisher.s.sol b/script/goerli/fireblocks/create-publisher.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {AnotherCloneFactory} from "src/factory/AnotherCloneFactory.sol";
 

diff --git a/script/goerli/fireblocks/deploy-platform.s.sol b/script/goerli/fireblocks/deploy-platform.s.sol
@@ -6,7 +6,7 @@ fireblocks-json-rpc --http -- \
 forge script script/base-goerli/fireblocks/deploy-platform.s.sol:DeployPlatform --sender 0xed1a447270A92D23B716a1CF52B1f9C358f447Ee --broadcast --unlocked --verify --sig "run(bool)" false --rpc-url {}
 */
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
@@ -68,7 +68,9 @@ contract DeployPlatformGoerli is Script {
         abDataRegistryProxy = new TransparentUpgradeableProxy(
             address(new ABDataRegistry()),
             address(proxyAdmin),
-            abi.encodeWithSelector(ABDataRegistry.initialize.selector, DROP_ID_OFFSET, 0xD71256eC24925873cE9E9F085f89864Ca05970bD)
+            abi.encodeWithSelector(
+                ABDataRegistry.initialize.selector, DROP_ID_OFFSET, 0xD71256eC24925873cE9E9F085f89864Ca05970bD
+            )
         );
         if (!isDryRun) {
             _writeAddressToFile(address(abDataRegistryProxy), DATA_REGISTRY_PATH);
@@ -78,11 +80,12 @@ contract DeployPlatformGoerli is Script {
         anotherCloneFactoryProxy = new TransparentUpgradeableProxy(
             address(new AnotherCloneFactory()),
             address(proxyAdmin),
-            abi.encodeWithSelector(AnotherCloneFactory.initialize.selector,
-                address(abDataRegistryProxy), 
-                address(abVerifierProxy), 
-                address(erc721Impl), 
-                address(erc1155Impl), 
+            abi.encodeWithSelector(
+                AnotherCloneFactory.initialize.selector,
+                address(abDataRegistryProxy),
+                address(abVerifierProxy),
+                address(erc721Impl),
+                address(erc1155Impl),
                 address(royaltyImpl)
             )
         );

diff --git a/script/goerli/fireblocks/deploy-royalty.s.sol b/script/goerli/fireblocks/deploy-royalty.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 

diff --git a/script/op/deploy-ABSuperToken.s.sol b/script/op/deploy-ABSuperToken.s.sol
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
-import "test/_mocks/ABSuperToken.sol";
+import {Script} from "forge-std/Script.sol";
+import {ABSuperToken} from "test/_mocks/ABSuperToken.sol";
 
 contract DeployMockSuperTokenOptimism is Script {
     error INCORRECT_NETWORK();

diff --git a/script/op/deploy-platform.s.sol b/script/op/deploy-platform.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 import {ProxyAdmin} from "@openzeppelin/contracts/proxy/transparent/ProxyAdmin.sol";
@@ -77,15 +77,16 @@ contract DeployPlatformOptimism is Script {
         anotherCloneFactoryProxy = new TransparentUpgradeableProxy(
             address(new AnotherCloneFactory()),
             address(proxyAdmin),
-            abi.encodeWithSelector(AnotherCloneFactory.initialize.selector,
-                address(abDataRegistryProxy), 
-                address(abVerifierProxy), 
-                address(erc721Impl), 
-                address(erc1155Impl), 
-                address(royaltyImpl) 
+            abi.encodeWithSelector(
+                AnotherCloneFactory.initialize.selector,
+                address(abDataRegistryProxy),
+                address(abVerifierProxy),
+                address(erc721Impl),
+                address(erc1155Impl),
+                address(royaltyImpl)
             )
         );
-        
+
         if (!isDryRun) {
             _writeAddressToFile(address(anotherCloneFactoryProxy), FACTORY_PATH);
         }

diff --git a/script/op/deploy-royalty.s.sol b/script/op/deploy-royalty.s.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Script.sol";
+import {Script} from "forge-std/Script.sol";
 
 import {TransparentUpgradeableProxy} from "@openzeppelin/contracts/proxy/transparent/TransparentUpgradeableProxy.sol";
 

diff --git a/test/factory/AnotherCloneFactory.t.sol b/test/factory/AnotherCloneFactory.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 
 import {ERC721ABLE} from "src/token/ERC721/ERC721ABLE.sol";
 import {ERC721ABOE} from "src/token/ERC721/ERC721ABOE.sol";

diff --git a/test/royalty/ABRoyalty.t.sol b/test/royalty/ABRoyalty.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 
 import {ERC721ABLE} from "src/token/ERC721/ERC721ABLE.sol";
 import {ERC1155AB} from "src/token/ERC1155/ERC1155AB.sol";

diff --git a/test/token/ERC1155/ERC1155AB.t.sol b/test/token/ERC1155/ERC1155AB.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 
 import {ERC721ABLE} from "src/token/ERC721/ERC721ABLE.sol";
 import {ERC1155AB} from "src/token/ERC1155/ERC1155AB.sol";
@@ -127,7 +127,8 @@ contract ERC1155ABTest is Test, ERC1155ABTestData, ERC1155Holder {
         anotherCloneFactoryProxy = new TransparentUpgradeableProxy(
             address(new AnotherCloneFactory()),
             address(proxyAdmin),
-            abi.encodeWithSelector(AnotherCloneFactory.initialize.selector,
+            abi.encodeWithSelector(
+                AnotherCloneFactory.initialize.selector,
                 address(abDataRegistry),
                 address(abVerifier),
                 address(erc721Impl),
@@ -157,11 +158,8 @@ contract ERC1155ABTest is Test, ERC1155ABTestData, ERC1155Holder {
     }
 
     function test_initialize() public {
-        TransparentUpgradeableProxy erc1155proxy = new TransparentUpgradeableProxy(
-            address(new ERC1155AB()),
-            address(proxyAdmin),
-            ""
-        );
+        TransparentUpgradeableProxy erc1155proxy =
+            new TransparentUpgradeableProxy(address(new ERC1155AB()), address(proxyAdmin), "");
 
         nft = ERC1155AB(address(erc1155proxy));
         nft.initialize(publisher, address(abDataRegistry), address(abVerifier));

diff --git a/test/token/ERC721/ERC721ABLE.t.sol b/test/token/ERC721/ERC721ABLE.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 
 import {ERC721ABLE} from "src/token/ERC721/ERC721ABLE.sol";
 import {ERC1155AB} from "src/token/ERC1155/ERC1155AB.sol";

diff --git a/test/token/ERC721/ERC721ABOE.t.sol b/test/token/ERC721/ERC721ABOE.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 
 import {ERC721ABOE} from "src/token/ERC721/ERC721ABOE.sol";
 import {ERC1155AB} from "src/token/ERC1155/ERC1155AB.sol";

diff --git a/test/utils/ABDataRegistry.t.sol b/test/utils/ABDataRegistry.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 
 import {ABDataRegistry} from "src/utils/ABDataRegistry.sol";
 import {ABErrors} from "src/libraries/ABErrors.sol";

diff --git a/test/utils/ABVerifier.t.sol b/test/utils/ABVerifier.t.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.18;
 
-import "forge-std/Test.sol";
+import {Test} from "forge-std/Test.sol";
 
 import {ABVerifier} from "src/utils/ABVerifier.sol";
 import {ABVerifierTestData} from "test/_testdata/ABVerifier.td.sol";