@semaphore-protocol/contracts 4.0.0-beta.1 → 4.0.0-beta.10

package/Semaphore.sol

@@ -4,6 +4,7 @@ pragma solidity 0.8.23;
 import {ISemaphore} from "./interfaces/ISemaphore.sol";
 import {ISemaphoreVerifier} from "./interfaces/ISemaphoreVerifier.sol";
 import {SemaphoreGroups} from "./base/SemaphoreGroups.sol";
+import {MIN_DEPTH, MAX_DEPTH} from "./base/Constants.sol";
 
 /// @title Semaphore
 /// @dev This contract uses the Semaphore base contracts to provide a complete service
@@ -17,6 +18,9 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
     /// @dev Gets a group id and returns the group parameters.
     mapping(uint256 => Group) public groups;
 
+    /// @dev Counter to assign an incremental id to the groups.
+    uint256 public groupCounter;
+
     /// @dev Initializes the Semaphore verifier used to verify the user's ZK proofs.
     /// @param _verifier: Semaphore verifier addresse.
     constructor(ISemaphoreVerifier _verifier) {
@@ -24,14 +28,24 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
     }
 
     /// @dev See {SemaphoreGroups-_createGroup}.
-    function createGroup(uint256 groupId, address admin) external override {
+    function createGroup() external override returns (uint256 groupId) {
+        groupId = groupCounter++;
+        _createGroup(groupId, msg.sender);
+
+        groups[groupId].merkleTreeDuration = 1 hours;
+    }
+
+    /// @dev See {SemaphoreGroups-_createGroup}.
+    function createGroup(address admin) external override returns (uint256 groupId) {
+        groupId = groupCounter++;
         _createGroup(groupId, admin);
 
         groups[groupId].merkleTreeDuration = 1 hours;
     }
 
     /// @dev See {ISemaphore-createGroup}.
-    function createGroup(uint256 groupId, address admin, uint256 merkleTreeDuration) external override {
+    function createGroup(address admin, uint256 merkleTreeDuration) external override returns (uint256 groupId) {
+        groupId = groupCounter++;
         _createGroup(groupId, admin);
 
         groups[groupId].merkleTreeDuration = merkleTreeDuration;
@@ -42,11 +56,16 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
         _updateGroupAdmin(groupId, newAdmin);
     }
 
+    /// @dev See {SemaphoreGroups- acceptGroupAdmin}.
+    function acceptGroupAdmin(uint256 groupId) external override {
+        _acceptGroupAdmin(groupId);
+    }
+
     /// @dev See {ISemaphore-updateGroupMerkleTreeDuration}.
     function updateGroupMerkleTreeDuration(
         uint256 groupId,
         uint256 newMerkleTreeDuration
-    ) external override onlyExistingGroup(groupId) onlyGroupAdmin(groupId) {
+    ) external override onlyGroupAdmin(groupId) {
         uint256 oldMerkleTreeDuration = groups[groupId].merkleTreeDuration;
 
         groups[groupId].merkleTreeDuration = newMerkleTreeDuration;
@@ -56,18 +75,14 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
 
     /// @dev See {SemaphoreGroups-_addMember}.
     function addMember(uint256 groupId, uint256 identityCommitment) external override {
-        _addMember(groupId, identityCommitment);
-
-        uint256 merkleTreeRoot = getMerkleTreeRoot(groupId);
+        uint256 merkleTreeRoot = _addMember(groupId, identityCommitment);
 
         groups[groupId].merkleRootCreationDates[merkleTreeRoot] = block.timestamp;
     }
 
     /// @dev See {SemaphoreGroups-_addMembers}.
     function addMembers(uint256 groupId, uint256[] calldata identityCommitments) external override {
-        _addMembers(groupId, identityCommitments);
-
-        uint256 merkleTreeRoot = getMerkleTreeRoot(groupId);
+        uint256 merkleTreeRoot = _addMembers(groupId, identityCommitments);
 
         groups[groupId].merkleRootCreationDates[merkleTreeRoot] = block.timestamp;
     }
@@ -79,9 +94,7 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
         uint256 newIdentityCommitment,
         uint256[] calldata merkleProofSiblings
     ) external override {
-        _updateMember(groupId, identityCommitment, newIdentityCommitment, merkleProofSiblings);
-
-        uint256 merkleTreeRoot = getMerkleTreeRoot(groupId);
+        uint256 merkleTreeRoot = _updateMember(groupId, identityCommitment, newIdentityCommitment, merkleProofSiblings);
 
         groups[groupId].merkleRootCreationDates[merkleTreeRoot] = block.timestamp;
     }
@@ -92,18 +105,13 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
         uint256 identityCommitment,
         uint256[] calldata merkleProofSiblings
     ) external override {
-        _removeMember(groupId, identityCommitment, merkleProofSiblings);
-
-        uint256 merkleTreeRoot = getMerkleTreeRoot(groupId);
+        uint256 merkleTreeRoot = _removeMember(groupId, identityCommitment, merkleProofSiblings);
 
         groups[groupId].merkleRootCreationDates[merkleTreeRoot] = block.timestamp;
     }
 
     /// @dev See {ISemaphore-validateProof}.
-    function validateProof(
-        uint256 groupId,
-        SemaphoreProof calldata proof
-    ) external override onlyExistingGroup(groupId) {
+    function validateProof(uint256 groupId, SemaphoreProof calldata proof) external override {
         // The function will revert if the nullifier that is part of the proof,
         // was already used inside the group with id groupId.
         if (groups[groupId].nullifiers[proof.nullifier]) {
@@ -136,7 +144,7 @@ contract Semaphore is ISemaphore, SemaphoreGroups {
         SemaphoreProof calldata proof
     ) public view override onlyExistingGroup(groupId) returns (bool) {
         // The function will revert if the Merkle tree depth is not supported.
-        if (proof.merkleTreeDepth < 1 || proof.merkleTreeDepth > 12) {
+        if (proof.merkleTreeDepth < MIN_DEPTH || proof.merkleTreeDepth > MAX_DEPTH) {
             revert Semaphore__MerkleTreeDepthIsNotSupported();
         }
 

package/base/Constants.sol

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: MIT
+pragma solidity 0.8.23;
+
+/// @dev Minimum supported tree depth.
+uint8 constant MIN_DEPTH = 1;
+
+/// @dev Maximum supported tree depth.
+uint8 constant MAX_DEPTH = 32;

package/base/SemaphoreGroups.sol

@@ -19,6 +19,10 @@ abstract contract SemaphoreGroups is ISemaphoreGroups {
     /// The admin can be an Ethereum account or a smart contract.
     mapping(uint256 => address) internal admins;
 
+    /// @dev Gets a group id and returns any pending admin.
+    /// The pending admin can be an Ethereum account or a smart contract.
+    mapping(uint256 => address) internal pendingAdmins;
+
     /// @dev Checks if the group admin is the transaction sender.
     /// @param groupId: Id of the group.
     modifier onlyGroupAdmin(uint256 groupId) {
@@ -42,37 +46,48 @@ abstract contract SemaphoreGroups is ISemaphoreGroups {
     /// @param groupId: Id of the group.
     /// @param admin: Admin of the group.
     function _createGroup(uint256 groupId, address admin) internal virtual {
-        if (admins[groupId] != address(0)) {
-            revert Semaphore__GroupAlreadyExists();
-        }
-
         admins[groupId] = admin;
 
         emit GroupCreated(groupId);
         emit GroupAdminUpdated(groupId, address(0), admin);
     }
 
-    /// @dev Updates the group admin.
+    /// @dev Updates the group admin. In order for the new admin to actually be updated,
+    /// they must explicitly accept by calling `_acceptGroupAdmin`.
     /// @param groupId: Id of the group.
     /// @param newAdmin: New admin of the group.
-    function _updateGroupAdmin(
-        uint256 groupId,
-        address newAdmin
-    ) internal virtual onlyExistingGroup(groupId) onlyGroupAdmin(groupId) {
-        admins[groupId] = newAdmin;
+    function _updateGroupAdmin(uint256 groupId, address newAdmin) internal virtual onlyGroupAdmin(groupId) {
+        pendingAdmins[groupId] = newAdmin;
 
-        emit GroupAdminUpdated(groupId, msg.sender, newAdmin);
+        emit GroupAdminPending(groupId, msg.sender, newAdmin);
+    }
+
+    /// @dev Allows the new admin to accept to update the group admin with their address.
+    /// @param groupId: Id of the group.
+    function _acceptGroupAdmin(uint256 groupId) internal virtual {
+        if (pendingAdmins[groupId] != msg.sender) {
+            revert Semaphore__CallerIsNotThePendingGroupAdmin();
+        }
+
+        address oldAdmin = admins[groupId];
+
+        admins[groupId] = msg.sender;
+
+        delete pendingAdmins[groupId];
+
+        emit GroupAdminUpdated(groupId, oldAdmin, msg.sender);
     }
 
     /// @dev Adds an identity commitment to an existing group.
     /// @param groupId: Id of the group.
     /// @param identityCommitment: New identity commitment.
+    /// @return merkleTreeRoot New root hash of the tree.
     function _addMember(
         uint256 groupId,
         uint256 identityCommitment
-    ) internal virtual onlyExistingGroup(groupId) onlyGroupAdmin(groupId) {
+    ) internal virtual onlyGroupAdmin(groupId) returns (uint256 merkleTreeRoot) {
         uint256 index = getMerkleTreeSize(groupId);
-        uint256 merkleTreeRoot = merkleTrees[groupId]._insert(identityCommitment);
+        merkleTreeRoot = merkleTrees[groupId]._insert(identityCommitment);
 
         emit MemberAdded(groupId, index, identityCommitment, merkleTreeRoot);
     }
@@ -80,9 +95,13 @@ abstract contract SemaphoreGroups is ISemaphoreGroups {
     /// @dev Adds new members to an existing group.
     /// @param groupId: Id of the group.
     /// @param identityCommitments: New identity commitments.
-    function _addMembers(uint256 groupId, uint256[] calldata identityCommitments) internal virtual {
+    /// @return merkleTreeRoot New root hash of the tree.
+    function _addMembers(
+        uint256 groupId,
+        uint256[] calldata identityCommitments
+    ) internal virtual onlyGroupAdmin(groupId) returns (uint256 merkleTreeRoot) {
         uint256 startIndex = getMerkleTreeSize(groupId);
-        uint256 merkleTreeRoot = merkleTrees[groupId]._insertMany(identityCommitments);
+        merkleTreeRoot = merkleTrees[groupId]._insertMany(identityCommitments);
 
         emit MembersAdded(groupId, startIndex, identityCommitments, merkleTreeRoot);
     }
@@ -93,14 +112,15 @@ abstract contract SemaphoreGroups is ISemaphoreGroups {
     /// @param oldIdentityCommitment: Existing identity commitment to be updated.
     /// @param newIdentityCommitment: New identity commitment.
     /// @param merkleProofSiblings: Array of the sibling nodes of the proof of membership.
+    /// @return merkleTreeRoot New root hash of the tree.
     function _updateMember(
         uint256 groupId,
         uint256 oldIdentityCommitment,
         uint256 newIdentityCommitment,
         uint256[] calldata merkleProofSiblings
-    ) internal virtual onlyExistingGroup(groupId) onlyGroupAdmin(groupId) {
+    ) internal virtual onlyGroupAdmin(groupId) returns (uint256 merkleTreeRoot) {
         uint256 index = merkleTrees[groupId]._indexOf(oldIdentityCommitment);
-        uint256 merkleTreeRoot = merkleTrees[groupId]._update(
+        merkleTreeRoot = merkleTrees[groupId]._update(
             oldIdentityCommitment,
             newIdentityCommitment,
             merkleProofSiblings
@@ -114,14 +134,15 @@ abstract contract SemaphoreGroups is ISemaphoreGroups {
     /// @param groupId: Id of the group.
     /// @param identityCommitment: Existing identity commitment to be removed.
     /// @param merkleProofSiblings: Array of the sibling nodes of the proof of membership.
+    /// @return merkleTreeRoot New root hash of the tree.
     function _removeMember(
         uint256 groupId,
         uint256 identityCommitment,
         uint256[] calldata merkleProofSiblings
-    ) internal virtual onlyExistingGroup(groupId) onlyGroupAdmin(groupId) {
+    ) internal virtual onlyGroupAdmin(groupId) returns (uint256 merkleTreeRoot) {
         uint256 index = merkleTrees[groupId]._indexOf(identityCommitment);
 
-        uint256 merkleTreeRoot = merkleTrees[groupId]._remove(identityCommitment, merkleProofSiblings);
+        merkleTreeRoot = merkleTrees[groupId]._remove(identityCommitment, merkleProofSiblings);
 
         emit MemberRemoved(groupId, index, identityCommitment, merkleTreeRoot);
     }

package/base/SemaphoreVerifier.sol

@@ -3,6 +3,8 @@
 
 pragma solidity 0.8.23;
 
+import {MAX_DEPTH} from "./Constants.sol";
+
 contract SemaphoreVerifier {
     // Scalar field size
     uint256 constant r = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
@@ -21,204 +23,521 @@ contract SemaphoreVerifier {
     uint256 constant gammay1 = 4082367875863433681332203403145435568316851327593401208105741076214120093531;
     uint256 constant gammay2 = 8495653923123431417604973247489272438418190587263600148770280649306958101930;
 
-    // TODO: Add more variables when Semaphore supports tree depth > 12.
-    // Right now Semaphore supports tree depth 1-12.
-
     // Verification Key points.
     // These values are taken from the verification key json file generated with snarkjs.
     // It allows to use the same verifier to verify proofs for all the tree depths supported by Semaphore.
-    uint256[14][12] VK_POINTS = [
-        [
-            563562783592406106461234396505774794044312891062077216951605541624542949349,
-            16293410697967515504861065986355060225819302510590370360517024529684437085892,
-            718666295291146285397081607986058864287612968465033527894198098928522749430,
-            10971164449179097832515056670594147898894418081309026322805549037082528587660,
-            16397970494781113622140409380710514277504568512202481522431528914560031562762,
-            15987991045804318696151558137607070651882190737142560406194591976742796145195,
-            19175554796060272870947844726785784415291967441071791144616572094703752022787,
-            14708716857471570462880683190724447733812118518043273649838616424043548023127,
-            5109703116431086866657790821388182053265093586387384935734011036204399393630,
-            1612476077210311180626421664389270104678910550524363357381847966959374674423,
-            16028984344157742576452936855797086856968817024956118691418341585143424903639,
-            6905323418829609143361434077039383502192920586565275784934386988372483556465,
-            5037234187699234788733084505200789125332575456459095878140727750253994537245,
-            5152780378461098676484401284161685966625077837157208907964141131514955942959
+    uint256[14][MAX_DEPTH] VK_POINTS = [
+        [
+            3494501265090266483323776427125076982570488036063792468650150218138148835293,
+            13059836359816425778553975687206846338164409479984923255114294465523619970040,
+            15151249351679674757179857367151108866106292017800258580857323337349056252481,
+            18815265419617029498036243865004357229581831642357407445454759910979500165426,
+            11373228439083951786763438874368468668602473169346848394664028118071804690004,
+            2392728274936215006016716287711141290248196217507457308817981648956555973842,
+            21165236263460891597139480651611604342552675916374159149811150532317922022637,
+            2205889866435138776852640052657720558691248366998420655585799331913362910317,
+            5142950424486523257531761394520431861723450305642839631787321698382624066484,
+            15189409525440736600177098582380596261100810741418368942552492853472187151232,
+            15166768161845773257369241904008805578918273462394677953758522994830670545180,
+            11585842449811129847758954303386730558495513604993443241740010514431580852767,
+            18309269743519286170259635930367379586611051469932392196263349325096833776404,
+            5169422438906150387687192335052847822734742081564185146089879581734761329500
+        ],
+        [
+            13532761187117457776267167491166240112603073699238075603358405884195273308130,
+            21284355201064049515013725567964698308458995747497567769096321545369178267664,
+            14708709266814413125869923160757837040371326884025433917243343433022571511137,
+            13755025500407841928271808574327563222159647895255773830113509677575485710439,
+            9858819933413872566321287453112479619079314892623028633956302548255682218967,
+            8978980794620905465584214544974627507731009260328687273037813961789203643024,
+            10076358326823042048333094257819800797834453359160913022846795563251044706095,
+            19803968301016597767781555029004899114416563609613744105056144083718519453457,
+            5163620256392555974431339018883081297271688900512864797552560460039668157036,
+            14255936460639291949681319740874191007595598327244735898045668418052144766452,
+            14537605621065916653836904827349546258169731169287489407049733321313440129043,
+            13697104552179432948127977631695913762483329167428550338828664939969524379194,
+            10518837188707767707511411972157042015637825295037224566646839468274503919246,
+            20859740531774787409224706405964614133972994888613078458739440328759279998775
+        ],
+        [
+            16288589209448575059850904513787407047800601393647902754951819632644221425590,
+            16786097788016607790742808610154813235622999962925024769202024012743068916317,
+            11802625068933862043088882453234658125803235172103758441218874440784454679433,
+            19054287618327819080244377924220084730619755297417179223777968789329427435290,
+            8295798606560676055262757451569098075661634806877203374010954805416034560369,
+            17823033916327857017646050340986899797748134226556967395794361949180557598708,
+            7863282428525672743372793899382505053760053469668593484933349016990801573594,
+            18331488006684435728676028523354067877257617459721620528326034910754871664656,
+            3208791308718324440134969236351379590643354353649811828887575168234009128404,
+            10257765481441384707633559757593912517257134336953024015057545492286789467798,
+            211202131360446365222702196868578991195656024430005775334667458570635430182,
+            20847900408506094777967626429608261593000174750467914924458433091857566381170,
+            12874163201492094577931796006056258188942453406826318262453514614280169978298,
+            6030254908603478785612749007917517401778254879153565233016575793713168729906
+        ],
+        [
+            6754034540226318773202391358963433276871786953717809855694353846932854329785,
+            2467775821309410353298170614346797970620091442818193435415958276311437053860,
+            3795882684032276797539296527637960192876033451771193231958863625204108357841,
+            11900626424250849274937718621509251345343138630887182003298279365567651532774,
+            5698226291009392212509456603087660757167892215070748391710298686451794945150,
+            6157973895099184288402315817801807399850034827661856468278605062696847353498,
+            15141526076642728649535042926649597908183234939224775055067110611584500129001,
+            4384760212321739848884344304193577499977798066111221580475869690599633722806,
+            4172483707996304656828832165635673373391709578552982633845732115764569616109,
+            18703118242791177268087540217341214701751955061868356627779317654228486952499,
+            19450300041750343627209216069867232901980973906626832440586455706765725761024,
+            16059746288175455494980620176090534670137960271693908437020084988051972211964,
+            20545976615820429183066000767405817531114365884543728191728740956241774393365,
+            441682222632036954103668474012025602234972690129065917741930205184363335774
+        ],
+        [
+            17333116859502962840043101407562668240640230466282480836955810105410227775068,
+            12933614295322559340061757843860755814119074678469087137971477853826215320477,
+            16047936521695868738870018107292105532713465015164559404074987652783597045737,
+            7294988186022326345519392644681725286083380252049244042196946627153179228896,
+            5694780594861626040122686431862072023944220266576706715410778734338641503716,
+            8712472904136893949123536631603982882802768648960668490262215595304129180625,
+            1995786476093573828491499692373505173525336583145392096683467783999902548268,
+            4926925836258627177637371690839427994092983220113811290959738100072290144384,
+            3791559722445528845247206264702403543222196830021730221796818130566106209767,
+            18417761581887733852915376127193234657558128442956795523445623750943914605716,
+            6559711611059474660788123194641390228396298237139470196512451543415077405796,
+            10546964127996233691569839986330212916129646278460480030759233831657936468012,
+            19639002331873293572459373894235941550278985499149213248754356208213460657162,
+            16617740711303077578250556582154106231075844388484693766277639059298286987625
+        ],
+        [
+            15568762761287080334123901982501029099057449591979709935902691107711749249022,
+            13605330538883882809690822917231786498790079369748019502396183248967388405806,
+            4557473062770366777369570006933550632897701110895009604852123748934703573598,
+            663727981727505127530084497770681234757756087785765426261978801707046251460,
+            10137887164821194167739010222610234245229180897989876335252633099720202939025,
+            13556557929447859629157159796541922173969485671491640178139584889369979056605,
+            18001826336416230108554083436980932740049468855770464827475781769090259294957,
+            10997751199060512644156045915284269336171252742084691214654620601348632057908,
+            79913969765597476108932900497715672182891152853885723893501837676479334643,
+            5339064100797178384601587097901074769415731437415874905101259438574150065725,
+            11790468783349396195257730524002236946005794800506042451697489501177528985869,
+            2058745275642252757008568790584694831559296102476273845301514491747777902,
+            8569838436054970055409792695113682207394942064434307728493565465575383738014,
+            13183322615830117090366962414504200812495447396240587506161350006490578304105
+        ],
+        [
+            19054688611757691116083119485406638328516261425570134055761099438916542083510,
+            5537576101367227927432290079717223894972087264645714861714512123692630233528,
+            6979029193706864774816090585159218044225824044811622589489754672108831626492,
+            8586836112195763056179953883229406431968181502947295115552125062679854083702,
+            3610567344582501189941093515503625764015617358100951789070992465620388014770,
+            10092557495034796324189431780067983533486688638792444215776822879681822814418,
+            1266136239205073111432095590744834423814511894190159459963868637184138842722,
+            11374864676654295041142699893206238903356920702572230940823052344171478284171,
+            7496182320409371534981231046400216671163346135425875811178408606577271153492,
+            1462528704706444827904493040179558039394825924259061934534583958249261959624,
+            16141406653410498360525438265360373701532563198050057601030953589813051750690,
+            14018180053857919258735952789533727227462568550710713906158448711665296451356,
+            511374127838749625770334668647416912569313578777284750605965725458096929607,
+            17635169227434142694714979150654436187903738366738972509867831826867283825221
+        ],
+        [
+            19578851418759832732932704168311617005093075745056434533146726479017829863318,
+            15652564582439405385221211230207905588664570626471430290387353913847742289423,
+            16643936505220289641562675739145660599904253967999119934999861447807565341362,
+            14106834159967458301881233489789009851186059673153032928358078463768578862295,
+            10971489037448711908698715978943908500318707562175731815741960924655210840831,
+            6006427343343794957952233726619963086279381477900155964075102505701412817059,
+            15106747726469907788692287944434907296109850836405367650663267344226048690859,
+            20492702082677255463093066854699770210633096845859381878102473765397334244292,
+            20017671604137050517701389289600332952924272776091967565221423262198791114477,
+            19092277823744726322414075820335182617528620489612060910384627313255069537857,
+            521420364975417235554366424369539937652264103736140177007376087084617840969,
+            3996914661098703435279657116324643068485300222550651293916442007463647760470,
+            4679024209278631191232555253447082923762821738851347894762954616029136450469,
+            8497347026541846312098745702841179850966624542794907236048342704145659678775
+        ],
+        [
+            1685688713043683238718199465856766482066511448257730427497355513493739531611,
+            9848634919654176463577373224145330482034525085313091961003436980620107331892,
+            18196877315995240142437674253225787667859373842602255491217815157552464034485,
+            13480350431152755858527378560944736211973688467090758274688486468999380580617,
+            6504013699913689711099075581237522738280971836923813934562267069952131008789,
+            9335304366750096675257996749136859439347731736177301019673263812644758419624,
+            18674691980838913091347677991332234920479452203295602521958600357998616141596,
+            4741568400157063102689633599777211724821079787176561142252991434247861983373,
+            6081240166901015395566231760209678592881994305266889564610929100038948121840,
+            6726099338457783260423971895907643672217936148382337363967495541886267184664,
+            1518231630037540558074208692256894068220282655237665440528391362801123567400,
+            6814959623000862963349418000763326032812413890585599160227546882616685479781,
+            17691964860627566514162469663546469998385191762053312278765810284413361692706,
+            8886638770454932775046812264172460584356331780532116653693013498914944507850
+        ],
+        [
+            21786356007381173571659640827279042005211499352757309589075661822822184336792,
+            12236736981369574728236515244179429788162438563725746867632140895351148551552,
+            10863564205627431677272082241703292907572336123388414891152924237169726048989,
+            19080091339088228168648496513310089433965291972445393982881627786426476832461,
+            6051337981942268387146348592741777699916830790184591013400952407193740242722,
+            14813309083853385461981331205467429689964041093530055551198131882311452944165,
+            13243916879266487104491184915617833718034439141755271499342847081003561471291,
+            20559308417239116672012110806712907520758637467837138402161111223933628840592,
+            19581439469161095403630005805154174170687505024117879919441181595776240034092,
+            17149923765379212333833055145767060687040557826663126725983709990821216291941,
+            8848229792169763857187638630433883807573443546037902935946980878173551942434,
+            9076584903972238461379608530218901607367189390010139393438137978954314962294,
+            2838594782505936821949168913265923356032509180068328675364337511551145041706,
+            12082207822506113008552336146445599677710895859529470992436917935385155760011
+        ],
+        [
+            10309025318092075922877899889998376514894538129513157785184221239491816007275,
+            18087906293812032247545697502040580639160189604135547745784396926653417233054,
+            13762379406944901802406147105406409563171519837674920666882385732457367565067,
+            184008375360758173891663157848136305080059410478051745043500682115967930421,
+            7221075042299165070640763584725863160347647659704278782330562384672809305162,
+            13601198331885563117630840819920283945716376381432043240564878006092148603574,
+            17966363662480886855360210401838893312981368660270687414500495451106355682632,
+            9255647376958236127578779968319205385670535134228597865566167852255941456992,
+            8203959912436866237932353632392355578980349384400645301966843912631449233592,
+            20011411139499301504584228175724552542130947288854633651397978547089429982167,
+            1820524505387064465309460998360793499775868154592043137422833944836520606454,
+            1959603910351136409471920269505238383870634384371099582856753558856496902512,
+            4198694051360120490653446337443734423586650228488283685090646499268901675490,
+            21526524841382152147992421724785801038770676270240714297859552516739773492697
+        ],
+        [
+            1756370075610000391065900031440928534228372460166358020032744967867009404739,
+            13069258073213826018511225623792777048865648697927965549278238995976541682378,
+            7782751275919236901187777136923054830643484083829974136976698114515315637057,
+            9140577809263846446846557996533548785843500894717723604305025713383218414559,
+            11332498437023113295175458390938230450212523402749978995184951126111215368275,
+            7016084735586326731105326496042171157633237979413962565940384222454876829020,
+            5013383022618445727921740844767853050438275291216971327851792785650669011741,
+            528618354489883480125467549183593651465882051681270315858578353218107644734,
+            6932115924239435517832880685428272633342271017032662880345701095160428372300,
+            5520601709801507363146277496110244143378961419982733100311341395981490633588,
+            434079293392651414251114604226309649137438107252197032381696615267775897288,
+            18623332313653972273799518879682220458729835518812577091590130632605360081933,
+            16981203870828204556408891045732712151034600645789784935821356391746701607849,
+            10839961472824284602079430847341654099878245597092020402049973455392611362164
+        ],
+        [
+            2013822349576539187255170167791292904450945890590676031546564364203578428335,
+            4288116053201917097935075684000732434752594062540657362132573163825118214678,
+            8077112032513125799331495973006800784299892868940747570902318145444056767128,
+            21859395070840197113042028262962323095719784329051140880224965059514424348831,
+            10532694937633872732615221785339191399998813277853598590284977223084586265406,
+            18569891906743239236657790847950300608514739578359676359176841830736581922673,
+            5204330292569275288250153279775499240677764904182920564782936399035494759139,
+            14869136923170104943599081137392440247136712268832152014557322866069417673392,
+            16609139756845639786750046885223171804867949172280450359139781662901766868597,
+            7367747621397764356413880321758620580129087430671669202576071458908338963767,
+            18157171842959734937470210968648189999811759058976098804831380331978049484161,
+            14612065821098816890897211924691530301447930045836897440401478111363414764157,
+            3678851330338811698871212394774190592148694554830208940152772420325429207592,
+            1261073646471879421850354957670569129175034189935008550219832398890385831603
+        ],
+        [
+            20175815417917544319876056782814914933529560976800336038485418111883227853782,
+            19016912455127243850008892664785684778896975209193735443658242892839245034020,
+            16407892224237245445759181057634763320099880121738727631152800143921701752766,
+            1733299003416816864259549315192082251876301168870557296608277844652111933728,
+            18128060449612109642142496525936963279825759724692188014181733764391545826501,
+            6412545369924963430376339636555328095118045874871394681127600419621347748574,
+            9178419128141821432265215706509797566711681420667049266964463482093364121974,
+            12757958736224258162889762688354106158996770313065275427510212926355720788806,
+            21697843782274732041256438596018216848529426578597975296740068185709056950695,
+            9641329027897013830146943496858364657344657408442613002988204006109548012670,
+            10157462635214395067310714425532743819094195406756516970796212542533337329791,
+            6756552332702121619038049584093175387814338143922613739401669728656840170909,
+            9276003791014657516094759987195269349958840151064358512535335441437526577719,
+            17177335596130235736675313878734353760926293469390853206840228086544227127243
+        ],
+        [
+            11732104488418080835742848495999449390672991477162489659934147182999672535901,
+            6459673724557348935705566417966034360840940513046631280825724658596691372236,
+            6029012855434716453595719715412319477813852483210244923240854148622030700333,
+            4646055529276583783430546562443788975802459143056296894781022758410365840191,
+            4691701433964504850819405353426875432448611177084640879664399563684106977201,
+            6997026109056305304958456212770850719737661180940807196442278723629505898836,
+            21862540916562048400075167198394269266629631981308358022452061330955535980535,
+            20203136947717696850833432049217389834551585785220431602620838951128875924332,
+            6166688558584392552732686802822787347815166465668907688252438119180905848686,
+            1515830657197384709067854833370847128665474205967014377229527531272518040510,
+            9783110166666159719262248155776421656845594701278593694743917659000214566949,
+            14498343612651837182986000137068086166435021811504906980633109697812438152688,
+            7451534988011232583608528483663880320228268776552285912767998924492654022315,
+            14389118774297616531519885127100101489071211382178872997387065906551438715617
+        ],
+        [
+            10984413251461965647935549809134853212592257018647144589799535518309030045652,
+            18119791555976875181530385865721092494224184674421992280086192965672251542369,
+            9145503195549781954670301741558506961167250692965330519317415426822517754673,
+            7130566849274623382593449799430907546738108731698918345554426216822781939144,
+            17586200399272141670685001491641162521294196727236050999778548238215046166017,
+            281329337697491075931159352771449215426528517554332825727307529327678211850,
+            13587768455979634277266588196077051473493752291227370910424884771755142551393,
+            12132714832736811067697324782216133875324337588127071061942622831539088199516,
+            5424242637034241045316293106740200282134858230716641545833281265555664814058,
+            4099977807866045222441365441679488428090978308192769063472099506097446172444,
+            20991094374514370732056452708323057419772785522538068181419368097559064487764,
+            17494034245166301533444525935585362973100718889755879021217726039762737332309,
+            21513377844056886482755561165035200163740875639723610667981589251852648290497,
+            9065101624205101464784359744884631484276281653365096468139033730232168384170
+        ],
+        [
+            13720910810322640236241345084228368577289121108674469591653285046643807920592,
+            20130681839683286699999162868559569892047546290445540680321104858780927447891,
+            19384575604207898920571405644263255260754982283494527106631330593535635397279,
+            19975766244574254201679709416326566199725210321908005962311647177117814001433,
+            20984349344022619370458450579312578055808523135369866643465670885076660164806,
+            418264638272070574199167297855020670696708537402223370097894154915338824856,
+            21427513166561351336822904548010728579322568176247623689193394481261310743729,
+            17218242846472515735641714187716984107651753683015981795233490838798663005098,
+            21103921212558832170255972733170723908475938955264614598038505509464559335152,
+            10402439116707708662126524824676626448483957064152280120730850351913612702748,
+            17902409153345924357919108278878752639341210912451068626743802458423268435162,
+            17156991212231172773517848502387153524430619870630373199856683436943875771004,
+            10646416238055467241386416360395574804199761155307993872061057698215892822922,
+            9567771666871218298332873263950533751702773388778384953522740303362056866931
+        ],
+        [
+            3623654015087414721623407943467672461002500175886362625657458770102123762131,
+            9443203291481021710901029750383878696924345181407701672283832773787973929357,
+            10936780876916181422574139993481684366447129939437423271868090426234211011172,
+            20783980223895248302225054295761481013954415663729096577932141772215407111525,
+            271501919920560807144690888833558109667061334163559001274202634455325808979,
+            14794481401072540343622539363544947515055760970979041148841701973173121160867,
+            16241413887148836912852878034655069636111245133456457252704664072852738020971,
+            4616891037946851677520624578755099324972320662835976914889099357030429177473,
+            3608927726708508538381205233592212299638621918906539441231152707366248326730,
+            20453218571243012416227036764366636460616051978680116597236464784651135817662,
+            21663166035926867176571290287267617498655213253914511123571589436615865760399,
+            6820544505512911561421102139415733480016159315919965296282806777526762552747,
+            1241495087165602740391581058509323079765010896996258108944819093246488858318,
+            8124857698166498408579282540958166224847900470279217858870563626568969324640
+        ],
+        [
+            2691056408064763934730579100312307365419695285915108108510025624053099691059,
+            9354292212142814677109747486323108648096936042340817605919210179321989308917,
+            20671296014916566316534621652773273840585037550883195749265386216295483140229,
+            6884402260223763449545988617300286545815739386455462315027606685140336580267,
+            12006824962639473646619675695320713559632292589665720351249509600690404062910,
+            13276706600670868735848192943347104623934461144298261448190397129714774342173,
+            18264760419082021650494509547780257751527429714087988777838583561869870161497,
+            16206621246021864196868319303736926716510401444517967423381020552156354105325,
+            1711726122386296242553570383485323505029934793448519517467561601648909492476,
+            424608816752490157168394436055547341686841853472229245627510525503910492101,
+            15415617655332841541287596609058338190575210759281068404604554729079985521497,
+            18478290351885872204755929772605378173281926792205081562405194750294909414375,
+            1332104917854036528393448566746555920300729960761914526841432630705030394652,
+            4875500610885916981959937005615629475085341806101091219174051361012752723259
+        ],
+        [
+            3068590229007175726652350825575975480933564242399453586465825082294647475860,
+            18234746072930724806231995798390096761122848034387635694143726587529010836110,
+            1919684949146675959680323349314941369203574019150554584779991024393742280845,
+            20400009938273944278780991216131489368203720208632049864993233212641381825170,
+            1105636691459466684354861615642532458695547504319491829198944901848354002466,
+            12426506081436950451531584361567271522327297423292681691257507245865800741808,
+            21744454903360799020170340278186587365704908765309976031542813238813825084489,
+            11372248299010487313898881702904101518095247949018830132141430386679279269802,
+            21355163712164844869530150285034119671090568151924216195709912115114996041497,
+            5914269246724008463378274526282819036767424774567321843447592335886063108576,
+            11757178117438262829005662514573037965023628709384135799022098340275235227691,
+            12324099857879926506512664547633107100872133202763933183968148074461422444945,
+            19030167447913285073203707487614824348154933215474799593455300093917690498309,
+            10756138991756861027792433599825283466492898786698456971350016301834120358130
+        ],
+        [
+            8447854758365235234650174914302032784976268667989384822851416849728373375962,
+            2774371060614150609505152344392883392716265245943510628736114293073040141197,
+            3015263507065482193204789265551006236425156693888783715997203837690906201829,
+            7186617426186972817855986804168941432350281910461206569148058741387131498151,
+            5818698629865247565077962768609742022241069606093835632689725123770908238374,
+            10032230959981143208283946841992758493223859540652919348005062379046462012203,
+            11522228664628777947230879504212386210128576797203829606594158165912469543023,
+            13272285677937114294437486001063514791939240537126238704993220742500063989359,
+            8471655692275117723910962427858752915984310638982095612617085072826817856111,
+            4389133967757502017802977428616053155133503096651056259096018766643340643444,
+            14833683426056097377459837308704611274315245609945506612281500340707955071545,
+            21735047966739217600224642583481593664121921255631091231639049365846545339271,
+            7278464060898751306868720821317869528105334779561787036194323452374165351865,
+            6039871164511288641970658426390882746101314533737081850970345002118723705339
         ],
         [
-            6925326031648378844726759441690273332175949886518827719224741736678266471462,
-            8087990171976409378525016197066789089596692733769545253942804888352233244331,
-            10115242383701466910539784663900956956505212347433548599529944880163612117847,
-            15618724583521291135890928658458637081479213437530496494788106479523123480134,
-            19573269191775350978579562905764743103417752180580176229566975904395505694207,
-            2381522187377974692257359562587606852360557473353020907100590706767276986457,
-            3570865353993345507636525265023758855364727230473021611280650482974485897542,
-            3026650225811133060402545160946181194870257210933662802529138266788423022235,
-            10948020004642082805202152014062303498984706484599503419636897666877701726029,
-            16425328653566008388486740080892552688012772956429074139489785673820307770702,
-            20638502839000044414864636985783149953889799151008745227055624454042471377832,
-            977321369609271151576827768083353705509746900519279122286818202637470656742,
-            18662986393280647182646025762677321210586855801774577114215804961111542726195,
-            9182414327249389553719378979750943052880001176853490206379257023646169811116
+            4840070530275546035801699608444700918579228818207171384987643157345263587158,
+            8966253575788130771852727739125896841145906149133271403123431077749138822231,
+            2601469036026438601891277833343663261084005848061139271388586828809996187097,
+            9962709838557371377047621521224985762013252610725145923403828793639693121455,
+            3562081668776383619644089086241623016377051210290983257053604147762967187048,
+            4553365292908760204444921066083280974740968313355524357160308575327815731986,
+            9612674806513362915023578944934656419542782185316845654919222232866782079973,
+            2856039308549766546769489569358317466998141815061340660074603482372423614916,
+            17144423089194150938664044057037571466137059216126551322826296560818480520188,
+            7777587218396926909905079292812226413674978129026320051535300425275288555883,
+            13348600530906896077492067999286804922009589548263122827764204432718850414877,
+            3504452333162729816257605356258771813994176063517472700088677353335099652978,
+            9271993074172346116417190887626439840621996383820554885726881799780298924983,
+            19415901227000992567609415633317148788461729474913900357094507534384428975572
         ],
         [
-            7699900854308622607636895140107457213471038801393300399043779958706267744510,
-            7699563868952902688273782470023919811229667532027732585467624469008534197561,
-            8605006500231713390564760089884965869867818332514275728271802101761117177706,
-            15390497513810955087868026868634948499789494261604405008298272598684585331879,
-            1172653041469601107707030355715854571110526375194334139771259673595104816259,
-            139822645729727942447876327389754883087551266970976361358585992124005959663,
-            807568760006422352594797418374693945705914727214443753238278163089338607471,
-            19362805143026565781098954744725161233661862485826387437200176803022106919133,
-            9457043262004277983171082100772969689099515860060732671699192102623198243288,
-            19229090298682361289811638032020124933114889462217199961448135904896325661193,
-            18883326163102164343877677909116984239805709949130729675634413304023108763212,
-            2795333364660917174391473381893559091159208514832297547909172862364581446206,
-            18012979848063967305324818138773222084850070233834350625943804711450349870116,
-            11425098272720529401115253745902976848228234025625773037823969253767737500443
+            10518236799651118399986483301765863768027777545669908907880159551621810126849,
+            5094820268025857505363635119835975858756772232205804973699906431827658031964,
+            20859555010758118604073361508744352301840967631704468041131681426037983213002,
+            11572692692867396499761538666196116586305865304015349724077332249273828973395,
+            7693170882539863875701602528545342311434468852163389086171388853464572270633,
+            3908303967241020812745991584454294385640133430208468916543029049706292930305,
+            14200361022064175872846252914915938901018673724842857113422899538373627654493,
+            1887985090111673428008310095306101841985601166058324952496388205310462613383,
+            11573157656525163647952907768764423420183350046483835223957092582860133547451,
+            9173604865670358445639146193904526160076171763657483567287015999631297551260,
+            8178722693917751358075016256308930447648179998714325218415150487090497217243,
+            16479808796736995387921450370830080669813035631409450618705788666753274143975,
+            20533543720941262967922843401527010251494136604304116450329194230919992456714,
+            21738708027542248258448002258354036928076950567990414271901435012481250510866
         ],
         [
-            9243647856126339588200227750973237380809101852206502177952556679680468734813,
-            2561989864654045354260435368824127763249975523256535586391379695256700207392,
-            1308059969166897152269078839315249187046718124106168932020710683189419160756,
-            18264861452415533737686303596832882667852638121244187636443702248458018416929,
-            5735580005765404165535708760854311053102182143614810924129912232734875728422,
-            12547270286864340931439010083179993915942911007015778927394042746771813715897,
-            17861179987982979247789643870162154315308943006677455616368767345181299723498,
-            12520843301982976970226379882714814545061255956743392202788539428471921045815,
-            709419095293140562723620898844593712074413125125086760533949250121053456086,
-            20254885558410038279405227446341995510955697359900050994091569463713580982280,
-            8876829807505794597615690202974184696287415186921508358861381955321520402876,
-            9692396410060123455009190221005078571838194435772371581970098240972280778466,
-            11541729643712807778212647011796800767186857085220105751644556558522744760878,
-            7117533920695574619512162711113223946930183977424569115798612426749467545080
+            11661383417324806615558394659220516610247089928376070440522188291505784724873,
+            19629232294794264734516475644320504923384252747453171010407820919121492093097,
+            14618693275952711587232205373188572480239428452313785044400368360917578177396,
+            8350002947339764206858601679633707444815132923435432091284098864968718952059,
+            705729203963801077445366659807159942042515811344776106038944684242779323077,
+            8198640129213076396347058165827729949570109420499123900233622693161948493955,
+            17567949859381263201697894705370978555666635560577878390586549308344241574720,
+            16953629262080155066207979848352607491010984453917718285923448228568338552102,
+            16571340903058171078202337397668804978258511905425857983395617262853832093164,
+            8200869898550007995855767338315600003217265793696813934354774140864404387075,
+            19245130308508431368191001431651810775716975255435369252757393063712397235401,
+            19295429264588775090334360243373041256684104838925789132682844828445374541241,
+            8244640034562580123950327146088236084020067479873470678893810764954021793820,
+            6071779329882466654134795663117452253106971568263743258793999061311754781283
         ],
         [
-            12554869896570109663558999106053541183136083706372178136870048170147558661370,
-            21307904757295729894500052152251151076177124351059746872940558537429181679313,
-            13447792161027167738515744919555311619301071111923271126707713963292614473975,
-            11194665041440536766843756304212299788817698936187605770131686430625103172681,
-            7022760843802757109079393624924627417630030139055381384837279305453559861026,
-            14368180091281110030022253036601349874026580767275461373222397498585380849175,
-            20362090815079102760789516334841889611927869342884580401494938701237909313479,
-            11683916255585393494577805363227207275174890005674166623110857790951330330248,
-            21680925564107543632769644144771629045807478787600735681275069556336841549441,
-            1554686039880869088226596836931999292372497423378849142389700108361111176287,
-            9553151402225656007352139561853210183786116738154807824913092141416366824324,
-            21774504332021003611111291017295441063483107704370481606906960187337904118400,
-            3472743162059388238264946309663113383560193397376658519781344886918012396958,
-            21850707327192737842691835772722844106916466129654852946865863108319178245521
+            5174537185495146345702880156705283203902425396197383898540057654655066753579,
+            12950215329375055291643630373560741963997558430433168794073218970044384415372,
+            18440638825319565738488991729556785679573678682023564191514526390075411141690,
+            4431630864873466361387108635543958095498731270116355616225197767733734128861,
+            12211353780794522017482442205152184029453185156252615419956272689806996867522,
+            11858951133579915446931127734829983281450719684822534749146423795831786572024,
+            18699083494838544659449334875917956720534604312394484877250282743052866694,
+            749778821409550859537528691118971534871459292764959826137658158363222566834,
+            2909597392070263345393422292436111503720531353687130181723707126400751447693,
+            12217177777420376281128847110380606163261839348068116179245513037333903388087,
+            6920254660239140919505113388774145966103232605095540610909080767264160069300,
+            9696367212878183305057911542364374139977595200010754215085255727487778572962,
+            14968323162826489282828176469636555044919206060463682988985750923782404039777,
+            11757071201913114247059598621424329188966752420483410843397919162379753756933
         ],
         [
-            6841243505372324564043525805425666596605335849634400049689614462868641599622,
-            11706947284665470438085734275890584651957983546291282232304205898476084974953,
-            8134420958061302592465696766566203845441024351721660066575866529624350946525,
-            2674642993002069213220912300725195098434544703961492590713058622848310061455,
-            14007544454490183581525584522132854274412440955138184221862170710084681738226,
-            9427297140302346741340407818949601657384670126565058224960470754064287232598,
-            9424279417196769259939653963004219272435595656090601392111859177294419276463,
-            5159704841441138198509282351301933053602549958584575945916187562678590534936,
-            5934282708091541939003757621608766449985810436411564642900129758520734711260,
-            6572936900512215029112509161886160866328777917297795430264727434969553346474,
-            17332317297867087005634642159909283377570778576256008720318658354552654813365,
-            20469716791176463599463762213563135543375669917658488173798369718370224346075,
-            11895216520141526042182770992519307655836464153974170586288146149131884093776,
-            2345310584279491449819095573562431881564998414485162753036518957549727207513
+            8179214450876128189786889463050502216503192251068580710356475166830402701708,
+            5801648383242377039158295944236326894031930402176012010819307534933038347985,
+            4693973538356763613860391593814220138320073026815959512078454125381217645788,
+            19870706029300681613622543188539567928777315763585981640693685194301201982407,
+            13128279467779141267539556181844646897000953259054467200148815485804849945589,
+            19182542610668848202527767345596590904881280203255613775118909904478382941801,
+            12622787765544530515623619382100437898246101834816376149292007743211956407286,
+            12570391550772615838335361042568121892906867634448929202232001812492234390257,
+            5735316164124731332271878247418185434228086026647700113833855177940542823181,
+            9649474108395394754402030685603045386825744478341882098839846461266003368756,
+            16190069071551003451113144390700917484497316557096684922619605534369669949534,
+            10681321343942329435795471710031949263678373347092770298132700842902513672840,
+            13863872929961730606993556753801300020729351590807975827100825368353540990573,
+            11931534405924761866343686993715271905704590108489876499851774273982957911423
         ],
         [
-            16222168105567777760688113388791710300819703656136395550799888633073848798053,
-            14347453588631116202352669855016330076170847581618919999243717038742915487177,
-            1551977748690015855031859376084014992267998166583511614295554470740621685494,
-            5558376366205739247464101507558623934779699722049069497418188353860561540238,
-            15084362489402846752495176069529022447007294106313236924068931072406922960482,
-            17446301099629553693162731281967866078816607293341610477850995414321505446665,
-            15416633712259927998995598381829216728913683600537032862643171407716059372732,
-            6910124994917236999728700744617337824847623550680442113266553962793201270115,
-            3240338086312503075747637551773566329150860621223080774242357236897458479365,
-            9706162939164863315053907226494918827393300584078535638283184502242772542378,
-            3821371825593696440611637099905775310839636477646533943959149234595561019388,
-            12220054708690507765048929995921680127285008492320123722886943219569231705313,
-            16484014909498227505527128570845947338361237083477117662394990633734193572570,
-            15639273550026538537711009501005182488432976272250651065072907504931158455474
+            20277284114925687078224763520355726939257825143391929434570333974997434560805,
+            2064976285344404756281594929698931000697669900063301194291518290834961490240,
+            7222144325382158947774651546068992150829509045485292683383357637997517326148,
+            15643195784077230042834999110691483687428735466231422370142767293471863700387,
+            454088003829163771011170852736324196796734198039551149147118112028488218145,
+            19539522144446103612355666512646927077463791742130426065863787086655625062176,
+            9677517649080056520842169551325292586844311652869297540972831144430102239541,
+            12171721941568335982623293519100425613310698565606469058956892831634461540059,
+            15037699242073552386046516617138931456404909452736126928849871092088157606104,
+            2403475304123870051310189713205959145472986292698418380091083485671020127630,
+            127899593359332180821632671011918317356219506177015610133494845926153175595,
+            18684733307620435559282273679266280240730732702398400109727422417551972403102,
+            17130978638728591547347686801647449269492555647218567636544356715497286682290,
+            14514080855160049012448903996874963632870196574887173768510902774625324658544
         ],
         [
-            8039261311473792027408130340265108867783988336829815266149766357424909552805,
-            13742810756711208866393269789950822956196651488331544225304557369739035583007,
-            5732605965679620193714116075516176231919315490749768120227762344555213912038,
-            1426283383724925735279168010737048062664480092231550167387716017170422478271,
-            7289543915982634578897897440956973302403422297539950338836810160596047457980,
-            15177295033774438197517772642364420015492974487860823338193520175227862903717,
-            5412509155867259433944542755241941469706034032614068890113478300647952353475,
-            16755045912589178729548422106539306191579601567866216267685082373250783779841,
-            844425885324371282218176954530597075058496766373014736097970493596574863875,
-            12323478340077628423886836431146436403221716179764806398442271274194718652143,
-            19468406721151512215981453048984639951787280312568894384216547824763527840472,
-            6512636337641737270183934024333064400224464644359645491020358650071524340464,
-            8198878215192784492258585011520207242810327647198332623948351347768018051267,
-            8014960150646978739731831763393714179490854831922196242908407049327430863238
+            5477988853386650384703921094948844062358006867640221757094709122931664258074,
+            17975202799537991792439304164891754483380324452259562307747422259512624823212,
+            13848136879177885045281819032248904935976168943919823007775235047173993770157,
+            11185225860338384901020382557488674560018020486665010314728105461398537090194,
+            5855924544364003112712450030145237149424995112678688873039358008205969147611,
+            15570549396870292677660853760591267003520405786863190676970087082855555878636,
+            14821240964410715386910463283745689087244285662861027299124772223732179089302,
+            15446473065604291444037235422131957717379131935322344411928007251149202158658,
+            586582749011680966506460208877749670972200690716863059163322868400282852300,
+            6765443750336920009167305874738739551390685770965140484130502003990191861016,
+            11516588183751421185156362409787679404091107770536300994982153030408504091807,
+            9422281521245157165519221572217222566067379888854607677340273485846988818889,
+            11972785834549950434085949313031360662160524117252689786653411157712853588295,
+            1251548247225430075659521219630231228104532865302157324337575228144557232422
         ],
         [
-            12816421563768297608770270654146762017343826741755988834647936785087288245221,
-            4869230832458710492613139050501069397194236257402947715710705773326736170245,
-            18301439700961740613282752163964601039402055729651579152511810295028351855917,
-            11073344652802336528382437239976464979745376329678013840706100925574578891663,
-            9107882721143487446664847981273782313316003453386555221878701631432129058401,
-            9441695541513726822451572070540177043748046411169636568582927338148104680158,
-            8987068930426301924419900826390508311526176863992306858982473479912439758010,
-            1725109031239210601724581840155988791039497876559382612372874257775877974323,
-            18516110346729610211387987894593386281257834088357741109524145966500785499183,
-            114078214476076549461901405178268623018026929846201249476869510133510589766,
-            15915940069177053049090451855582611051242699463952201407239272373068542013292,
-            9373936080407194259749015269175580128112032582312467763484971165406599176646,
-            4922802633190996456945600288106639549790810185209505074744770090776471062338,
-            8883001810279320778962047313612748029483858862205749774979015238684570049088
+            21436730469129810957180793723899276883659861043977115336277237822651402972650,
+            14471888142065071281382782958750780204583311859320300053251117611975834609601,
+            12182522103530455236540896653238430557347694672470208631350018699627212167843,
+            12134671815483061401460971926351313472095768998015505567590046606262972345606,
+            6083168185688688297667869638715177381772180226443830560342282797830104869062,
+            926194281246578915103720926341497520082595828680525575284123365838007044551,
+            9409122852531801098754556536729028548924539102103420345160677794564194221020,
+            20542245913396046089533736519215869670909083018889617904362139603473474391693,
+            16873198639240289433836743385124757917190871707428690095953534423420502659893,
+            6588241760722454601615602907791715854928448488066342428651422663075975107816,
+            19842357292988471204463611705572234531158701273234975255676630503476698710155,
+            14693625717448698302951456188963654748379774732579848481403435079923870603157,
+            20241432824683494982737262054148903653340519392174437358036298330854555784611,
+            5945081237575571782036580504962786649821981413555607621373828735238630355652
         ],
         [
-            10621957863293158040009666146187340406300006617270113507997717497098731431645,
-            11544253490899949675932185200523769178642714850738952025947643180461452257027,
-            19367886286197174023585178612664391272570357530876044259219178006444442279835,
-            49583159539136224825737189586941489049516773623689603831917260806184061698,
-            14718035764669896417897962215694711502145567157050183561348015124983050763912,
-            16468329864686708461615593125586840110548434159129257976547738477143616225069,
-            19316680422470456517825967239402234468963225932355881906076897312088976727808,
-            3793008941035953637072065313624049788550692955904011087840457148221740889857,
-            8994123619474927749524041243795236789619386871069943230512200348341409025802,
-            2898455184193535874162795400065700362364113037155462125222703939894764399559,
-            7006987736985681119096469806956612323700302986805047546691419062106874738669,
-            6578526693577992862738197741211972861837397562647850241473856881198749597774,
-            18253609658317686864081972526657430282945609846265497350129963610508303097865,
-            20602454323920106770928127673050173555696255204782817307960073152139829286712
+            5443396004119553565732772035623066322784594051319016117482037304612664713531,
+            13908385405190960757317970925252036009769791894761756953363068981012257735159,
+            2222951903387607415437785840368382110522618780807171086914436920475598995149,
+            7952693491971973340290086005063781112666070579182591177579397309500032398151,
+            20768578042859563979294333002563065924476840206018011719077318477769915880402,
+            2001786654254515377677955109354751436919751171611935922531378122392365944293,
+            2298051095199584549599791615579815921675635758326996304424561508720678758962,
+            15610877986863106190281569495837881819071964316157027243989237288310023404773,
+            21503958051574416294837474683907975773972588915544597427974161349505807601206,
+            16176536100016079147853297185775543699660096471098091832015791823791903209774,
+            3606739889472294515277184850587920470749374877850756839089044653095424769194,
+            14664144387169595605857061033949425545099119522415523292224065111113602111904,
+            19699387660834749955063410769084991520255142011324093146157127237115274380578,
+            4331670811250121546993058308579590495468093227852181043972677680581964769228
         ],
         [
-            6919690594446594824660388293695365136302375315018989420609208580270256193473,
-            20152340858374022568747410447956756883573367358669429548835673215400335225747,
-            11674218038035204128186342498577020603218612593894174060137243207689886423596,
-            16509772385894559653132866836382733797078280267167499296517180188027714772070,
-            18387700354891683161007139598833533459740755646851082725263944626765753998128,
-            8496770255291121655312305725645117658510206297162207504909146686627154245846,
-            3295351580633631545204707236418977224205703294426182202748223245617942752953,
-            11318533876720817956139762907441156918032396007060817178042936071438547629319,
-            9798692489110933308397734193670030418121117030189402149994776248649813971130,
-            7253879530870754821836349446054636336833607432103959373798000294248292966203,
-            21808645514001764351825515375665639285586999794992628373968527911077248645185,
-            2859748802987042398453158245958377568437550705999358391809538153774651114865,
-            4373537692781319117201803895634857716202697229097770645380222493663057011429,
-            21723556418902236605356947828522543021755681613733490227407492902239152334538
+            1773488589187652791865678688444883762637006202264973733401143478796059566247,
+            7839940132195146952355178362620770241816809643056324587040019650105609048932,
+            5994728489052927149244186850512435646422353844489887091765127572037304975403,
+            14809325803961768849764967899586584580664329200871180582417984535228799191623,
+            10631178625335401501457304969878852001559776191683447428857609753454937038299,
+            11675745006421997275450756626998030285194831397590498324078767720340123952646,
+            1759441622054752159360583922123536313476013806215300533220440946452846159126,
+            3059329356920789196856680267147718801714171797250645043538678427768342056591,
+            1809413652255811383678263677090386586529134039718623375196604927184100692799,
+            7533217575609552382385270158875791232330359159976337796303987871112517604844,
+            7704646641054955393597890923317433079643657350033170553840404545002600772539,
+            19522826015127415513569513500635678903639248861485847260009074714535026926155,
+            9396801995941988552875859512580723873116085524385365053682345361229348266222,
+            8122885501816310710455960482459104382732335722838233409931476783790044860185
         ],
         [
-            3246325158773052647788911340476235648870186305670446321333841273770228016262,
-            21672319732433045166991956534762990382763080837755725716637027617201056105221,
-            1097625536358560225015844871776096852794298581720514105921271391131873344240,
-            5332470123606111842725808071294486759248878958039162159296029608796276205941,
-            4147129560663007063799754603731275683761368247704376766576071776957227165800,
-            7032402220603422034618210155106646820962552774510253688945919060625670415308,
-            5241022678363371404039324538224070321660623527603509392150146296843642044363,
-            5281273397025328620822441453790518717375265972202147684745427714882287252791,
-            8109626675067152219533782552336308649905522111608563670382254454484448073029,
-            4696661232179595878220108186097206302552300846640109174608389689072223809776,
-            13974026846148052806722306435446895222317781098029808723550029071117080027133,
-            14451415757463182353662034231421738047130904367363697865823311429455557043904,
-            9490728148230530026163178051838213576627639298618884515939110001242292217290,
-            227687333556127166330064214209948378192130717415165040791158610964406937909
+            16305074860092225839285572393658030116082973338409399324682327571791603645660,
+            12512046153695559034086723653253082259198022071585962475345129380985810571529,
+            607599331353561746153970361104975756620522710317553470868937971490837920782,
+            3474997222527127765405001531284334239342007770926956394825252881969982209496,
+            16304360708182088008313907877667665892976553429106710412375369419780233976442,
+            10460941404478613816427928998514834125407907547113907613807191273719986187223,
+            20051043271541513424021087402997604909963063035826832503174487686321968961776,
+            13432165841378395910455231038520827433713426813680931204822379789609795102053,
+            18762866968227660024720719389346562423430884054824643430326826128394380607310,
+            17713599719831815773421839749444223685540274101601039260510841144941870261910,
+            1883157762896148563929088253054113240995256206097667755269496270918239318411,
+            10985354533025938485092599481185428202087973711120611094551172933738810516920,
+            670487064764400248463858966885752477833093767820377805346079091001272760417,
+            8502840196732756246718058003393498205431869135787193347957619883686320532648
         ]
     ];
 
@@ -239,7 +558,7 @@ contract SemaphoreVerifier {
 
         assembly {
             function checkField(v) {
-                if iszero(lt(v, q)) {
+                if iszero(lt(v, r)) {
                     mstore(0, 0)
                     return(0, 0x20)
                 }

package/interfaces/ISemaphore.sol

@@ -56,17 +56,23 @@ interface ISemaphore {
     );
 
     /// @dev See {SemaphoreGroups-_createGroup}.
-    function createGroup(uint256 groupId, address admin) external;
+    function createGroup() external returns (uint256);
+
+    /// @dev See {SemaphoreGroups-_createGroup}.
+    function createGroup(address admin) external returns (uint256);
 
     /// @dev It creates a group with a custom Merkle tree duration.
-    /// @param groupId: Id of the group.
     /// @param admin: Admin of the group. It can be an Ethereum account or a smart contract.
     /// @param merkleTreeDuration: Merkle tree duration.
-    function createGroup(uint256 groupId, address admin, uint256 merkleTreeDuration) external;
+    /// @return Id of the group.
+    function createGroup(address admin, uint256 merkleTreeDuration) external returns (uint256);
 
     /// @dev See {SemaphoreGroups-_updateGroupAdmin}.
     function updateGroupAdmin(uint256 groupId, address newAdmin) external;
 
+    /// @dev See {SemaphoreGroups-_acceptGroupAdmin}.
+    function acceptGroupAdmin(uint256 groupId) external;
+
     /// @dev Updates the group Merkle tree duration.
     /// @param groupId: Id of the group.
     /// @param newMerkleTreeDuration: New Merkle tree duration.

package/interfaces/ISemaphoreGroups.sol

@@ -4,19 +4,25 @@ pragma solidity 0.8.23;
 /// @title SemaphoreGroups contract interface.
 interface ISemaphoreGroups {
     error Semaphore__GroupDoesNotExist();
-    error Semaphore__GroupAlreadyExists();
     error Semaphore__CallerIsNotTheGroupAdmin();
+    error Semaphore__CallerIsNotThePendingGroupAdmin();
 
     /// @dev Event emitted when a new group is created.
     /// @param groupId: Id of the group.
     event GroupCreated(uint256 indexed groupId);
 
-    /// @dev Event emitted when an admin is assigned to a group.
+    /// @dev Event emitted when a new admin is assigned to a group.
     /// @param groupId: Id of the group.
     /// @param oldAdmin: Old admin of the group.
     /// @param newAdmin: New admin of the group.
     event GroupAdminUpdated(uint256 indexed groupId, address indexed oldAdmin, address indexed newAdmin);
 
+    /// @dev Event emitted when a group admin is being updated.
+    /// @param groupId: Id of the group.
+    /// @param oldAdmin: Old admin of the group.
+    /// @param newAdmin: New admin of the group.
+    event GroupAdminPending(uint256 indexed groupId, address indexed oldAdmin, address indexed newAdmin);
+
     /// @dev Event emitted when a new identity commitment is added.
     /// @param groupId: Group id of the group.
     /// @param index: Merkle tree leaf index.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@semaphore-protocol/contracts",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.10",
   "description": "Semaphore contracts to manage groups and broadcast anonymous signals.",
   "license": "MIT",
   "files": [
@@ -30,6 +30,6 @@
     "access": "public"
   },
   "dependencies": {
-    "@zk-kit/imt.sol": "2.0.0-beta.5"
+    "@zk-kit/imt.sol": "2.0.0-beta.12"
   }
 }