Merge pull request #210 from hackdays-io/issue/208

Remove erc2771
hackdays-io · Dec 9, 2024 · 677fb01 · 677fb01
2 parents dc8f002 + 5869007
commit 677fb01
Show file tree

Hide file tree

Showing 22 changed files with 745 additions and 618 deletions.
diff --git a/pkgs/contract/.openzeppelin/sepolia.json b/pkgs/contract/.openzeppelin/sepolia.json
diff --git a/pkgs/contract/contracts/ERC2771ContextUpgradeable.sol b/pkgs/contract/contracts/ERC2771ContextUpgradeable.sol
diff --git a/pkgs/contract/contracts/Lock.sol b/pkgs/contract/contracts/Lock.sol
diff --git a/pkgs/contract/contracts/bigbang/BigBang.sol b/pkgs/contract/contracts/bigbang/BigBang.sol
@@ -5,10 +5,9 @@ import { IHats } from "../hats/src/Interfaces/IHats.sol";
 import { IHatsModuleFactory } from "./IHatsModuleFactory.sol";
 import { ISplitsCreatorFactory } from "../splitscreator/ISplitsCreatorFactory.sol";
 import { HatsTimeFrameModule } from "../timeframe/HatsTimeFrameModule.sol";
-import "./../ERC2771ContextUpgradeable.sol";
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
-contract BigBang is ERC2771ContextUpgradeable, OwnableUpgradeable {
+contract BigBang is OwnableUpgradeable {
 	IHats public Hats;
 
 	IHatsModuleFactory public HatsModuleFactory;
@@ -22,16 +21,16 @@ contract BigBang is ERC2771ContextUpgradeable, OwnableUpgradeable {
 	address public FractionToken;
 
 	event Executed(
+		address indexed creator,
 		address indexed owner,
 		uint256 indexed topHatId,
-		uint256 indexed hatterHatId,
+		uint256 hatterHatId,
 		address hatsTimeFrameModule,
 		address splitCreator
 	);
 
 	/**
 	 * @dev Constructor to initialize the trusted forwarder.
-	 * @param _trustedForwarder Address of the trusted forwarder contract.
 	 * @param _hatsAddress Address of the hats protocol V1 contract.
 	 * @param _hatsModuleFactory Address of the hats module factory contract.
 	 * @param _hatsTimeFrameModule_IMPL Address of the hats time frame module implementation contract.
@@ -40,7 +39,6 @@ contract BigBang is ERC2771ContextUpgradeable, OwnableUpgradeable {
 	 * @param _fractionToken Address of the fraction token contract.
 	 */
 	function initialize(
-		address _trustedForwarder,
 		address _hatsAddress,
 		address _hatsModuleFactory,
 		address _hatsTimeFrameModule_IMPL,
@@ -49,7 +47,6 @@ contract BigBang is ERC2771ContextUpgradeable, OwnableUpgradeable {
 		address _fractionToken
 	) public initializer {
 		__Ownable_init(_msgSender());
-		__ERC2771Context_init(address(_trustedForwarder));
 		Hats = IHats(_hatsAddress);
 		HatsModuleFactory = IHatsModuleFactory(_hatsModuleFactory);
 		HatsTimeFrameModule_IMPL = _hatsTimeFrameModule_IMPL;
@@ -65,16 +62,14 @@ contract BigBang is ERC2771ContextUpgradeable, OwnableUpgradeable {
 	 * @param _topHatImageURI The image URI of the topHat.
 	 * @param _hatterHatDetails The details of the hatterHat.
 	 * @param _hatterHatImageURI The image URI of the hatterHat.
-	 * @param _trustedForwarder The address of the trusted forwarder.
 	 * @return topHatId The ID used for navigating to the ProjectTop page after project creation.
 	 */
 	function bigbang(
 		address _owner,
 		string calldata _topHatDetails,
 		string calldata _topHatImageURI,
 		string calldata _hatterHatDetails,
-		string calldata _hatterHatImageURI,
-		address _trustedForwarder
+		string calldata _hatterHatImageURI
 	) external returns (uint256) {
 		// 1. TopHatのMint
 
@@ -115,7 +110,6 @@ contract BigBang is ERC2771ContextUpgradeable, OwnableUpgradeable {
 		address splitCreator = SplitsCreatorFactory
 			.createSplitCreatorDeterministic(
 				topHatId,
-				_trustedForwarder,
 				address(Hats),
 				SplitsFactoryV2,
 				hatsTimeFrameModule,
@@ -124,6 +118,7 @@ contract BigBang is ERC2771ContextUpgradeable, OwnableUpgradeable {
 			);
 
 		emit Executed(
+			msg.sender,
 			_owner,
 			topHatId,
 			hatterHatId,
@@ -163,22 +158,4 @@ contract BigBang is ERC2771ContextUpgradeable, OwnableUpgradeable {
 	function setFractionToken(address _fractionToken) external onlyOwner {
 		FractionToken = _fractionToken;
 	}
-
-	function _msgSender()
-		internal
-		view
-		override(ERC2771ContextUpgradeable, ContextUpgradeable)
-		returns (address sender)
-	{
-		return super._msgSender();
-	}
-
-	function _msgData()
-		internal
-		view
-		override(ERC2771ContextUpgradeable, ContextUpgradeable)
-		returns (bytes calldata)
-	{
-		return super._msgData();
-	}
 }
diff --git a/pkgs/contract/contracts/bigbang/mock/BigBang_Mock_v2.sol b/pkgs/contract/contracts/bigbang/mock/BigBang_Mock_v2.sol
@@ -5,13 +5,12 @@ import { IHats } from "../../hats/src/Interfaces/IHats.sol";
 import { IHatsModuleFactory } from "../IHatsModuleFactory.sol";
 import { ISplitsCreatorFactory } from "../../splitscreator/ISplitsCreatorFactory.sol";
 import { HatsTimeFrameModule } from "../../timeframe/HatsTimeFrameModule.sol";
-import "../../ERC2771ContextUpgradeable.sol";
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
 /**
  * Upgradableになっている確認するための検証用BigBangコントラクト
  */
-contract BigBang_Mock_v2 is ERC2771ContextUpgradeable, OwnableUpgradeable {
+contract BigBang_Mock_v2 is OwnableUpgradeable {
 	IHats public Hats;
 
 	IHatsModuleFactory public HatsModuleFactory;
@@ -34,7 +33,6 @@ contract BigBang_Mock_v2 is ERC2771ContextUpgradeable, OwnableUpgradeable {
 
 	/**
 	 * @dev Constructor to initialize the trusted forwarder.
-	 * @param _trustedForwarder Address of the trusted forwarder contract.
 	 * @param _hatsAddress Address of the hats protocol V1 contract.
 	 * @param _hatsModuleFactory Address of the hats module factory contract.
 	 * @param _hatsTimeFrameModule_IMPL Address of the hats time frame module implementation contract.
@@ -43,7 +41,6 @@ contract BigBang_Mock_v2 is ERC2771ContextUpgradeable, OwnableUpgradeable {
 	 * @param _fractionToken Address of the fraction token contract.
 	 */
 	function initialize(
-		address _trustedForwarder,
 		address _hatsAddress,
 		address _hatsModuleFactory,
 		address _hatsTimeFrameModule_IMPL,
@@ -52,7 +49,6 @@ contract BigBang_Mock_v2 is ERC2771ContextUpgradeable, OwnableUpgradeable {
 		address _fractionToken
 	) public initializer {
 		__Ownable_init(_msgSender());
-		__ERC2771Context_init(address(_trustedForwarder));
 		Hats = IHats(_hatsAddress);
 		HatsModuleFactory = IHatsModuleFactory(_hatsModuleFactory);
 		HatsTimeFrameModule_IMPL = _hatsTimeFrameModule_IMPL;
@@ -68,16 +64,14 @@ contract BigBang_Mock_v2 is ERC2771ContextUpgradeable, OwnableUpgradeable {
 	 * @param _topHatImageURI The image URI of the topHat.
 	 * @param _hatterHatDetails The details of the hatterHat.
 	 * @param _hatterHatImageURI The image URI of the hatterHat.
-	 * @param _trustedForwarder The address of the trusted forwarder.
 	 * @return topHatId The ID used for navigating to the ProjectTop page after project creation.
 	 */
 	function bigbang(
 		address _owner,
 		string calldata _topHatDetails,
 		string calldata _topHatImageURI,
 		string calldata _hatterHatDetails,
-		string calldata _hatterHatImageURI,
-		address _trustedForwarder
+		string calldata _hatterHatImageURI
 	) external returns (uint256) {
 		// 1. TopHatのMint
 
@@ -118,7 +112,6 @@ contract BigBang_Mock_v2 is ERC2771ContextUpgradeable, OwnableUpgradeable {
 		address splitCreator = SplitsCreatorFactory
 			.createSplitCreatorDeterministic(
 				topHatId,
-				_trustedForwarder,
 				address(Hats),
 				SplitsFactoryV2,
 				hatsTimeFrameModule,
@@ -167,24 +160,6 @@ contract BigBang_Mock_v2 is ERC2771ContextUpgradeable, OwnableUpgradeable {
 		FractionToken = _fractionToken;
 	}
 
-	function _msgSender()
-		internal
-		view
-		override(ERC2771ContextUpgradeable, ContextUpgradeable)
-		returns (address sender)
-	{
-		return super._msgSender();
-	}
-
-	function _msgData()
-		internal
-		view
-		override(ERC2771ContextUpgradeable, ContextUpgradeable)
-		returns (bytes calldata)
-	{
-		return super._msgData();
-	}
-
 	/**
 	 * 検証用に追加した関数
 	 */

diff --git a/pkgs/contract/contracts/fractiontoken/FractionToken.sol b/pkgs/contract/contracts/fractiontoken/FractionToken.sol
@@ -1,11 +1,10 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.24;
 
-import { ERC1155Upgradeable, ContextUpgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";
+import { ERC1155Upgradeable } from "@openzeppelin/contracts-upgradeable/token/ERC1155/ERC1155Upgradeable.sol";
 import { IHats } from "../hats/src/Interfaces/IHats.sol";
-import { ERC2771ContextUpgradeable } from "./../ERC2771ContextUpgradeable.sol";
 
-contract FractionToken is ERC1155Upgradeable, ERC2771ContextUpgradeable {
+contract FractionToken is ERC1155Upgradeable {
 	uint256 public TOKEN_SUPPLY;
 
 	mapping(uint256 => address[]) private tokenRecipients;
@@ -15,11 +14,9 @@ contract FractionToken is ERC1155Upgradeable, ERC2771ContextUpgradeable {
 	function initialize(
 		string memory _uri,
 		uint256 _tokenSupply,
-		address _hatsAddress,
-		address _trustedForwarderAddress
+		address _hatsAddress
 	) public initializer {
 		__ERC1155_init(_uri);
-		__ERC2771Context_init(address(_trustedForwarderAddress));
 		hatsContract = IHats(_hatsAddress);
 		TOKEN_SUPPLY = _tokenSupply;
 	}
@@ -191,22 +188,4 @@ contract FractionToken is ERC1155Upgradeable, ERC2771ContextUpgradeable {
 	) public view override(ERC1155Upgradeable) returns (string memory) {
 		return super.uri(tokenId);
 	}
-
-	function _msgSender()
-		internal
-		view
-		override(ERC2771ContextUpgradeable, ContextUpgradeable)
-		returns (address sender)
-	{
-		return super._msgSender();
-	}
-
-	function _msgData()
-		internal
-		view
-		override(ERC2771ContextUpgradeable, ContextUpgradeable)
-		returns (bytes calldata)
-	{
-		return super._msgData();
-	}
 }