Issue/138

pkgs/contract/contracts/bigbang/BigBang.sol

@@ -23,6 +23,7 @@ contract BigBang is ERC2771Context {
 	event Executed(
 		address indexed owner,
 		uint256 indexed topHatId,
+		uint256 indexed hatterHatId,
 		address hatsTimeFrameModule,
 		address splitCreator
 	);
@@ -118,7 +119,7 @@ contract BigBang is ERC2771Context {
 				keccak256(abi.encodePacked(topHatId))
 			);
 
-		emit Executed(_owner, topHatId, hatsTimeFrameModule, splitCreator);
+		emit Executed(_owner, topHatId, hatterHatId, hatsTimeFrameModule, splitCreator);
 
 		return topHatId;
 	}

pkgs/contract/contracts/splitscreator/ISplitsCreator.sol

@@ -10,7 +10,12 @@ interface ISplitsCreator {
 		address[] wearers;
 	}
 
-	event SplitsCreated(address split);
+	event SplitsCreated(
+		address split,
+		address[] shareHolders,
+		uint256[] allocations,
+		uint256 totalAllocation
+	);
 
 	function create(SplitsInfo[] memory _splitInfos) external returns (address);
 }

pkgs/contract/contracts/splitscreator/SplitsCreator.sol

@@ -46,15 +46,13 @@ contract SplitsCreator is ISplitsCreator, Clone {
 				);
 				address[] memory recepients = FRACTION_TOKEN()
 					.getTokenRecipients(tokenId);
-				numOfShareHolders += recepients.length + 1;
+				numOfShareHolders += recepients.length;
 			}
 		}
 
 		address[] memory shareHolders = new address[](numOfShareHolders);
-		address[] memory warers = new address[](numOfShareHolders);
-		uint256[] memory hatIdsOfShareHolders = new uint256[](
-			numOfShareHolders
-		);
+		address[] memory wearers = new address[](numOfShareHolders);
+		uint256[] memory hatIdsOfShareHolders = new uint256[](numOfShareHolders);
 		uint256[] memory roleMultipliersOfShareHolders = new uint256[](
 			numOfShareHolders
 		);
