@coordination-network/network-member-governance 0.0.1 → 0.1.0

package/README.md

@@ -10,9 +10,9 @@ ours. What this package adds is the network member layer: turning an on-chain jo
 exact call that admits it.
 
 Admission is not a call any single party can make. The
-[`NetworkMemberRegistry`](../contracts/src/NetworkMemberRegistry.sol) and
-[`NetworkMemberGroup`](../contracts/src/NetworkMemberGroup.sol) are owned by the governance Safe, and
-[`NetworkMemberGovernance`](../contracts/src/NetworkMemberGovernance.sol) turns each governance
+[`NetworkMemberRegistry`](https://github.com/zk-kit/coordination-network/blob/main/packages/contracts/src/NetworkMemberRegistry.sol) and
+[`NetworkMemberGroup`](https://github.com/zk-kit/coordination-network/blob/main/packages/contracts/src/NetworkMemberGroup.sol) are owned by the governance Safe, and
+[`NetworkMemberGovernance`](https://github.com/zk-kit/coordination-network/blob/main/packages/contracts/src/NetworkMemberGovernance.sol) turns each governance
 operation into a single call only that Safe can make, so a member joins only when a majority of the
 already-approved members has approved the same transaction. This package is what a member server runs to
 take part: it never sends anything and holds no state, it turns a join request into the exact
@@ -35,8 +35,9 @@ One and two members are bootstrap states, not operating ones. Majority rule tole
 network permanently. Two is the worse of the two: if one of the pair goes dark, admitting a third needs
 its signature and so does removing it, so nothing can change again. The only way out is for the live member to depart, which hands the network to the key
 that already stopped working. Three is the first size that survives a lost key. The
-[runbook](../contracts/docs/network-member-onboarding.md) has the full trade-offs. The rule is enforced on chain by `NetworkMemberGovernance.governanceThreshold`, and no
-operation takes a threshold argument, so a caller cannot move it. `governanceThreshold(memberCount)`
+[runbook](https://github.com/zk-kit/coordination-network/blob/main/packages/contracts/docs/configuration/network-member-onboarding.md) has the full trade-offs. The rule is computed on chain by `NetworkMemberGovernance.governanceThreshold`, and no
+operation takes a threshold argument, so no module call can move it. Direct Safe calls can; the
+[runbook](https://github.com/zk-kit/coordination-network/blob/main/packages/contracts/docs/configuration/network-member-onboarding.md#the-governance-rule) lists the operating rules. `governanceThreshold(memberCount)`
 here is the same expression for off-chain use: checking that a Safe is configured correctly, and
 reporting what a pending operation will change the threshold to.
 
@@ -58,14 +59,23 @@ So a member never receives a transaction from anyone. Each approver derives the
 same event, which is why the approvals add up: identical inputs give an identical `safeTxHash`.
 Admission makes the new member an approver of the next candidate.
 
+A candidate that holds its account key as a public key gets the request's key fields from
+`memberAccountKey(publicKey)`, which accepts the 65-byte `0x04` form or the raw 64 bytes of `X || Y` and
+returns `{ memberNetworkId, accountKeyX, accountKeyY }`.
+
 ### 1. Build the transaction from the request as the chain reported it
 
 Building it from the event, rather than from what someone tells you, is what makes approving
-meaningful: the digest you approve covers the networkId, the Semaphore commitment and the governance
-signer you just vetted.
+meaningful: the digest you approve covers the account key, the Semaphore commitment and the governance
+signer you just vetted. The `networkId` is `keccak256(X || Y)` of the account key, and the registry
+derives it from the key's coordinates, so approving a key approves exactly one id.
 
 ```ts
-import { buildAdmissionTransaction, decodeJoinRequestLog } from "@coordination-network/network-member-governance"
+import {
+    NETWORK_MEMBER_JOIN_REQUESTED_EVENT,
+    buildAdmissionTransaction,
+    decodeJoinRequestLog
+} from "@coordination-network/network-member-governance"
 
 const contracts = { governance, registry }
 const context = { safeAddress, chainId } // add safeVersion for a Safe older than the SDK default
@@ -73,9 +83,7 @@ const context = { safeAddress, chainId } // add safeVersion for a Safe older tha
 // The request comes from the candidate's own event, read from a node you trust and decoded here.
 const logs = await client.getLogs({
     address: registry,
-    event: parseAbiItem(
-        "event NetworkMemberJoinRequested(bytes32 indexed memberNetworkId, uint256 semaphoreCommitment, address governanceSigner, string metadataURI)"
-    ),
+    event: NETWORK_MEMBER_JOIN_REQUESTED_EVENT,
     args: { memberNetworkId },
     fromBlock: REGISTRY_DEPLOY_BLOCK
 })
@@ -83,8 +91,8 @@ const logs = await client.getLogs({
 // A candidate may publish several requests before it is admitted, so there can be more than one log
 // here. `pickTheVettedRequest` is your own code: it must return the request your organisation actually
 // vetted, not simply the newest, because approving an organisation is not the same as approving a set
-// of keys. Store your decision against a hash of these three fields, and treat a later request as a new
-// decision.
+// of keys. Store your decision against a hash of the account key, the commitment, the signer and the
+// URI, and treat a later request as a new decision.
 const admission = decodeJoinRequestLog(pickTheVettedRequest(logs), registry)
 
 // The Safe's nonce, read from the chain.
@@ -245,6 +253,6 @@ Only that member's governance signer can call it, so it reaches its own membersh
 
 ## References
 
-- [Network member onboarding and governance runbook](../contracts/docs/network-member-onboarding.md)
+- [Network member onboarding and governance runbook](https://github.com/zk-kit/coordination-network/blob/main/packages/contracts/docs/configuration/network-member-onboarding.md)
 - [What is Safe](https://docs.safe.global/home/what-is-safe)
 - [Protocol Kit: signing transactions](https://docs.safe.global/sdk/protocol-kit/guides/signatures/transactions)

package/dist/index.cjs

@@ -335,7 +335,8 @@ const NETWORK_MEMBER_GOVERNANCE_ABI = [
         name: "admitMember",
         stateMutability: "nonpayable",
         inputs: [
-            { name: "memberNetworkId", type: "bytes32" },
+            { name: "accountKeyX", type: "uint256" },
+            { name: "accountKeyY", type: "uint256" },
             { name: "semaphoreCommitment", type: "uint256" },
             { name: "governanceSigner", type: "address" },
             { name: "expectedMemberCount", type: "uint256" }
@@ -378,6 +379,19 @@ const NETWORK_MEMBER_GOVERNANCE_ABI = [
         outputs: [{ name: "", type: "uint256" }]
     }
 ];
+/** The event a candidate's join request emits, for watching with `getLogs`. */
+const NETWORK_MEMBER_JOIN_REQUESTED_EVENT = {
+    type: "event",
+    name: "NetworkMemberJoinRequested",
+    inputs: [
+        { name: "memberNetworkId", type: "bytes32", indexed: true },
+        { name: "accountKeyX", type: "uint256", indexed: false },
+        { name: "accountKeyY", type: "uint256", indexed: false },
+        { name: "semaphoreCommitment", type: "uint256", indexed: false },
+        { name: "governanceSigner", type: "address", indexed: false },
+        { name: "metadataURI", type: "string", indexed: false }
+    ]
+};
 /** The `NetworkMemberRegistry` surface a member server needs directly. */
 const NETWORK_MEMBER_REGISTRY_ABI = [
     {
@@ -385,23 +399,15 @@ const NETWORK_MEMBER_REGISTRY_ABI = [
         name: "requestToJoin",
         stateMutability: "nonpayable",
         inputs: [
-            { name: "memberNetworkId", type: "bytes32" },
+            { name: "accountKeyX", type: "uint256" },
+            { name: "accountKeyY", type: "uint256" },
             { name: "semaphoreCommitment", type: "uint256" },
             { name: "governanceSigner", type: "address" },
             { name: "metadataURI", type: "string" }
         ],
         outputs: []
     },
-    {
-        type: "event",
-        name: "NetworkMemberJoinRequested",
-        inputs: [
-            { name: "memberNetworkId", type: "bytes32", indexed: true },
-            { name: "semaphoreCommitment", type: "uint256", indexed: false },
-            { name: "governanceSigner", type: "address", indexed: false },
-            { name: "metadataURI", type: "string", indexed: false }
-        ]
-    }
+    NETWORK_MEMBER_JOIN_REQUESTED_EVENT
 ];
 /**
  * Turns a `NetworkMemberJoinRequested` log into the request it announced.
@@ -428,13 +434,38 @@ function decodeJoinRequestLog(log, registry) {
         data: log.data,
         topics: log.topics
     });
+    const keyHash = viem.keccak256(viem.concat([viem.pad(viem.toHex(args.accountKeyX)), viem.pad(viem.toHex(args.accountKeyY))]));
+    if (args.memberNetworkId !== keyHash) {
+        throw new Error(`Log's memberNetworkId ${args.memberNetworkId} is not the hash of the account key it carries`);
+    }
     return {
         memberNetworkId: args.memberNetworkId,
+        accountKeyX: args.accountKeyX,
+        accountKeyY: args.accountKeyY,
         semaphoreCommitment: args.semaphoreCommitment,
         governanceSigner: viem.getAddress(args.governanceSigner),
         metadataURI: args.metadataURI
     };
 }
+/**
+ * The networkId and key coordinates of a member's account key, the secp256k1 key whose address is its
+ * auth address.
+ *
+ * @param uncompressedPublicKey The public key: 65 bytes with the `0x04` prefix, or the raw 64 bytes of X || Y.
+ * @returns The coordinates, and `keccak256(X || Y)`, which is the id the registry derives from them.
+ */
+function memberAccountKey(uncompressedPublicKey) {
+    // `size` rounds an odd digit count up, so the length is checked on the digits themselves.
+    if (!/^0x(04)?[0-9a-fA-F]{128}$/.test(uncompressedPublicKey)) {
+        throw new Error(`Expected a 64-byte X || Y or a 65-byte 0x04-prefixed public key of hex digits, got ${uncompressedPublicKey.length} characters`);
+    }
+    const coordinates = viem.slice(uncompressedPublicKey, viem.size(uncompressedPublicKey) - 64);
+    return {
+        memberNetworkId: viem.keccak256(coordinates),
+        accountKeyX: viem.hexToBigInt(viem.slice(coordinates, 0, 32)),
+        accountKeyY: viem.hexToBigInt(viem.slice(coordinates, 32))
+    };
+}
 /**
  * The single call that admits a network member: its record, its group leaf, and its seat at the Safe.
  *
@@ -448,7 +479,8 @@ function encodeAdmitMember(admission, memberCount) {
         abi: NETWORK_MEMBER_GOVERNANCE_ABI,
         functionName: "admitMember",
         args: [
-            admission.memberNetworkId,
+            admission.accountKeyX,
+            admission.accountKeyY,
             admission.semaphoreCommitment,
             viem.getAddress(admission.governanceSigner),
             BigInt(memberCount)
@@ -535,7 +567,7 @@ function encodeExitNetwork(memberNetworkId, merkleProofSiblings) {
 }
 /**
  * Calldata for a candidate's own join request, the one permissionless call in this flow. It must be
- * sent from the auth address the networkId encodes, and `governanceSigner` must be a different key.
+ * sent from the address of the account key, and `governanceSigner` must be a different key.
  *
  * @param request The request to announce.
  * @returns Calldata for the registry.
@@ -545,7 +577,8 @@ function encodeRequestToJoin(request) {
         abi: NETWORK_MEMBER_REGISTRY_ABI,
         functionName: "requestToJoin",
         args: [
-            request.memberNetworkId,
+            request.accountKeyX,
+            request.accountKeyY,
             request.semaphoreCommitment,
             viem.getAddress(request.governanceSigner),
             request.metadataURI ?? ""
@@ -558,6 +591,7 @@ Object.defineProperty(exports, "OperationType", {
     get: function () { return typesKit.OperationType; }
 });
 exports.NETWORK_MEMBER_GOVERNANCE_ABI = NETWORK_MEMBER_GOVERNANCE_ABI;
+exports.NETWORK_MEMBER_JOIN_REQUESTED_EVENT = NETWORK_MEMBER_JOIN_REQUESTED_EVENT;
 exports.NETWORK_MEMBER_REGISTRY_ABI = NETWORK_MEMBER_REGISTRY_ABI;
 exports.NO_REFUND = NO_REFUND;
 exports.ZERO_ADDRESS = ZERO_ADDRESS;
@@ -576,6 +610,7 @@ exports.encodeRequestToJoin = encodeRequestToJoin;
 exports.encodeSafeSignatures = encodeSafeSignatures;
 exports.governanceThreshold = governanceThreshold;
 exports.hashSafeTransaction = hashSafeTransaction;
+exports.memberAccountKey = memberAccountKey;
 exports.onChainApproval = onChainApproval;
 exports.recoverSafeSigner = recoverSafeSigner;
 exports.removalCall = removalCall;

package/dist/index.js

@@ -1,4 +1,4 @@
-import { getAddress, encodeFunctionData, recoverAddress, isAddressEqual, decodeEventLog } from 'viem';
+import { getAddress, encodeFunctionData, recoverAddress, isAddressEqual, decodeEventLog, keccak256, concat, pad, toHex, slice, size, hexToBigInt } from 'viem';
 import { encodeMultiSendData, buildSignatureBytes, calculateSafeTransactionHash, generatePreValidatedSignature, generateTypedData, EthSafeSignature, DEFAULT_SAFE_VERSION } from '@safe-global/protocol-kit';
 import { getMultiSendCallOnlyDeployment, getSafeSingletonDeployment } from '@safe-global/safe-deployments';
 import { OperationType } from '@safe-global/types-kit';
@@ -334,7 +334,8 @@ const NETWORK_MEMBER_GOVERNANCE_ABI = [
         name: "admitMember",
         stateMutability: "nonpayable",
         inputs: [
-            { name: "memberNetworkId", type: "bytes32" },
+            { name: "accountKeyX", type: "uint256" },
+            { name: "accountKeyY", type: "uint256" },
             { name: "semaphoreCommitment", type: "uint256" },
             { name: "governanceSigner", type: "address" },
             { name: "expectedMemberCount", type: "uint256" }
@@ -377,6 +378,19 @@ const NETWORK_MEMBER_GOVERNANCE_ABI = [
         outputs: [{ name: "", type: "uint256" }]
     }
 ];
+/** The event a candidate's join request emits, for watching with `getLogs`. */
+const NETWORK_MEMBER_JOIN_REQUESTED_EVENT = {
+    type: "event",
+    name: "NetworkMemberJoinRequested",
+    inputs: [
+        { name: "memberNetworkId", type: "bytes32", indexed: true },
+        { name: "accountKeyX", type: "uint256", indexed: false },
+        { name: "accountKeyY", type: "uint256", indexed: false },
+        { name: "semaphoreCommitment", type: "uint256", indexed: false },
+        { name: "governanceSigner", type: "address", indexed: false },
+        { name: "metadataURI", type: "string", indexed: false }
+    ]
+};
 /** The `NetworkMemberRegistry` surface a member server needs directly. */
 const NETWORK_MEMBER_REGISTRY_ABI = [
     {
@@ -384,23 +398,15 @@ const NETWORK_MEMBER_REGISTRY_ABI = [
         name: "requestToJoin",
         stateMutability: "nonpayable",
         inputs: [
-            { name: "memberNetworkId", type: "bytes32" },
+            { name: "accountKeyX", type: "uint256" },
+            { name: "accountKeyY", type: "uint256" },
             { name: "semaphoreCommitment", type: "uint256" },
             { name: "governanceSigner", type: "address" },
             { name: "metadataURI", type: "string" }
         ],
         outputs: []
     },
-    {
-        type: "event",
-        name: "NetworkMemberJoinRequested",
-        inputs: [
-            { name: "memberNetworkId", type: "bytes32", indexed: true },
-            { name: "semaphoreCommitment", type: "uint256", indexed: false },
-            { name: "governanceSigner", type: "address", indexed: false },
-            { name: "metadataURI", type: "string", indexed: false }
-        ]
-    }
+    NETWORK_MEMBER_JOIN_REQUESTED_EVENT
 ];
 /**
  * Turns a `NetworkMemberJoinRequested` log into the request it announced.
@@ -427,13 +433,38 @@ function decodeJoinRequestLog(log, registry) {
         data: log.data,
         topics: log.topics
     });
+    const keyHash = keccak256(concat([pad(toHex(args.accountKeyX)), pad(toHex(args.accountKeyY))]));
+    if (args.memberNetworkId !== keyHash) {
+        throw new Error(`Log's memberNetworkId ${args.memberNetworkId} is not the hash of the account key it carries`);
+    }
     return {
         memberNetworkId: args.memberNetworkId,
+        accountKeyX: args.accountKeyX,
+        accountKeyY: args.accountKeyY,
         semaphoreCommitment: args.semaphoreCommitment,
         governanceSigner: getAddress(args.governanceSigner),
         metadataURI: args.metadataURI
     };
 }
+/**
+ * The networkId and key coordinates of a member's account key, the secp256k1 key whose address is its
+ * auth address.
+ *
+ * @param uncompressedPublicKey The public key: 65 bytes with the `0x04` prefix, or the raw 64 bytes of X || Y.
+ * @returns The coordinates, and `keccak256(X || Y)`, which is the id the registry derives from them.
+ */
+function memberAccountKey(uncompressedPublicKey) {
+    // `size` rounds an odd digit count up, so the length is checked on the digits themselves.
+    if (!/^0x(04)?[0-9a-fA-F]{128}$/.test(uncompressedPublicKey)) {
+        throw new Error(`Expected a 64-byte X || Y or a 65-byte 0x04-prefixed public key of hex digits, got ${uncompressedPublicKey.length} characters`);
+    }
+    const coordinates = slice(uncompressedPublicKey, size(uncompressedPublicKey) - 64);
+    return {
+        memberNetworkId: keccak256(coordinates),
+        accountKeyX: hexToBigInt(slice(coordinates, 0, 32)),
+        accountKeyY: hexToBigInt(slice(coordinates, 32))
+    };
+}
 /**
  * The single call that admits a network member: its record, its group leaf, and its seat at the Safe.
  *
@@ -447,7 +478,8 @@ function encodeAdmitMember(admission, memberCount) {
         abi: NETWORK_MEMBER_GOVERNANCE_ABI,
         functionName: "admitMember",
         args: [
-            admission.memberNetworkId,
+            admission.accountKeyX,
+            admission.accountKeyY,
             admission.semaphoreCommitment,
             getAddress(admission.governanceSigner),
             BigInt(memberCount)
@@ -534,7 +566,7 @@ function encodeExitNetwork(memberNetworkId, merkleProofSiblings) {
 }
 /**
  * Calldata for a candidate's own join request, the one permissionless call in this flow. It must be
- * sent from the auth address the networkId encodes, and `governanceSigner` must be a different key.
+ * sent from the address of the account key, and `governanceSigner` must be a different key.
  *
  * @param request The request to announce.
  * @returns Calldata for the registry.
@@ -544,7 +576,8 @@ function encodeRequestToJoin(request) {
         abi: NETWORK_MEMBER_REGISTRY_ABI,
         functionName: "requestToJoin",
         args: [
-            request.memberNetworkId,
+            request.accountKeyX,
+            request.accountKeyY,
             request.semaphoreCommitment,
             getAddress(request.governanceSigner),
             request.metadataURI ?? ""
@@ -552,4 +585,4 @@ function encodeRequestToJoin(request) {
     });
 }
 
-export { NETWORK_MEMBER_GOVERNANCE_ABI, NETWORK_MEMBER_REGISTRY_ABI, NO_REFUND, ZERO_ADDRESS, admissionCall, buildAdmissionTransaction, buildRemovalTransaction, buildSafeTransactionData, checkQuorum, decodeJoinRequestLog, encodeAdmitMember, encodeApproveHash, encodeExecTransaction, encodeExitNetwork, encodeRemoveMember, encodeRequestToJoin, encodeSafeSignatures, governanceThreshold, hashSafeTransaction, onChainApproval, recoverSafeSigner, removalCall, resolveMultiSend, signSafeTransaction };
+export { NETWORK_MEMBER_GOVERNANCE_ABI, NETWORK_MEMBER_JOIN_REQUESTED_EVENT, NETWORK_MEMBER_REGISTRY_ABI, NO_REFUND, ZERO_ADDRESS, admissionCall, buildAdmissionTransaction, buildRemovalTransaction, buildSafeTransactionData, checkQuorum, decodeJoinRequestLog, encodeAdmitMember, encodeApproveHash, encodeExecTransaction, encodeExitNetwork, encodeRemoveMember, encodeRequestToJoin, encodeSafeSignatures, governanceThreshold, hashSafeTransaction, memberAccountKey, onChainApproval, recoverSafeSigner, removalCall, resolveMultiSend, signSafeTransaction };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coordination-network/network-member-governance",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "description": "Governance Safe transactions for the network member registry: build the admission or removal transaction, sign it as an approved network member, and aggregate the signatures the Safe accepts on chain.",
   "license": "MIT",
   "repository": {

package/src/index.ts

@@ -2,6 +2,7 @@ export { NO_REFUND, ZERO_ADDRESS } from "./constants"
 export { governanceThreshold } from "./governance-rule"
 export {
     NETWORK_MEMBER_GOVERNANCE_ABI,
+    NETWORK_MEMBER_JOIN_REQUESTED_EVENT,
     NETWORK_MEMBER_REGISTRY_ABI,
     admissionCall,
     buildAdmissionTransaction,
@@ -11,6 +12,7 @@ export {
     encodeExitNetwork,
     encodeRemoveMember,
     encodeRequestToJoin,
+    memberAccountKey,
     removalCall
 } from "./network-member-calls"
 export type {

package/src/network-member-calls.ts

@@ -1,5 +1,19 @@
 import type { MetaTransactionData, SafeTransactionData } from "@safe-global/types-kit"
-import { decodeEventLog, encodeFunctionData, getAddress, isAddressEqual, type Address, type Hex } from "viem"
+import {
+    concat,
+    decodeEventLog,
+    encodeFunctionData,
+    getAddress,
+    hexToBigInt,
+    isAddressEqual,
+    keccak256,
+    pad,
+    size,
+    slice,
+    toHex,
+    type Address,
+    type Hex
+} from "viem"
 
 import { buildSafeTransactionData } from "./safe-transaction"
 import type { SafeContext } from "./types"
@@ -22,7 +36,8 @@ export const NETWORK_MEMBER_GOVERNANCE_ABI = [
         name: "admitMember",
         stateMutability: "nonpayable",
         inputs: [
-            { name: "memberNetworkId", type: "bytes32" },
+            { name: "accountKeyX", type: "uint256" },
+            { name: "accountKeyY", type: "uint256" },
             { name: "semaphoreCommitment", type: "uint256" },
             { name: "governanceSigner", type: "address" },
             { name: "expectedMemberCount", type: "uint256" }
@@ -66,6 +81,20 @@ export const NETWORK_MEMBER_GOVERNANCE_ABI = [
     }
 ] as const
 
+/** The event a candidate's join request emits, for watching with `getLogs`. */
+export const NETWORK_MEMBER_JOIN_REQUESTED_EVENT = {
+    type: "event",
+    name: "NetworkMemberJoinRequested",
+    inputs: [
+        { name: "memberNetworkId", type: "bytes32", indexed: true },
+        { name: "accountKeyX", type: "uint256", indexed: false },
+        { name: "accountKeyY", type: "uint256", indexed: false },
+        { name: "semaphoreCommitment", type: "uint256", indexed: false },
+        { name: "governanceSigner", type: "address", indexed: false },
+        { name: "metadataURI", type: "string", indexed: false }
+    ]
+} as const
+
 /** The `NetworkMemberRegistry` surface a member server needs directly. */
 export const NETWORK_MEMBER_REGISTRY_ABI = [
     {
@@ -73,23 +102,15 @@ export const NETWORK_MEMBER_REGISTRY_ABI = [
         name: "requestToJoin",
         stateMutability: "nonpayable",
         inputs: [
-            { name: "memberNetworkId", type: "bytes32" },
+            { name: "accountKeyX", type: "uint256" },
+            { name: "accountKeyY", type: "uint256" },
             { name: "semaphoreCommitment", type: "uint256" },
             { name: "governanceSigner", type: "address" },
             { name: "metadataURI", type: "string" }
         ],
         outputs: []
     },
-    {
-        type: "event",
-        name: "NetworkMemberJoinRequested",
-        inputs: [
-            { name: "memberNetworkId", type: "bytes32", indexed: true },
-            { name: "semaphoreCommitment", type: "uint256", indexed: false },
-            { name: "governanceSigner", type: "address", indexed: false },
-            { name: "metadataURI", type: "string", indexed: false }
-        ]
-    }
+    NETWORK_MEMBER_JOIN_REQUESTED_EVENT
 ] as const
 
 /** Where the governance operations live. */
@@ -108,8 +129,15 @@ export interface GovernanceContracts {
  * admission is a function of the candidate's own announcement.
  */
 export interface NetworkMemberJoinRequest {
-    /** The candidate's networkId. */
+    /**
+     * The candidate's networkId, `keccak256(X || Y)` of its account key. Filled from the event topic
+     * when decoding, and ignored by the encoders, which pass the key.
+     */
     memberNetworkId: Hex
+    /** The X coordinate of the candidate's account key, a secp256k1 public key. */
+    accountKeyX: bigint
+    /** The Y coordinate of the candidate's account key. */
+    accountKeyY: bigint
     /** The Semaphore identity commitment it wants in the approved-member group. */
     semaphoreCommitment: bigint
     /** The address it wants added to the governance Safe, so it can vote on later candidates. */
@@ -167,14 +195,49 @@ export function decodeJoinRequestLog(log: JoinRequestLog, registry?: Address): N
         topics: log.topics as [signature: Hex, ...args: Hex[]]
     })
 
+    const keyHash = keccak256(concat([pad(toHex(args.accountKeyX)), pad(toHex(args.accountKeyY))]))
+    if (args.memberNetworkId !== keyHash) {
+        throw new Error(`Log's memberNetworkId ${args.memberNetworkId} is not the hash of the account key it carries`)
+    }
+
     return {
         memberNetworkId: args.memberNetworkId,
+        accountKeyX: args.accountKeyX,
+        accountKeyY: args.accountKeyY,
         semaphoreCommitment: args.semaphoreCommitment,
         governanceSigner: getAddress(args.governanceSigner),
         metadataURI: args.metadataURI
     }
 }
 
+/**
+ * The networkId and key coordinates of a member's account key, the secp256k1 key whose address is its
+ * auth address.
+ *
+ * @param uncompressedPublicKey The public key: 65 bytes with the `0x04` prefix, or the raw 64 bytes of X || Y.
+ * @returns The coordinates, and `keccak256(X || Y)`, which is the id the registry derives from them.
+ */
+export function memberAccountKey(uncompressedPublicKey: Hex): {
+    memberNetworkId: Hex
+    accountKeyX: bigint
+    accountKeyY: bigint
+} {
+    // `size` rounds an odd digit count up, so the length is checked on the digits themselves.
+    if (!/^0x(04)?[0-9a-fA-F]{128}$/.test(uncompressedPublicKey)) {
+        throw new Error(
+            `Expected a 64-byte X || Y or a 65-byte 0x04-prefixed public key of hex digits, got ${uncompressedPublicKey.length} characters`
+        )
+    }
+
+    const coordinates = slice(uncompressedPublicKey, size(uncompressedPublicKey) - 64)
+
+    return {
+        memberNetworkId: keccak256(coordinates),
+        accountKeyX: hexToBigInt(slice(coordinates, 0, 32)),
+        accountKeyY: hexToBigInt(slice(coordinates, 32))
+    }
+}
+
 /**
  * The single call that admits a network member: its record, its group leaf, and its seat at the Safe.
  *
@@ -188,7 +251,8 @@ export function encodeAdmitMember(admission: NetworkMemberJoinRequest, memberCou
         abi: NETWORK_MEMBER_GOVERNANCE_ABI,
         functionName: "admitMember",
         args: [
-            admission.memberNetworkId,
+            admission.accountKeyX,
+            admission.accountKeyY,
             admission.semaphoreCommitment,
             getAddress(admission.governanceSigner),
             BigInt(memberCount)
@@ -302,7 +366,7 @@ export function encodeExitNetwork(memberNetworkId: Hex, merkleProofSiblings: big
 
 /**
  * Calldata for a candidate's own join request, the one permissionless call in this flow. It must be
- * sent from the auth address the networkId encodes, and `governanceSigner` must be a different key.
+ * sent from the address of the account key, and `governanceSigner` must be a different key.
  *
  * @param request The request to announce.
  * @returns Calldata for the registry.
@@ -312,7 +376,8 @@ export function encodeRequestToJoin(request: NetworkMemberJoinRequest): Hex {
         abi: NETWORK_MEMBER_REGISTRY_ABI,
         functionName: "requestToJoin",
         args: [
-            request.memberNetworkId,
+            request.accountKeyX,
+            request.accountKeyY,
             request.semaphoreCommitment,
             getAddress(request.governanceSigner),
             request.metadataURI ?? ""

package/types/index.d.ts

@@ -86,8 +86,11 @@ declare const NETWORK_MEMBER_GOVERNANCE_ABI: readonly [{
     readonly name: "admitMember";
     readonly stateMutability: "nonpayable";
     readonly inputs: readonly [{
-        readonly name: "memberNetworkId";
-        readonly type: "bytes32";
+        readonly name: "accountKeyX";
+        readonly type: "uint256";
+    }, {
+        readonly name: "accountKeyY";
+        readonly type: "uint256";
     }, {
         readonly name: "semaphoreCommitment";
         readonly type: "uint256";
@@ -148,14 +151,47 @@ declare const NETWORK_MEMBER_GOVERNANCE_ABI: readonly [{
         readonly type: "uint256";
     }];
 }];
+/** The event a candidate's join request emits, for watching with `getLogs`. */
+declare const NETWORK_MEMBER_JOIN_REQUESTED_EVENT: {
+    readonly type: "event";
+    readonly name: "NetworkMemberJoinRequested";
+    readonly inputs: readonly [{
+        readonly name: "memberNetworkId";
+        readonly type: "bytes32";
+        readonly indexed: true;
+    }, {
+        readonly name: "accountKeyX";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "accountKeyY";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "semaphoreCommitment";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "governanceSigner";
+        readonly type: "address";
+        readonly indexed: false;
+    }, {
+        readonly name: "metadataURI";
+        readonly type: "string";
+        readonly indexed: false;
+    }];
+};
 /** The `NetworkMemberRegistry` surface a member server needs directly. */
 declare const NETWORK_MEMBER_REGISTRY_ABI: readonly [{
     readonly type: "function";
     readonly name: "requestToJoin";
     readonly stateMutability: "nonpayable";
     readonly inputs: readonly [{
-        readonly name: "memberNetworkId";
-        readonly type: "bytes32";
+        readonly name: "accountKeyX";
+        readonly type: "uint256";
+    }, {
+        readonly name: "accountKeyY";
+        readonly type: "uint256";
     }, {
         readonly name: "semaphoreCommitment";
         readonly type: "uint256";
@@ -174,6 +210,14 @@ declare const NETWORK_MEMBER_REGISTRY_ABI: readonly [{
         readonly name: "memberNetworkId";
         readonly type: "bytes32";
         readonly indexed: true;
+    }, {
+        readonly name: "accountKeyX";
+        readonly type: "uint256";
+        readonly indexed: false;
+    }, {
+        readonly name: "accountKeyY";
+        readonly type: "uint256";
+        readonly indexed: false;
     }, {
         readonly name: "semaphoreCommitment";
         readonly type: "uint256";
@@ -203,8 +247,15 @@ interface GovernanceContracts {
  * admission is a function of the candidate's own announcement.
  */
 interface NetworkMemberJoinRequest {
-    /** The candidate's networkId. */
+    /**
+     * The candidate's networkId, `keccak256(X || Y)` of its account key. Filled from the event topic
+     * when decoding, and ignored by the encoders, which pass the key.
+     */
     memberNetworkId: Hex;
+    /** The X coordinate of the candidate's account key, a secp256k1 public key. */
+    accountKeyX: bigint;
+    /** The Y coordinate of the candidate's account key. */
+    accountKeyY: bigint;
     /** The Semaphore identity commitment it wants in the approved-member group. */
     semaphoreCommitment: bigint;
     /** The address it wants added to the governance Safe, so it can vote on later candidates. */
@@ -248,6 +299,18 @@ interface JoinRequestLog {
  * @returns The request the candidate published.
  */
 declare function decodeJoinRequestLog(log: JoinRequestLog, registry?: Address): NetworkMemberJoinRequest;
+/**
+ * The networkId and key coordinates of a member's account key, the secp256k1 key whose address is its
+ * auth address.
+ *
+ * @param uncompressedPublicKey The public key: 65 bytes with the `0x04` prefix, or the raw 64 bytes of X || Y.
+ * @returns The coordinates, and `keccak256(X || Y)`, which is the id the registry derives from them.
+ */
+declare function memberAccountKey(uncompressedPublicKey: Hex): {
+    memberNetworkId: Hex;
+    accountKeyX: bigint;
+    accountKeyY: bigint;
+};
 /**
  * The single call that admits a network member: its record, its group leaf, and its seat at the Safe.
  *
@@ -317,7 +380,7 @@ declare function buildRemovalTransaction(contracts: GovernanceContracts, removal
 declare function encodeExitNetwork(memberNetworkId: Hex, merkleProofSiblings: bigint[]): Hex;
 /**
  * Calldata for a candidate's own join request, the one permissionless call in this flow. It must be
- * sent from the auth address the networkId encodes, and `governanceSigner` must be a different key.
+ * sent from the address of the account key, and `governanceSigner` must be a different key.
  *
  * @param request The request to announce.
  * @returns Calldata for the registry.
@@ -468,5 +531,5 @@ declare function checkQuorum(owners: Address[], threshold: number, signers: Addr
  */
 declare function encodeExecTransaction(context: SafeContext, transaction: SafeTransactionData, signatures: SafeSignature[]): Hex;
 
-export { NETWORK_MEMBER_GOVERNANCE_ABI, NETWORK_MEMBER_REGISTRY_ABI, NO_REFUND, ZERO_ADDRESS, admissionCall, buildAdmissionTransaction, buildRemovalTransaction, buildSafeTransactionData, checkQuorum, decodeJoinRequestLog, encodeAdmitMember, encodeApproveHash, encodeExecTransaction, encodeExitNetwork, encodeRemoveMember, encodeRequestToJoin, encodeSafeSignatures, governanceThreshold, hashSafeTransaction, onChainApproval, recoverSafeSigner, removalCall, resolveMultiSend, signSafeTransaction };
+export { NETWORK_MEMBER_GOVERNANCE_ABI, NETWORK_MEMBER_JOIN_REQUESTED_EVENT, NETWORK_MEMBER_REGISTRY_ABI, NO_REFUND, ZERO_ADDRESS, admissionCall, buildAdmissionTransaction, buildRemovalTransaction, buildSafeTransactionData, checkQuorum, decodeJoinRequestLog, encodeAdmitMember, encodeApproveHash, encodeExecTransaction, encodeExitNetwork, encodeRemoveMember, encodeRequestToJoin, encodeSafeSignatures, governanceThreshold, hashSafeTransaction, memberAccountKey, onChainApproval, recoverSafeSigner, removalCall, resolveMultiSend, signSafeTransaction };
 export type { GovernanceContracts, JoinRequestLog, NetworkMemberJoinRequest, NetworkMemberRemoval, QuorumCheck, SafeContext, TypedDataSigner };