prepare for thirdweb deploy

Author: Krishang Nadgauda

contracts/ByocFactory.sol

@@ -11,9 +11,9 @@ import "@openzeppelin/contracts/metatx/ERC2771Context.sol";
 //  ==========  Internal imports    ==========
 import { IByocFactory } from "./interfaces/IByocFactory.sol";
 import { TWRegistry } from "./TWRegistry.sol";
-import { ThirdwebContract } from "./ThirdwebContract.sol";
+import "./ThirdwebContract.sol";
 
-contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable {
+contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable, ThirdwebContract {
     /*///////////////////////////////////////////////////////////////
                             State variables
     //////////////////////////////////////////////////////////////*/
@@ -112,11 +112,11 @@ contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable {
         emit Paused(_pause);
     }
 
-    function _msgSender() internal view virtual override(Context, ERC2771Context) returns (address sender) {
+    function _msgSender() internal view virtual override(Context, ERC2771Context, ExecutionContext) returns (address sender) {
         return ERC2771Context._msgSender();
     }
 
-    function _msgData() internal view virtual override(Context, ERC2771Context) returns (bytes calldata) {
+    function _msgData() internal view virtual override(Context, ERC2771Context, ExecutionContext) returns (bytes calldata) {
         return ERC2771Context._msgData();
     }
 }

contracts/ThirdwebContract.sol

@@ -2,10 +2,10 @@
 pragma solidity ^0.8.0;
 
 import "./feature/Ownable.sol";
-import "./feature/Context.sol";
+import "./feature/ExecutionContext.sol";
 import "./feature/ContractMetadata.sol";
 
-contract ThirdwebContract is Context, Ownable, ContractMetadata {
+contract ThirdwebContract is ExecutionContext, Ownable, ContractMetadata {
     struct ThirdwebInfo {
         string publishMetadataUri;
         string contractURI;

contracts/drop/SignatureDrop.sol

@@ -362,7 +362,7 @@ contract SignatureDrop is
         internal
         view
         virtual
-        override(ContextUpgradeable, ERC2771ContextUpgradeable, Context)
+        override(ContextUpgradeable, ERC2771ContextUpgradeable, ExecutionContext)
         returns (address sender)
     {
         return ERC2771ContextUpgradeable._msgSender();
@@ -372,7 +372,7 @@ contract SignatureDrop is
         internal
         view
         virtual
-        override(ContextUpgradeable, ERC2771ContextUpgradeable, Context)
+        override(ContextUpgradeable, ERC2771ContextUpgradeable, ExecutionContext)
         returns (bytes calldata)
     {
         return ERC2771ContextUpgradeable._msgData();

contracts/feature/DropSinglePhase.sol

@@ -3,10 +3,10 @@ pragma solidity ^0.8.0;
 
 import "./interface/IDropSinglePhase.sol";
 import "../lib/MerkleProof.sol";
-import "./Context.sol";
+import "./ExecutionContext.sol";
 import "@openzeppelin/contracts-upgradeable/utils/structs/BitMapsUpgradeable.sol";
 
-abstract contract DropSinglePhase is IDropSinglePhase, Context {
+abstract contract DropSinglePhase is IDropSinglePhase, ExecutionContext {
     using BitMapsUpgradeable for BitMapsUpgradeable.BitMap;
 
     /*///////////////////////////////////////////////////////////////

contracts/feature/Context.sol renamed to contracts/feature/ExecutionContext.sol

@@ -11,7 +11,7 @@ pragma solidity ^0.8.0;
  *
  * This contract is only required for intermediate, library-like contracts.
  */
-abstract contract Context {
+abstract contract ExecutionContext {
     function _msgSender() internal view virtual returns (address) {
         return msg.sender;
     }

contracts/feature/Permissions.sol

@@ -2,10 +2,10 @@
 pragma solidity ^0.8.0;
 
 import "./interface/IPermissions.sol";
-import "./Context.sol";
+import "./ExecutionContext.sol";
 import "../lib/Strings.sol";
 
-contract Permissions is IPermissions, Context {
+contract Permissions is IPermissions, ExecutionContext {
     mapping(bytes32 => mapping(address => bool)) private _hasRole;
     mapping(bytes32 => bytes32) private _getRoleAdmin;
 

foundry.toml

@@ -1,24 +1,24 @@
 [default]
 solc-version = "0.8.12"
- #auto_detect_solc = false
-src = 'src'
-test = 'test'
-out = 'artifacts_forge'
-libs = ['lib']
-remappings = [
-    #' @chainlink=node_modules/@chainlink/contracts/src/',
-    '@chainlink/contracts/src=node_modules/@chainlink/contracts/src/',
-    '@ds-test=lib/ds-test/src/',
-    '@openzeppelin=node_modules/@openzeppelin/',
-    '@std=lib/forge-std/src/',
-    'contracts/=contracts/',
-]
-libraries = []
+#auto_detect_solc = false
 cache = true
-force = false
 evm_version = 'london'
+force = false
+libraries = []
+libs = ['lib']
 optimizer = true
 optimizer_runs = 800
+out = 'artifacts_forge'
+remappings = [
+  #' @chainlink=node_modules/@chainlink/contracts/src/',
+  '@chainlink/contracts/src=node_modules/@chainlink/contracts/src/',
+  '@ds-test=lib/ds-test/src/',
+  '@openzeppelin=node_modules/@openzeppelin/',
+  '@std=lib/forge-std/src/',
+  'contracts/=contracts/',
+]
+src = 'src'
+test = 'test'
 verbosity = 0
 #ignored_error_codes = []
 #fuzz_runs = 256
@@ -34,4 +34,3 @@ verbosity = 0
 #block_coinbase = '0x0000000000000000000000000000000000000000'
 #block_timestamp = 0
 #block_difficulty = 0
-

src/test/utils/BaseTest.sol

@@ -25,6 +25,7 @@ import "contracts/token/TokenERC1155.sol";
 import "contracts/marketplace/Marketplace.sol";
 import "contracts/vote/VoteERC20.sol";
 import { ByocRegistry } from "contracts/ByocRegistry.sol";
+import { ByocFactory } from "contracts/ByocFactory.sol";
 import "contracts/mock/Mock.sol";
 
 abstract contract BaseTest is DSTest, Test {