wip _thirdwebMsgSender callback solution

Author: Krishang Nadgauda

contracts/ByocFactory.sol

@@ -13,7 +13,9 @@ import { IByocFactory } from "./interfaces/IByocFactory.sol";
 import { TWRegistry } from "./TWRegistry.sol";
 import "./ThirdwebContract.sol";
 
-contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable, ThirdwebContract {
+import "hardhat/console.sol";
+
+contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable {
     /*///////////////////////////////////////////////////////////////
                             State variables
     //////////////////////////////////////////////////////////////*/
@@ -24,6 +26,9 @@ contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable, T
     /// @dev Whether the registry is paused.
     bool public isPaused;
 
+    /// @dev Empty var used in deployment.
+    address public deployer;
+
     /*///////////////////////////////////////////////////////////////
                     Constructor + modifiers
     //////////////////////////////////////////////////////////////*/
@@ -53,6 +58,9 @@ contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable, T
         uint256 _value,
         string memory publishMetadataUri
     ) external onlyUnpausedOrAdmin returns (address deployedAddress) {
+
+        deployer = _msgSender();
+
         require(bytes(publishMetadataUri).length > 0, "No publish metadata");
 
         bytes memory contractBytecode = abi.encodePacked(_contractBytecode, _constructorArgs);
@@ -69,6 +77,8 @@ contract ByocFactory is IByocFactory, ERC2771Context, AccessControlEnumerable, T
 
         registry.add(_publisher, deployedAddress);
 
+        delete deployer;
+
         emit ContractDeployed(_msgSender(), _publisher, deployedAddress);
     }
 

contracts/ThirdwebContract.sol

@@ -1,15 +1,23 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
+interface IDeployer {
+    function deployer() external view returns (address);
+}
+
 contract ThirdwebContract {
     /// @dev The publish metadata of the contract of which this contract is an instance.
     string private publishMetadataUri;
 
     /// @dev The address of the thirdweb factory.
-    address private immutable factory;
+    address private factory;
+
+    /// @dev Address of the contract deployer.
+    address private deployer;
 
     constructor() {
         factory = msg.sender;
+        deployer = IDeployer(msg.sender).deployer();
     }
 
     /// @dev Returns the publish metadata for this contract.
@@ -26,10 +34,7 @@ contract ThirdwebContract {
     /// @dev Returns msg.sender, if caller is not thirdweb factory. Returns the intended msg.sender if caller is factory.
     function _thirdwebMsgSender() internal view returns (address sender) {
         if (msg.sender == factory) {
-            // The assembly code is more direct than the Solidity version using `abi.decode`.
-            assembly {
-                sender := shr(96, calldataload(sub(calldatasize(), 20)))
-            }
+            sender = deployer;
         } else {
             sender = msg.sender;
         }

docs/ByocFactory.md

@@ -81,22 +81,22 @@ Deploys a clone pointing to an implementation of a published contract.
 |---|---|---|
 | deployedAddress | address | undefined
 
-### getPublishMetadataUri
+### deployer
 
 ```solidity
-function getPublishMetadataUri() external view returns (string)
+function deployer() external view returns (address)
 ```
 
 
 
-*Returns the publish metadata for this contract.*
+*Empty var used in deployment.*
 
 
 #### Returns
 
 | Name | Type | Description |
 |---|---|---|
-| _0 | string | undefined
+| _0 | address | undefined
 
 ### getRoleAdmin
 
@@ -294,22 +294,6 @@ function setPause(bool _pause) external nonpayable
 |---|---|---|
 | _pause | bool | undefined
 
-### setPublisheMetadataUi
-
-```solidity
-function setPublisheMetadataUi(string uri) external nonpayable
-```
-
-
-
-*Initializes the publish metadata and at deploy time.*
-
-#### Parameters
-
-| Name | Type | Description |
-|---|---|---|
-| uri | string | undefined
-
 ### supportsInterface
 
 ```solidity

docs/IDeployer.md

@@ -0,0 +1,32 @@
+# IDeployer
+
+
+
+
+
+
+
+
+
+## Methods
+
+### deployer
+
+```solidity
+function deployer() external view returns (address)
+```
+
+
+
+
+
+
+#### Returns
+
+| Name | Type | Description |
+|---|---|---|
+| _0 | address | undefined
+
+
+
+