@@ -66,36 +64,24 @@ contract SplitsCreator is ISplitsCreator, Clone {
 
 		for (uint i = 0; i < _splitsInfo.length; i++) {
 			SplitsInfo memory _splitInfo = _splitsInfo[i];
+			uint256 roleMultiplier = _splitInfo.multiplierTop /
+				_splitInfo.multiplierBottom;
 			for (uint si = 0; si < _splitInfo.wearers.length; si++) {
 				uint256 tokenId = FRACTION_TOKEN().getTokenId(
 					_splitInfo.hatId,
 					_splitInfo.wearers[si]
 				);
-				uint256 roleMultiplier = _splitInfo.multiplierTop /
-					_splitInfo.multiplierBottom;
 				uint256 hatsTimeFrameMultiplier = _getHatsTimeFrameMultiplier(
 					_splitInfo.wearers[si],
 					_splitInfo.hatId
 				);
 
-				// ロール保持者に対する分配の計算
-				shareHolders[shareHolderIndex] = _splitInfo.wearers[si];
-				warers[shareHolderIndex] = _splitInfo.wearers[si];
-				hatIdsOfShareHolders[shareHolderIndex] = _splitInfo.hatId;
-				roleMultipliersOfShareHolders[
-					shareHolderIndex
-				] = roleMultiplier;
-				hatsTimeFrameMultipliersOfShareHolders[
-					shareHolderIndex
-				] = hatsTimeFrameMultiplier;
-				shareHolderIndex++;
-
 				// FractionTokenのホルダーに対する分配の計算
 				address[] memory recipients = FRACTION_TOKEN()
 					.getTokenRecipients(tokenId);
 				for (uint j = 0; j < recipients.length; j++) {
 					shareHolders[shareHolderIndex] = recipients[j];
-					warers[shareHolderIndex] = _splitInfo.wearers[si];
+					wearers[shareHolderIndex] = _splitInfo.wearers[si];
 					hatIdsOfShareHolders[shareHolderIndex] = _splitInfo.hatId;
 					roleMultipliersOfShareHolders[
 						shareHolderIndex
@@ -109,7 +95,7 @@ contract SplitsCreator is ISplitsCreator, Clone {
 		}
 
 		uint256[] memory balanceOfShareHolders = FRACTION_TOKEN()
-			.balanceOfBatch(shareHolders, warers, hatIdsOfShareHolders);
+			.balanceOfBatch(shareHolders, wearers, hatIdsOfShareHolders);
 
 		uint256 totalAllocation = 0;
 		uint256[] memory allocations = new uint256[](shareHolderIndex);
@@ -135,7 +121,12 @@ contract SplitsCreator is ISplitsCreator, Clone {
 			_generateSalt(_splitsInfo)
 		);
 
-		emit SplitsCreated(split);
+		emit SplitsCreated(
+			split,
+			shareHolders,
+			allocations,
+			totalAllocation
+		);
 
 		return split;
 	}

pkgs/contract/gas-report.txt

@@ -7,23 +7,23 @@
 ··············|··········|··············|·············|·············|···············|··············
 |  Deployments           ·                                          ·  % of limit   ·             │
 ·························|··············|·············|·············|···············|··············
-|  BigBang               ·           -  ·          -  ·    1089851  ·        3.6 %  ·          -  │
+|  BigBang               ·           -  ·          -  ·    1092017  ·        3.6 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
-|  FractionToken         ·           -  ·          -  ·    2573797  ·        8.6 %  ·          -  │
+|  FractionToken         ·     2573785  ·    2573797  ·    2573795  ·        8.6 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
 |  Hats                  ·           -  ·          -  ·    7032431  ·       23.4 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
 |  HatsModule            ·           -  ·          -  ·     754132  ·        2.5 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
-|  HatsModuleFactory     ·           -  ·          -  ·    1101122  ·        3.7 %  ·          -  │
+|  HatsModuleFactory     ·     1101110  ·    1101122  ·    1101120  ·        3.7 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
 |  HatsTimeFrameModule   ·           -  ·          -  ·    1115811  ·        3.7 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
-|  PullSplitFactory      ·     4535815  ·    4535827  ·    4535824  ·       15.1 %  ·          -  │
+|  PullSplitFactory      ·           -  ·          -  ·    4535827  ·       15.1 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
-|  PushSplitFactory      ·     4483101  ·    4483113  ·    4483110  ·       14.9 %  ·          -  │
+|  PushSplitFactory      ·           -  ·          -  ·    4483113  ·       14.9 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
-|  SplitsCreator         ·           -  ·          -  ·    1515444  ·        5.1 %  ·          -  │
+|  SplitsCreator         ·           -  ·          -  ·    1487532  ·          5 %  ·          -  │
 ·························|··············|·············|·············|···············|··············
 |  SplitsCreatorFactory  ·           -  ·          -  ·     526836  ·        1.8 %  ·          -  │
 ·························|··············|·············|·············|···············|··············

pkgs/contract/helpers/util/sqrt.ts

@@ -0,0 +1,15 @@
+export function sqrt(y: bigint): bigint {
+	if (y > 3n) {
+		let z: bigint = y;
+		let x: bigint = y / 2n + 1n;
+		while (x < z) {
+			z = x;
+			x = (y / x + x) / 2n;
+		}
+		return z;
+	} else if (y !== 0n) {
+		return 1n;
+	} else {
+		return 0n;
+	}
+}

pkgs/contract/test/BigBang.ts

@@ -124,7 +124,9 @@ describe("BigBang", () => {
 					topics: log.topics,
 				});
 				if (decodedLog.eventName == "Executed") {
-					expect(decodedLog.args.owner).to.be.equal(address1.account?.address!);
+					expect(decodedLog.args.owner.toLowerCase()).to.be.equal(
+						address1.account?.address!
+					);
 				}
 			} catch (error) {}
 		}