stompgg · sudo-owen · May 21, 2026 · May 21, 2026 · May 21, 2026 · May 21, 2026
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/OPT_PLAN.md b/OPT_PLAN.md
diff --git a/script/EngineAndPeriphery.s.sol b/script/EngineAndPeriphery.s.sol
@@ -7,7 +7,6 @@ import "../src/Constants.sol";
 // Fundamental entities
 import {SignedCommitManager} from "../src/commit-manager/SignedCommitManager.sol";
 import {Engine} from "../src/Engine.sol";
-import {DefaultValidator} from "../src/DefaultValidator.sol";
 import {OkayCPU} from "../src/cpu/OkayCPU.sol";
 import {BetterCPU} from "../src/cpu/BetterCPU.sol";
 import {FairCPU} from "../src/cpu/FairCPU.sol";
@@ -16,7 +15,6 @@ import {IGachaRNG} from "../src/rng/IGachaRNG.sol";
 import {GachaTeamRegistry} from "../src/game-layer/GachaTeamRegistry.sol";
 import {TypeCalculator} from "../src/types/TypeCalculator.sol";
 import {SignedMatchmaker} from "../src/matchmaker/SignedMatchmaker.sol";
-import {SimplePM} from "../src/hooks/SimplePM.sol";
 import {ReturnerGift} from "../src/game-layer/ReturnerGift.sol";
 
 // Shared effects
