diff --git a/.gitmodules b/.gitmodules index 00f6d30..a52e4a2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,4 +13,4 @@ url = https://github.com/vectorized/solady [submodule "lib/hats-module"] path = lib/hats-module - url = https://github.com/hats-protocol/hats-module + url = https://github.com/Hats-Protocol/hats-module diff --git a/lib/hats-module b/lib/hats-module index c65fb20..f19c716 160000 --- a/lib/hats-module +++ b/lib/hats-module @@ -1 +1 @@ -Subproject commit c65fb20f84d6872330511d772fa48cc19f2d2a73 +Subproject commit f19c71695faec2eeabce473ca1413e9467b60e33 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) + ); } }