merge

hackdays-io · Jan 9, 2025 · 5749bc1 · 5749bc1
2 parents a62a41f + dd94c29
commit 5749bc1
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/pkgs/contract/.solhintignore b/pkgs/contract/.solhintignore
@@ -1,2 +1,3 @@
 node_modules/
 contracts/hats/module/
+contracts/**/mock/**
diff --git a/pkgs/contract/contracts/bigbang/mock/BigBang_Mock_v2.sol b/pkgs/contract/contracts/bigbang/mock/BigBang_Mock_v2.sol
@@ -10,7 +10,7 @@ import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/O
 /**
  * Upgradableになっている確認するための検証用BigBangコントラクト
  */
-contract BigBangMockV2 is OwnableUpgradeable {
+contract BigBang_Mock_v2 is OwnableUpgradeable {
 	IHats public Hats;
 
 	IHatsModuleFactory public HatsModuleFactory;

diff --git a/pkgs/contract/contracts/fractiontoken/mock/FractionToken_Mock_v2.sol b/pkgs/contract/contracts/fractiontoken/mock/FractionToken_Mock_v2.sol
@@ -7,7 +7,7 @@ import { MulticallUpgradeable } from "@openzeppelin/contracts-upgradeable/utils/
 import "@openzeppelin/contracts-upgradeable/utils/ContextUpgradeable.sol";
 import { IHats } from "../../hats/src/Interfaces/IHats.sol";
 
-contract FractionTokenMockV2 is
+contract FractionToken_Mock_v2 is
 	ERC1155Upgradeable,
 	ERC1155SupplyUpgradeable,
 	MulticallUpgradeable

diff --git a/pkgs/contract/contracts/splitscreator/mock/SplitsCreator_Mock_v2.sol b/pkgs/contract/contracts/splitscreator/mock/SplitsCreator_Mock_v2.sol
@@ -7,7 +7,7 @@ import { SplitsCreator } from "../SplitsCreator.sol";
 import { ISplitsCreator } from "../ISplitsCreator.sol";
 import { OwnableUpgradeable } from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
 
-contract SplitsCreatorFactoryMockV2 is OwnableUpgradeable {
+contract SplitsCreatorFactory_Mock_v2 is OwnableUpgradeable {
 	event SplitCreatorCreated(
 		address indexed creator,
 		address indexed splitCreator,
@@ -18,7 +18,7 @@ contract SplitsCreatorFactoryMockV2 is OwnableUpgradeable {
 	);
 
 	address public SPLITS_CREATOR_IMPLEMENTATION;
-	
+
 	address public BIG_BANG;
 
 	function initialize(

diff --git a/pkgs/contract/test/BigBang.ts b/pkgs/contract/test/BigBang.ts
@@ -307,7 +307,10 @@ describe("BigBang", () => {
   describe("Upgrade Test", () => {
     it("upgrde", async () => {
       // BigBangをアップグレード
-      const newBigBang = await upgradeBigBang(BigBang.address, "BigBangMockV2");
+      const newBigBang = await upgradeBigBang(
+        BigBang.address,
+        "BigBang_Mock_v2",
+      );
 
       // upgrade後にしかないメソッドを実行
       const result = await newBigBang.read.testUpgradeFunction();
@@ -316,7 +319,10 @@ describe("BigBang", () => {
 
     it("should execute bigbang after upgrade", async () => {
       // BigBangをアップグレード
-      const newBigBang = await upgradeBigBang(BigBang.address, "BigBangMockV2");
+      const newBigBang = await upgradeBigBang(
+        BigBang.address,
+        "BigBang_Mock_v2",
+      );
 
       // SplitsCreatorFactoryにBigBangアドレスをセット
       SplitsCreatorFactory.write.setBigBang([newBigBang.address]);

diff --git a/pkgs/contract/test/FractionToken.ts b/pkgs/contract/test/FractionToken.ts
@@ -285,7 +285,7 @@ describe("FractionToken", () => {
       // FractionTokenをアップグレード
       const newFractionToken = await upgradeFractionToken(
         FractionToken.address,
-        "FractionTokenMockV2",
+        "FractionToken_Mock_v2",
         ["", 10000n, Hats.address, zeroAddress],
       );
 
@@ -298,7 +298,7 @@ describe("FractionToken", () => {
       // FractionTokenをアップグレード
       const newFractionToken = await upgradeFractionToken(
         FractionToken.address,
-        "FractionTokenMockV2",
+        "FractionToken_Mock_v2",
         ["", 10000n, Hats.address, zeroAddress],
       );
 
@@ -357,7 +357,7 @@ describe("FractionToken", () => {
       // FractionTokenをアップグレード
       const newFractionToken = await upgradeFractionToken(
         FractionToken.address,
-        "FractionTokenMockV2",
+        "FractionToken_Mock_v2",
         ["", 10000n, Hats.address, zeroAddress],
       );
 

diff --git a/pkgs/contract/test/SplitsCreator.ts b/pkgs/contract/test/SplitsCreator.ts
@@ -194,7 +194,7 @@ describe("SplitsCreator Factory", () => {
   it("sohuld upgrade SplitsCreatorFactory", async () => {
     const newSplitsCreatorFactory = await upgradeSplitsCreatorFacotry(
       SplitsCreatorFactory.address,
-      "SplitsCreatorFactoryMockV2",
+      "SplitsCreatorFactory_Mock_v2",
       [],
     );
 

diff --git a/pkgs/frontend/hooks/useWallet.ts b/pkgs/frontend/hooks/useWallet.ts
@@ -1,18 +1,11 @@
-import {
-  type ConnectedWallet,
-  usePrivy,
-  useWallets,
-} from "@privy-io/react-auth";
+import { type ConnectedWallet, useWallets } from "@privy-io/react-auth";
 import {
   type SmartAccountClient,
   createSmartAccountClient,
 } from "permissionless";
-import {
-  toSimpleSmartAccount,
-  toThirdwebSmartAccount,
-} from "permissionless/accounts";
+import { toThirdwebSmartAccount } from "permissionless/accounts";
 import { createPimlicoClient } from "permissionless/clients/pimlico";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import {
   http,
   type Account,