@@ -95,9 +93,6 @@ contract EngineAndPeriphery is Script {
         SignedMatchmaker signedMatchmaker = new SignedMatchmaker(engine);
         deployedContracts.push(DeployData({name: "SIGNED MATCHMAKER", contractAddress: address(signedMatchmaker)}));
 
-        // SimplePM simplePM = new SimplePM(engine);
-        // deployedContracts.push(DeployData({name: "SIMPLE PM", contractAddress: address(simplePM)}));
-
         ReturnerGift returnerGift = new ReturnerGift(address(gachaTeamRegistry));
         deployedContracts.push(DeployData({name: "RETURNER GIFT", contractAddress: address(returnerGift)}));
 

diff --git a/snapshots/BetterCPUInlineGasTest.json b/snapshots/BetterCPUInlineGasTest.json
@@ -1,8 +1,8 @@
 {
-  "Flag0_P0ForcedSwitch": "25377",
-  "Turn0_Lead": "107260",
-  "Turn1_BothAttack": "240701",
-  "Turn2_BothAttack": "214777",
-  "Turn3_BothAttack": "210801",
-  "Turn4_BothAttack": "210805"
+  "Flag0_P0ForcedSwitch": "20651",
+  "Turn0_Lead": "110075",
+  "Turn1_BothAttack": "251390",
+  "Turn2_BothAttack": "225466",
+  "Turn3_BothAttack": "221490",
+  "Turn4_BothAttack": "221494"
 }
diff --git a/snapshots/EngineGasTest.json b/snapshots/EngineGasTest.json
@@ -1,21 +1,21 @@
 {
-  "B1_Execute": "912113",
-  "B1_Setup": "850985",
-  "B2_Execute": "659466",
-  "B2_Setup": "307623",
-  "Battle1_Execute": "443036",
-  "Battle1_Setup": "826189",
-  "Battle2_Execute": "364327",
-  "Battle2_Setup": "245514",
-  "External_Execute": "451382",
-  "External_Setup": "816904",
-  "FirstBattle": "2920585",
-  "Inline_Execute": "317825",
-  "Inline_Setup": "227355",
-  "Intermediary stuff": "45252",
-  "SecondBattle": "2957006",
-  "Setup 1": "1712677",
-  "Setup 2": "312571",
-  "Setup 3": "353891",
-  "ThirdBattle": "2293275"
+  "B1_Execute": "938347",
+  "B1_Setup": "851601",
+  "B2_Execute": "684878",
+  "B2_Setup": "308962",
+  "Battle1_Execute": "455276",
+  "Battle1_Setup": "826804",
+  "Battle2_Execute": "376485",
+  "Battle2_Setup": "246129",
+  "External_Execute": "463766",
+  "External_Setup": "817538",
+  "FirstBattle": "3046038",
+  "Inline_Execute": "323087",
+  "Inline_Setup": "228069",
+  "Intermediary stuff": "45490",
+  "SecondBattle": "3092714",
+  "Setup 1": "1713329",
+  "Setup 2": "313205",
+  "Setup 3": "354535",
+  "ThirdBattle": "2418090"
 }
diff --git a/snapshots/EngineOptimizationTest.json b/snapshots/EngineOptimizationTest.json
@@ -1,4 +1,4 @@
 {
-  "ExternalStaminaRegen": "389950",
-  "InlineStaminaRegen": "1035668"
+  "ExternalStaminaRegen": "410708",
+  "InlineStaminaRegen": "1061124"
 }
diff --git a/snapshots/FullyOptimizedInlineGasTest.json b/snapshots/FullyOptimizedInlineGasTest.json
@@ -1,8 +1,8 @@
 {
-  "Fast_Battle1": "1895389",
-  "Fast_Battle2": "1792891",
-  "Fast_Battle3": "1314750",
-  "Fast_Setup_1": "1345979",
-  "Fast_Setup_2": "219252",
-  "Fast_Setup_3": "215455"
+  "Fast_Battle1": "2008292",
+  "Fast_Battle2": "1912317",
+  "Fast_Battle3": "1429283",
+  "Fast_Setup_1": "1346713",
+  "Fast_Setup_2": "219734",
+  "Fast_Setup_3": "216190"
 }
diff --git a/snapshots/InlineEngineGasTest.json b/snapshots/InlineEngineGasTest.json
@@ -1,16 +1,16 @@
 {
-  "B1_Execute": "896745",
-  "B1_Setup": "782990",
-  "B2_Execute": "621601",
-  "B2_Setup": "286671",
-  "Battle1_Execute": "398480",
-  "Battle1_Setup": "758186",
-  "Battle2_Execute": "317777",
-  "Battle2_Setup": "226783",
-  "FirstBattle": "2606959",
-  "SecondBattle": "2604950",
-  "Setup 1": "1636824",
-  "Setup 2": "321759",
-  "Setup 3": "317965",
-  "ThirdBattle": "1979658"
+  "B1_Execute": "936501",
+  "B1_Setup": "783478",
+  "B2_Execute": "660261",
+  "B2_Setup": "288189",
+  "Battle1_Execute": "417315",
+  "Battle1_Setup": "758674",
+  "Battle2_Execute": "336574",
+  "Battle2_Setup": "227271",
+  "FirstBattle": "2770951",
+  "SecondBattle": "2781914",
+  "Setup 1": "1637310",
+  "Setup 2": "322245",
+  "Setup 3": "318451",
+  "ThirdBattle": "2143284"
 }
diff --git a/snapshots/MatchmakerTest.json b/snapshots/MatchmakerTest.json
@@ -1,5 +1,5 @@
 {
-  "Accept1": "343446",
-  "Accept2": "34250",
-  "Propose1": "197406"
+  "Accept1": "343811",
+  "Accept2": "34363",
+  "Propose1": "197519"
 }
diff --git a/snapshots/StandardAttackPvPGasTest.json b/snapshots/StandardAttackPvPGasTest.json
@@ -1,7 +1,7 @@
 {
-  "Turn0_Lead": "71144",
-  "Turn1_BothAttack": "121432",
-  "Turn2_BothAttack": "81643",
-  "Turn3_BothAttack": "81682",
-  "Turn4_BothAttack": "81698"
+  "Turn0_Lead": "70132",
+  "Turn1_BothAttack": "123398",
+  "Turn2_BothAttack": "83618",
+  "Turn3_BothAttack": "83648",
+  "Turn4_BothAttack": "83676"
 }