From e497a27de7a9953af75cbf5b04c1848854cabcaa Mon Sep 17 00:00:00 2001 From: Ido Date: Tue, 25 Jul 2023 18:06:27 +0300 Subject: [PATCH 1/3] temopral hats-module remove --- .gitmodules | 3 --- lib/hats-module | 1 - 2 files changed, 4 deletions(-) delete mode 160000 lib/hats-module diff --git a/.gitmodules b/.gitmodules index 00f6d30..a68c04d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,6 +11,3 @@ [submodule "lib/solady"] path = lib/solady url = https://github.com/vectorized/solady -[submodule "lib/hats-module"] - path = lib/hats-module - url = https://github.com/hats-protocol/hats-module diff --git a/lib/hats-module b/lib/hats-module deleted file mode 160000 index c65fb20..0000000 --- a/lib/hats-module +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c65fb20f84d6872330511d772fa48cc19f2d2a73 From fe34fe4604ebfd40078331ffbde492546784f38d Mon Sep 17 00:00:00 2001 From: Ido Date: Tue, 25 Jul 2023 18:07:26 +0300 Subject: [PATCH 2/3] forge install: hats-module v0.3.0 --- .gitmodules | 3 +++ lib/hats-module | 1 + 2 files changed, 4 insertions(+) create mode 160000 lib/hats-module diff --git a/.gitmodules b/.gitmodules index a68c04d..a52e4a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -11,3 +11,6 @@ [submodule "lib/solady"] path = lib/solady url = https://github.com/vectorized/solady +[submodule "lib/hats-module"] + path = lib/hats-module + url = https://github.com/Hats-Protocol/hats-module diff --git a/lib/hats-module b/lib/hats-module new file mode 160000 index 0000000..f19c716 --- /dev/null +++ b/lib/hats-module @@ -0,0 +1 @@ +Subproject commit f19c71695faec2eeabce473ca1413e9467b60e33 From e85e7b38ff672df9cde1b000a130781bce228565 Mon Sep 17 00:00:00 2001 From: Ido Date: Tue, 25 Jul 2023 18:31:24 +0300 Subject: [PATCH 3/3] update Hats address --- script/StakingEligibility.s.sol | 2 +- test/StakingEligibility.t.sol | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/script/StakingEligibility.s.sol b/script/StakingEligibility.s.sol index 78d6d03..2ca3056 100644 --- a/script/StakingEligibility.s.sol +++ b/script/StakingEligibility.s.sol @@ -11,7 +11,7 @@ contract DeployImplementation is Script { bytes32 public SALT = bytes32(abi.encode(0x4a75)); // ~ H(4) A(a) T(7) S(5) // default values - string public version = "0.1.0"; // increment with each deploy + string public version = "0.2.0"; // increment with each deploy bool private verbose = true; /// @notice Override default values, if desired diff --git a/test/StakingEligibility.t.sol b/test/StakingEligibility.t.sol index 95eb543..5023035 100644 --- a/test/StakingEligibility.t.sol +++ b/test/StakingEligibility.t.sol @@ -15,14 +15,14 @@ contract StakingEligibilityTest is Test, DeployImplementation { // bytes32 public SALT = bytes32(abi.encode(0x4a75)); // ~ H(4) A(a) T(7) S(5) // other test variables - IHats public hats = IHats(0x9D2dfd6066d5935267291718E8AA16C8Ab729E9d); // v1.hatsprotocol.eth + IHats public hats = IHats(0x3bc1A0Ad72417f2d411118085256fC53CBdDd137); // v1.hatsprotocol.eth HatsModuleFactory public factory; StakingEligibility public instance; StakingEligibilityHarness public harnessImpl; StakingEligibilityHarness public harnessInstance; uint256 public fork; - uint256 public BLOCK_NUMBER = 16_947_805; // the block number where v1.hatsprotocol.eth was deployed + uint256 public BLOCK_NUMBER = 17_671_864; // the block number where v1.hatsprotocol.eth was deployed string public FACTORY_VERSION = "factory test version"; string public MODULE_VERSION = "module test version"; @@ -142,8 +142,8 @@ contract StakingEligibilityTest is Test, DeployImplementation { initData = abi.encode(_minStake, _judgeHat, _recipientHat, _cooldownPeriod); // deploy the instance instance = - // StakingEligibility(factory.createHatsModule(address(implementation), _hatId, otherImmutableArgs, initData)); - StakingEligibility(deployModuleInstance(factory, address(implementation), _hatId, otherImmutableArgs, initData)); + // StakingEligibility(factory.createHatsModule(address(implementation), _hatId, otherImmutableArgs, initData)); + StakingEligibility(deployModuleInstance(factory, address(implementation), _hatId, otherImmutableArgs, initData)); } } @@ -227,8 +227,11 @@ contract HarnessTest is StakingEligibilityTest { harnessImpl = new StakingEligibilityHarness("harness version"); // deploy an instance of the harness and initialize it with the same initData as `instance` harnessInstance = - // StakingEligibilityHarness(factory.createHatsModule(address(harnessImpl), stakerHat, otherImmutableArgs, initData)); - StakingEligibilityHarness(deployModuleInstance(factory, address(harnessImpl), stakerHat, otherImmutableArgs, initData)); + // StakingEligibilityHarness(factory.createHatsModule(address(harnessImpl), stakerHat, otherImmutableArgs, + // initData)); + StakingEligibilityHarness( + deployModuleInstance(factory, address(harnessImpl), stakerHat, otherImmutableArgs, initData) + ); } }