subgraph changes

packages/nfts/contracts/trailblazers-season-2/BadgeRecruitmentV2.sol

@@ -5,7 +5,9 @@ import "./BadgeRecruitment.sol";
 
 contract BadgeRecruitmentV2 is BadgeRecruitment {
     /// @notice Events
-    event RecruitmentReset(address indexed user, uint256 indexed s1TokenId, uint256 s1BadgeId);
+    event RecruitmentReset(
+        uint256 indexed cycleId, address indexed user, uint256 indexed s1TokenId, uint256 s1BadgeId
+    );
 
     /// @notice Errors
     error RECRUITMENT_ALREADY_COMPLETED();
@@ -43,6 +45,14 @@ contract BadgeRecruitmentV2 is BadgeRecruitment {
     /// @dev Bypasses the default date checks
     function forceDisableAllRecruitments() external virtual onlyRole(DEFAULT_ADMIN_ROLE) {
         forceDisableRecruitments();
+        // emit disabled badges
+        emit RecruitmentCycleToggled(
+            recruitmentCycleId,
+            recruitmentCycles[recruitmentCycleId].startTime,
+            recruitmentCycles[recruitmentCycleId].endTime,
+            recruitmentCycles[recruitmentCycleId].s1BadgeIds,
+            false
+        );
     }
 
     /// @notice Get the active recruitment for a user
@@ -90,6 +100,6 @@ contract BadgeRecruitmentV2 is BadgeRecruitment {
         recruitmentCycleUniqueMints[recruitmentCycleId][_user][s1BadgeId_][RecruitmentType.Migration]
         = false;
 
-        emit RecruitmentReset(_user, _s1TokenId, s1BadgeId_);
+        emit RecruitmentReset(recruitmentCycleId, _user, _s1TokenId, s1BadgeId_);
     }
 }

packages/nfts/deployments/trailblazers-season-2/hekla.json

@@ -1,6 +1,6 @@
 {
-  "BadgeRecruitment": "0xBd368C65Cb354eBAd6c1429b551bD0197f19C2B8",
+  "BadgeRecruitment": "0x731E8687AF8e98207B1eaE76fEAbDd08fBf01e6a",
   "Owner": "0x4100a9B680B1Be1F10Cb8b5a57fE59eA77A8184e",
-  "TrailblazersBadges": "0x9E14C357E964BeE012bA82Ce9d6513dAec6ea961",
-  "TrailblazersBadgesS2": "0xc84B76a5836Cb0CeF094808af445F7E98504ED5B"
+  "TrailblazersBadges": "0xF38805C75F9E58F8766AB7585E3EBFc0C5F863ec",
+  "TrailblazersBadgesS2": "0x7aBB3b49e539081A43f1d6bd8aC7462187379E5a"
 }

packages/nfts/script/trailblazers-season-2/RecruitmentUpgradeV2.s.sol

@@ -90,6 +90,8 @@ contract UpgradeV2 is Script {
 
             s1Token = TrailblazersBadgesV4(address(s1TokenV2));
 
+            s1Token.setRecruitmentLockDuration(S1_LOCK_DURATION);
+
             // deploy recruitment contract
             BadgeRecruitment.Config memory config = BadgeRecruitment.Config(
                 COOLDOWN_RECRUITMENT,
@@ -111,6 +113,25 @@ contract UpgradeV2 is Script {
             );
 
             badgeRecruitment = BadgeRecruitment(proxy);
+
+            // s2 token
+            impl = address(new TrailblazersBadgesS2());
+            proxy = address(
+                new ERC1967Proxy(
+                    impl,
+                    abi.encodeCall(TrailblazersBadgesS2.initialize, (deployerAddress, baseURI))
+                )
+            );
+
+            s2Token = TrailblazersBadgesS2(proxy);
+
+            // overwrite json deployment data
+            string memory jsonRoot = "root";
+            vm.serializeAddress(jsonRoot, "TrailblazersBadges", address(s1Token));
+            vm.serializeAddress(jsonRoot, "TrailblazersBadgesS2", address(s2Token));
+            vm.serializeAddress(jsonRoot, "BadgeRecruitment", address(badgeRecruitment));
+            string memory finalJson = vm.serializeAddress(jsonRoot, "Owner", s2Token.owner());
+            vm.writeJson(finalJson, jsonLocation);
         }
 
         // upgrade token contract