diff --git a/.gitleaks.toml b/.gitleaks.toml
new file mode 100644
index 0000000..ee049b1
--- /dev/null
+++ b/.gitleaks.toml
@@ -0,0 +1,13 @@
+# gitleaks config: the default ruleset plus ONE narrow value allowlist.
+# Address books list public contract addresses under names such as
+# "ModelAccessControl", which the default generic-api-key rule misreads as a
+# credential. A value that is exactly an EVM address (0x + 40 hex) is public
+# by definition and is allowed. Nothing else is: private keys (64 hex), API
+# tokens and every other secret format are still reported, in every file.
+[extend]
+useDefault = true
+
+[[allowlists]]
+description = "Public EVM addresses (0x + 40 hex) are not secrets"
+regexTarget = "secret"
+regexes = ['''^0x[0-9a-fA-F]{40}$''']
diff --git a/crates/chainio/src/generated/addresses.json b/crates/chainio/src/generated/addresses.json
index f5a1d0c..64863a8 100644
--- a/crates/chainio/src/generated/addresses.json
+++ b/crates/chainio/src/generated/addresses.json
@@ -1,11 +1,11 @@
 {
   "$schema": "./schema.json",
-  "CitrateMemberSBT": "0xf0badd9eed5a81871a2f0d309b1f0a225646448a",
-  "MembershipStakeVault": "0x53fb4badffaceedd575d47d0e74bb721504f786e",
+  "CitrateMemberSBT": "0xf0bADD9Eed5A81871a2F0D309b1f0a225646448a",
+  "MembershipStakeVault": "0x53fB4baDfFacEEDD575D47D0E74Bb721504F786e",
   "aaStack": {
     "CitrateECDSAValidator": "0xd2d35421379ae5b461e216bfcdd1b7e6a64bbc40",
     "CitratePaymaster": "0xfdc9f7a72163b5d45becdb8a9d8d44b970f77318",
-    "CitrateWallet": "0x2d742b98d867fc7363f530dd6d756622e4eb768d",
+    "CitrateWallet": "0x2D742B98D867Fc7363F530DD6d756622e4Eb768D",
     "CitrateWalletFactory": "0x86486d1de9f256e2cba327c46ac11120df0aa51a",
     "EntryPoint": "0x97d5391a647429233e202f99231743c53a648f3c",
     "GuardianRecoveryModule": "0x0a909769160c1945401b8f37a9310d37dbb6a891",
@@ -13,82 +13,103 @@
   },
   "chainId": 40204,
   "chainName": "Citrate Network",
-  "comment": "Canonical contract-address table for chain 40204 — the single source of truth the federation reads from. Regenerated from broadcast/*.s.sol/40204/run-latest.json + .env.testnet AA pins. See contracts/addresses/README.md.",
+  "comment": "Canonical contract-address table for chain 40204 — the single source of truth the federation reads from. Regenerated after the R2 contract redeploy ceremony (hard-fork H=247436). GOVERNANCE/GUARDIAN are 2-of-3 MultisigTimelock2of3. See contracts/addresses/README.md.",
   "contracts": {
     "AIInferenceRouterPortable": "0x85b04c554ee0137818a0e9acbe6d5f8f4b6ef1d7",
     "AILearningCycleCorePortable": "0x615297a23f954681ef4b648eaaf722455eca925c",
     "AIModelRegistryPortable": "0xda30a0408b1690afa739fb63901a6608547f4da6",
     "AgentDecisionRegistry": "0xd4008e0b4f0bd00d630810d1f7f0f78db0ba837a",
-    "AggregationChallenge": "0xe7d7ebe1242feec29d514b00c9272fbffc9e69be",
-    "AnchorRegistry": "0x84a2857a293dd1fb5a0e74aaa14788b0324e408c",
-    "BudgetAllocation": "0x220a8dbb48ba3dfbe2c4f5ae162c5e5b6dc2351e",
-    "BulkComputeGateway": "0xf55f743e4a20557f03fdaa3cc43b0d2354c73c79",
-    "CapabilityGrant": "0x260ffedd17cd05a2e4daa41e1339c19a083f9e57",
-    "CashoutRequest": "0xaeb938bf9eedcffb14ab2db1e8787e591b539700",
-    "CitrateCooperativeFactory": "0x3b88731d65f044cc43c5d4589212c0f32a8c1667",
+    "AgentDecisionRegistryV2": "0x805c450288c2c9f26c004418519dbb7faf3c04cd",
+    "AggregationChallenge": "0x955d7315ecd7bce7edf2c3ae7fe0a446ca9ea9be",
+    "AnchorRegistry": "0x953a27f2626e2ab11eff02af932778357676a6de",
+    "AppRegistry": "0xfdb919c78e7e628692020af41b8002462fcc07c2",
+    "BudgetAllocation": "0x9e00842f8e439215e843cceb89d29e1a1ebc234d",
+    "BulkComputeGateway": "0x1e833de9cb3e95aa2b5347a072657da07528a699",
+    "CapabilityGrant": "0x406da5d0dad167a0022482c72832dc6876f5a98c",
+    "CashoutRequest": "0xd3cfdac07f5062f7408562c0d1d3d7c44cb2316d",
+    "CitrateCooperativeFactory": "0x9476f7b1d5b730ecac82618edefa6930442ef8ac",
     "CitrateMemberSBT": "0xf0badd9eed5a81871a2f0d309b1f0a225646448a",
-    "ClassroomClusterV1": "0xdd6bad78e88147a46f502e02ff56808916c8c4b8",
-    "ClassroomRegistry": "0x124f5f69691e0963c3a7c4d9497d1e224568ffb3",
-    "ComputeMarketplace": "0x527e636389a46784b9537690716db00d4ab987d4",
-    "ComputePool": "0xcd778fc9820ac8cada5cd95aa7cddf6e4ca4d375",
-    "ComputePoolPipeline": "0xc05a38141bb095275f8dc24dfbbcf69722cd1a3b",
-    "ComputePoolTraining": "0x0858b110dfa9c61df34b9d57576e751229b900b7",
-    "ComputePricingOracle": "0x10b5c17d6f018631fc221594ed8b8bb003c9c975",
-    "ComputeVerifier": "0x067c16ea5c2b90045607d9b33c127606e67e61da",
-    "ContributionAccounting": "0xd00d442c735c16d00f04ae31a180c78eec5ec32f",
-    "ContributionRewardPool": "0x2aee5a81e0fa056d2e6949d71aaf96456218b6c8",
-    "CoopDeployer": "0xd7cbaeb1c1d3a3a12707297a96ae454b37ec56fe",
-    "CoopGovernor": "0x8046c10f1bb4bf58cedb4a7a55ebfa7f8b09e64b",
-    "CoopMembershipSBT": "0xb455c14880aca8eeddf95f6e1dcfddb13d8b6a83",
-    "DisputeResolution": "0x4562d2a68063a61b83683aae301fe0f480e4f03a",
-    "EduForwarder": "0xe4c6aa7afd77e24c838f8a490aae6f34b286faff",
-    "FacilitySBT": "0x2520b5307752318b03047cf547b38b99311f65fb",
-    "FacilitySBTImpl": "0xa8ad418a0be3877a797f183bade8dc52b1608ad0",
-    "GovernanceProtocolFactory": "0xb0e474647bd2f74da0d90c010234b9e9a7d2b048",
-    "GovernanceTemplateRegistry": "0xecedd7a64f88f577a9c5d6b501291454f2bba3a6",
-    "HeartbeatMonitor": "0xe9eaac272844f342266862bbefc6d117a227ad9b",
-    "IPFSIncentives": "0xb79e438bc8c68f7d94cf694eb0ec8eae40525680",
-    "IPFSIncentivesV2": "0x951ddc6316efbeda36dcb940e4d81747415b8500",
-    "IPFSIncentivesV3": "0xc27a867b8d076d77cf17981f235c64a0d0203a68",
-    "InferenceRouter": "0x00463e63a5645de75083460f5f1ee108d0870815",
-    "InstitutionalVault": "0xb38a64922fad87e86e36254dc2fd65a971eb211e",
-    "KYCRegistry": "0xf72248f5dfe5c8dab3047ae52958aa65b216be8f",
-    "LearningCycleManager": "0xcce506d1f270f954b726c552879ebc19f3719035",
-    "LearningPool": "0xd973cc744f9fd8da55a8b08cde303d5b59a29771",
-    "LiquidStakingPool": "0xead6a4a47c528ecea2a86cd9d9af7504d7a5e30e",
-    "LoRAFactory": "0xbb7eeb6286a756b0e23af2ead3e03acca72f9e39",
+    "ClassificationRegistry": "0x219a25d7334b583e9353b76c4a5228c1c961ec5e",
+    "ClassroomClusterV1": "0x36c011ca57adacea56487dcb61c0d2d8a0107325",
+    "ClassroomRegistry": "0xe2b56b2bfcaeb3c8d14400184eab01bbc980cc05",
+    "ComputeMarketplace": "0xbf72e9d19d1e71d3cb74e097f86a38380e064794",
+    "ComputePool": "0x3340b12881e53263c47c6e42e624cc3934b3581b",
+    "ComputePoolPipeline": "0x247f673cdc92f833268a0772da2737fbaf9bf1cc",
+    "ComputePoolTraining": "0xb6ccd8e6e47a255b2a57074e8ac77c18f017e51a",
+    "ComputePricingOracle": "0x8895d78e341e1c23b669d0da302da18e15964a51",
+    "ComputeVerifier": "0x374f183b9e796950ec9eae992bde279cb92c25e4",
+    "ContradictionLedger": "0x1c2dd7f9ffa2a22f736f64f16a3facc734749699",
+    "ContributionAccounting": "0xbf615a63843df72ae4a996fb593f67a744024d75",
+    "CoopDeployer": "0x37226c9510d203822e9cf80f03a1fd8e92e1916a",
+    "CrossOrgEnvelope": "0xa7f042bf0652fcd6e38ad45f61483feb898bde77",
+    "CrossOrgIndex": "0xe9ce6eb836f06a005f51ae98dd82cb9b4688c6ce",
+    "DisputeResolution": "0xa960b04b3b71e859e21dc4de6c124d38850a5bec",
+    "EduForwarder": "0xd695df26609e1447930a919d9b481199dfdd3d71",
+    "FacilitySBT": "0x3ee7353685d064a30793e9190c3e8404983e4421",
+    "FacilitySBTImpl": "0x58ac5816c42a3d293552fe368c4db53b89edb02c",
+    "GovernanceProtocolFactory": "0x778c55612eea86925c30d85038eeb61db9232acc",
+    "GovernanceTemplateRegistry": "0xc0ea63d9bc9a5b14352205f33dd6fe2709137684",
+    "HeartbeatMonitor": "0x792286dcad05650b975e045b6b92e188d34f301e",
+    "IPFSIncentives": "0x636d075aeb1d7fb6fbd750f1aec4642cdeaa191b",
+    "IPFSIncentivesV2": "0x5955b9caf43e078a16d57f350560653729b78b94",
+    "IPFSIncentivesV3": "0x317dc0524980e17074d1bb19a46761c16b040ef4",
+    "InferenceRouter": "0x138ddaef2b76b6239b37a2e8981fcb3882286e09",
+    "InstitutionalVault": "0x24d44a18ac643549279607f9c21d06e4b82244ee",
+    "KYCRegistry": "0xb33c7d4d3763f4cc35e8e7fd5ebb1dfdebdeef53",
+    "LearningCycleManager": "0x2352336f49f336b1fb231257932fa40e4fa45191",
+    "LearningPool": "0xba5c9c886d65a969d02e40d7fbbade316ad81e66",
+    "LiquidStakingPool": "0xe984c36de5857c3b0e16901b6ee2d283227bb2a1",
+    "LoRAFactory": "0x4755a0018624673310e724d21020d65cedc4f876",
     "MarketMakerAllocation": "0xfcc747d35d616c48bddef98a31b7e8ebc8786864",
-    "MeetingRegistry": "0x2a433b487175d1be14d2b91979d69a21e11af8eb",
+    "MeetingRegistry": "0x270a4f21195ce051921656123c34d1b7d452aa0c",
     "MemberBond": "0x7d6b92757e928ab4207be3b54166ecd2c491aa92",
     "MembershipStakeVault": "0x53fb4badffaceedd575d47d0e74bb721504f786e",
     "MembershipStakeVaultImpl": "0x72035977f3ec295c70e2a734acbdffb0c98e6f0b",
     "MentorMatcher": "0x78ca904036cd144b55f6dd07bc3e36603c6c089b",
-    "ModelAccessControl": "0xc68f19c4f3e1fae734ca0a053af8a5b34ed98c63",
-    "ModelCooperative": "0x54b70368373b0b22ac8ad9882961228d790133bf",
-    "ModelMarketplace": "0xbd94012b113c81843dc66196d13fe0667651a7f0",
-    "ModelRegistry": "0xba36fa0da9327030bd14351db968c8c43c5a67e4",
-    "NematocystSlashing": "0xfeb23abd20084d36a1145da8a2dc04e8b48f65c7",
-    "NetworkSBT": "0x062b355f67b8252054ad59c220b3aac1cd0a0ff6",
-    "NetworkSBTImpl": "0x3a6ff326f83cd77ed936dcb1620ece2f5b41d7af",
-    "PatronageLedger": "0x726f2c8a0bfa4145dca7c154577705803c8dafa3",
-    "PolicyBinding": "0xe9dd5756d2c01a262caed433f67f36ae2a73d3be",
-    "Sortition": "0xadc2e3849d10cfdc3b83e5c3fe650b29f0478e54",
+    "ModelAccessControl": "0xa1cba98d55a508e78bd627d6c480e7ebe4f345a1",
+    "ModelMarketplace": "0xbc4286dafc8666ec0349509363e3044c6bf661b7",
+    "ModelRegistry": "0xdf3250fcc9000c6a91c4f4cc13b258391ac4ee8f",
+    "MultiSigEnvelope": "0x8e58f616952d3d1be60da129c3f2a44bce10f345",
+    "NematocystSlashing": "0x9f8e44b09fdcc2f04f4a5450f1dd6808f4077bea",
+    "NetworkSBT": "0xd807d7d3c3698f7ce095c1433b1d47984258f2fd",
+    "NetworkSBTImpl": "0x01d34046343a171ec7cd4db8978adbab095ef955",
+    "PolicyBinding": "0xc73f56dfe6b9c042a19f4fa50c2c89b9d5cb75a7",
+    "ReleaseManifestRegistry": "0xf4ad0ad7812560d3f42bbc3240516815dd2c2835",
+    "RoleEscalation": "0x558660f4d9b103297d4bbcd85062eeb73869b34b",
+    "SkillRegistry": "0x2B687899EF4aF05A18F4f36cE1fE9d51c017A97c",
+    "Sortition": "0xa2affb843d5a3fba6df2df4ee09b142988dee3ff",
     "SpecRegistry": "0x8ce7000c83d0ef5276a70bdc34bf2fa2fe0159ff",
-    "StablecoinTreasury": "0x0e9c5953bd7c77252119e32f989ba94f735c8599",
-    "TEEAttestationRegistry": "0x0834a05a5607af5ff10dade01e1c96cd6e83bd8b",
-    "TestnetFarmingAccounting": "0x220cc378641607df8ff9cff6e985d67331704ca4",
-    "TreasuryGovernor": "0xab7c486db6377225453a04a0bf7161291f2611b1",
+    "StablecoinTreasury": "0x7b9ddeaf5012f147d6d1cc059cf6939592b28a00",
+    "TEEAttestationRegistry": "0xd22ace8bad36a6cf234ed106b61b55506a6dd9d6",
+    "TenantHierarchy": "0xac7f349c968a202113d47932cbc66ae7ab7bf7e5",
+    "TestnetFarmingAccounting": "0x20c83a15e3bcf13d977435b3c3aa27a0f23b7a55",
+    "TreasuryGovernor": "0x821eb6c8a72a078ee737738f6f7eb6d2372dc44b",
     "ValidatorRegistry": "0x2655d9fbbe599e75ff6e53790f99ebc9a20c93bf",
-    "VoteAllowance": "0x1dc147b73863b1fc662bc9172b19193b4865af5f",
+    "VoteAllowance": "0x35d69cd43f6bab8a6f3fc799205a59cb043bd5fd",
     "WrappedSALT": "0xaa918302b94a4b0e75e01e019cc6b819b4f7c906",
-    "X402Facilitator": "0xae0d2ddc74732df4424d2a89c0815cba84be37e7",
-    "X402Paywall": "0xca98b1678a3127a4d605ac3b37454646adbf5453"
+    "X402Facilitator": "0x18ec4999e1aa5d599ce625cc2bda27eefc163a0e",
+    "X402Paywall": "0xb43c3c6c7eae380f016762e0d4ba748e9a4ecee7"
   },
-  "deployedAt": "2026-09-07T20:37:05Z",
+  "deployedAt": "2026-09-26T22:33:35Z",
   "deployer": "0x4fAB35c8c5033c80b3a0452A873B81e6ED4ED732",
   "explorerUrl": "https://explorer.citrate.ai",
   "genesis": {
-    "ArachnidDeterministicDeployer": "0x4e59b44847b379578588920cA78FbF26c0B4956C"
+    "ArachnidDeterministicDeployer": "0x4e59b44847b379578588920cA78FbF26c0B4956C",
+    "P256Verifier": "0xc2b78104907F722DABAc4C69f826a522B2754De4"
+  },
+  "governance": {
+    "GOVERNANCE": "0xfb9774595c361123150076c36a10a8dbdf5a8c09",
+    "GUARDIAN": "0x8889cfffbf3ab1938d3f8944dd4a800247b4501d",
+    "minDelaySeconds": 7200,
+    "threshold": "2-of-3",
+    "type": "MultisigTimelock2of3"
+  },
+  "planned": {
+    "ContributionRewardPool": "0x2aee5a81e0fa056d2e6949d71aaf96456218b6c8",
+    "CoopGovernor": "0x8046c10f1bb4bf58cedb4a7a55ebfa7f8b09e64b",
+    "CoopMembershipSBT": "0xb455c14880aca8eeddf95f6e1dcfddb13d8b6a83",
+    "ModelCooperative": "0x54b70368373b0b22ac8ad9882961228d790133bf",
+    "PatronageLedger": "0x726f2c8a0bfa4145dca7c154577705803c8dafa3"
   },
   "precompiles": {
     "BatchInference": "0x0000000000000000000000000000000000000102",