feat(sdk): update pre deactivate config

Author: 99Kies

.gitignore

@@ -44,3 +44,6 @@ pnpm-lock.yaml
 # claude only
 .claude
 CLAUDE.md
+
+# zkey files
+add-new-key_v3/

packages/sdk/src/libs/contract/contract.ts

@@ -72,6 +72,7 @@ export class Contract {
     voiceCreditAmount,
     circuitType,
     preDeactivateRoot,
+    preDeactivateCoordinator,
     oracleWhitelistPubkey,
     fee = 'auto',
   }: CreateAMaciRoundParams & { signer: OfflineSigner }) {
@@ -90,10 +91,33 @@ export class Contract {
     );
 
     preDeactivateRoot = preDeactivateRoot || '0';
+
+    // Convert preDeactivateCoordinator to {x, y} format if provided
+    let preDeactivateCoordinatorPubKey: { x: string; y: string } | undefined =
+      undefined;
+    if (preDeactivateCoordinator !== undefined) {
+      let coordinatorX: bigint;
+      let coordinatorY: bigint;
+
+      if (typeof preDeactivateCoordinator === 'bigint') {
+        // If it's a packed bigint, unpack it
+        [coordinatorX, coordinatorY] = unpackPubKey(preDeactivateCoordinator);
+      } else {
+        // If it's already a PubKey array [x, y]
+        [coordinatorX, coordinatorY] = preDeactivateCoordinator;
+      }
+
+      preDeactivateCoordinatorPubKey = {
+        x: coordinatorX.toString(),
+        y: coordinatorY.toString(),
+      };
+    }
+
     const res = await client.createRound(
       {
         operator,
         preDeactivateRoot,
+        preDeactivateCoordinator: preDeactivateCoordinatorPubKey,
         voiceCreditAmount,
         whitelist,
         roundInfo: {
@@ -1513,6 +1537,7 @@ export class Contract {
     whitelist,
     voiceCreditAmount,
     preDeactivateRoot,
+    preDeactivateCoordinator,
     oracleWhitelistPubkey,
     circuitType,
     gasStation = false,
@@ -1527,13 +1552,35 @@ export class Contract {
       contractAddress: this.apiSaasAddress,
     });
 
+    // Convert preDeactivateCoordinator to {x, y} format if provided
+    let preDeactivateCoordinatorPubKey: { x: string; y: string } | undefined =
+      undefined;
+    if (preDeactivateCoordinator !== undefined) {
+      let coordinatorX: bigint;
+      let coordinatorY: bigint;
+
+      if (typeof preDeactivateCoordinator === 'bigint') {
+        // If it's a packed bigint, unpack it
+        [coordinatorX, coordinatorY] = unpackPubKey(preDeactivateCoordinator);
+      } else {
+        // If it's already a PubKey array [x, y]
+        [coordinatorX, coordinatorY] = preDeactivateCoordinator;
+      }
+
+      preDeactivateCoordinatorPubKey = {
+        x: coordinatorX.toString(),
+        y: coordinatorY.toString(),
+      };
+    }
+
     const roundParams = {
       certificationSystem: '0',
       circuitType: circuitType.toString(),
       maxVoter: maxVoter.toString(),
       operator,
       oracleWhitelistPubkey,
       preDeactivateRoot: preDeactivateRoot || '0',
+      preDeactivateCoordinator: preDeactivateCoordinatorPubKey,
       roundInfo: {
         title,
         description: description || '',
@@ -1562,6 +1609,7 @@ export class Contract {
           operator,
           oracle_whitelist_pubkey: oracleWhitelistPubkey,
           pre_deactivate_root: preDeactivateRoot || '0',
+          pre_deactivate_coordinator: preDeactivateCoordinatorPubKey,
           round_info: roundParams.roundInfo,
           voice_credit_amount: voiceCreditAmount,
           vote_option_map: voteOptionMap,

packages/sdk/src/libs/contract/ts/AMaci.client.ts

@@ -34,6 +34,7 @@ import {
   Period,
   TallyDelayInfo,
   NullableString,
+  NullableUint256,
   Uint128,
   ArrayOfString,
   Whitelist,
@@ -68,6 +69,7 @@ export interface AMaciReadOnlyInterface {
   queryCircuitType: () => Promise<Uint256>;
   queryCertSystem: () => Promise<Uint256>;
   queryPreDeactivateRoot: () => Promise<Uint256>;
+  queryPreDeactivateCoordinatorHash: () => Promise<NullableUint256>;
   getDelayRecords: () => Promise<DelayRecords>;
   getTallyDelay: () => Promise<TallyDelayInfo>;
   queryOracleWhitelistConfig: () => Promise<NullableString>;
@@ -119,6 +121,8 @@ export class AMaciQueryClient implements AMaciReadOnlyInterface {
     this.queryCircuitType = this.queryCircuitType.bind(this);
     this.queryCertSystem = this.queryCertSystem.bind(this);
     this.queryPreDeactivateRoot = this.queryPreDeactivateRoot.bind(this);
+    this.queryPreDeactivateCoordinatorHash =
+      this.queryPreDeactivateCoordinatorHash.bind(this);
     this.getDelayRecords = this.getDelayRecords.bind(this);
     this.getTallyDelay = this.getTallyDelay.bind(this);
     this.queryOracleWhitelistConfig =
@@ -279,6 +283,11 @@ export class AMaciQueryClient implements AMaciReadOnlyInterface {
       query_pre_deactivate_root: {},
     });
   };
+  queryPreDeactivateCoordinatorHash = async (): Promise<NullableUint256> => {
+    return this.client.queryContractSmart(this.contractAddress, {
+      query_pre_deactivate_coordinator_hash: {},
+    });
+  };
   getDelayRecords = async (): Promise<DelayRecords> => {
     return this.client.queryContractSmart(this.contractAddress, {
       get_delay_records: {},

packages/sdk/src/libs/contract/ts/AMaci.types.ts

@@ -17,6 +17,7 @@ export interface InstantiateMsg {
   operator: Addr;
   oracle_whitelist_pubkey?: string | null;
   parameters: MaciParameters;
+  pre_deactivate_coordinator?: PubKey | null;
   pre_deactivate_root: Uint256;
   round_info: RoundInfo;
   voice_credit_amount: Uint256;
@@ -238,6 +239,9 @@ export type QueryMsg =
   | {
       query_pre_deactivate_root: {};
     }
+  | {
+      query_pre_deactivate_coordinator_hash: {};
+    }
   | {
       get_delay_records: {};
     }
@@ -288,6 +292,7 @@ export interface TallyDelayInfo {
   total_work: number;
 }
 export type NullableString = string | null;
+export type NullableUint256 = Uint256 | null;
 export type Uint128 = string;
 export type ArrayOfString = string[];
 export interface Whitelist {

packages/sdk/src/libs/contract/ts/ApiSaas.client.ts

@@ -189,6 +189,7 @@ export interface ApiSaasInterface extends ApiSaasReadOnlyInterface {
       maxVoter,
       operator,
       oracleWhitelistPubkey,
+      preDeactivateCoordinator,
       preDeactivateRoot,
       roundInfo,
       voiceCreditAmount,
@@ -201,6 +202,7 @@ export interface ApiSaasInterface extends ApiSaasReadOnlyInterface {
       maxVoter: Uint256;
       operator: Addr;
       oracleWhitelistPubkey?: string;
+      preDeactivateCoordinator?: PubKey;
       preDeactivateRoot: Uint256;
       roundInfo: RoundInfo;
       voiceCreditAmount: Uint256;
@@ -480,6 +482,7 @@ export class ApiSaasClient
       maxVoter,
       operator,
       oracleWhitelistPubkey,
+      preDeactivateCoordinator,
       preDeactivateRoot,
       roundInfo,
       voiceCreditAmount,
@@ -492,6 +495,7 @@ export class ApiSaasClient
       maxVoter: Uint256;
       operator: Addr;
       oracleWhitelistPubkey?: string;
+      preDeactivateCoordinator?: PubKey;
       preDeactivateRoot: Uint256;
       roundInfo: RoundInfo;
       voiceCreditAmount: Uint256;
@@ -513,6 +517,7 @@ export class ApiSaasClient
           max_voter: maxVoter,
           operator,
           oracle_whitelist_pubkey: oracleWhitelistPubkey,
+          pre_deactivate_coordinator: preDeactivateCoordinator,
           pre_deactivate_root: preDeactivateRoot,
           round_info: roundInfo,
           voice_credit_amount: voiceCreditAmount,

packages/sdk/src/libs/contract/ts/ApiSaas.types.ts

@@ -68,6 +68,7 @@ export type ExecuteMsg =
         max_voter: Uint256;
         operator: Addr;
         oracle_whitelist_pubkey?: string | null;
+        pre_deactivate_coordinator?: PubKey | null;
         pre_deactivate_root: Uint256;
         round_info: RoundInfo;
         voice_credit_amount: Uint256;

packages/sdk/src/libs/contract/ts/Registry.client.ts

@@ -166,6 +166,7 @@ export interface RegistryInterface extends RegistryReadOnlyInterface {
       maxVoter,
       operator,
       oracleWhitelistPubkey,
+      preDeactivateCoordinator,
       preDeactivateRoot,
       roundInfo,
       voiceCreditAmount,
@@ -178,6 +179,7 @@ export interface RegistryInterface extends RegistryReadOnlyInterface {
       maxVoter: Uint256;
       operator: Addr;
       oracleWhitelistPubkey?: string;
+      preDeactivateCoordinator?: PubKey;
       preDeactivateRoot: Uint256;
       roundInfo: RoundInfo;
       voiceCreditAmount: Uint256;
@@ -342,6 +344,7 @@ export class RegistryClient
       maxVoter,
       operator,
       oracleWhitelistPubkey,
+      preDeactivateCoordinator,
       preDeactivateRoot,
       roundInfo,
       voiceCreditAmount,
@@ -354,6 +357,7 @@ export class RegistryClient
       maxVoter: Uint256;
       operator: Addr;
       oracleWhitelistPubkey?: string;
+      preDeactivateCoordinator?: PubKey;
       preDeactivateRoot: Uint256;
       roundInfo: RoundInfo;
       voiceCreditAmount: Uint256;
@@ -375,6 +379,7 @@ export class RegistryClient
           max_voter: maxVoter,
           operator,
           oracle_whitelist_pubkey: oracleWhitelistPubkey,
+          pre_deactivate_coordinator: preDeactivateCoordinator,
           pre_deactivate_root: preDeactivateRoot,
           round_info: roundInfo,
           voice_credit_amount: voiceCreditAmount,

packages/sdk/src/libs/contract/ts/Registry.types.ts

@@ -33,6 +33,7 @@ export type ExecuteMsg =
         max_voter: Uint256;
         operator: Addr;
         oracle_whitelist_pubkey?: string | null;
+        pre_deactivate_coordinator?: PubKey | null;
         pre_deactivate_root: Uint256;
         round_info: RoundInfo;
         voice_credit_amount: Uint256;

packages/sdk/src/libs/contract/types.ts

@@ -8,6 +8,7 @@ import {
   MaciCertSystemType,
   CertificateEcosystem,
 } from '../../types';
+import { PubKey } from '../crypto';
 
 export type CreateRoundParams = {
   signer?: OfflineSigner;
@@ -27,6 +28,7 @@ export type CreateAMaciRoundParams = {
   whitelist?: RegistryWhitelist;
   voiceCreditAmount: string;
   preDeactivateRoot?: string;
+  preDeactivateCoordinator?: PubKey | bigint;
   oracleWhitelistPubkey?: string;
 } & CreateRoundParams;
 
@@ -67,6 +69,7 @@ export type CreateApiSaasAmaciRoundParams = {
   whitelist?: RegistryWhitelist;
   voiceCreditAmount: string;
   preDeactivateRoot?: string;
+  preDeactivateCoordinator?: PubKey | bigint;
   oracleWhitelistPubkey?: string;
   gasStation?: boolean;
   fee?: StdFee | 'auto' | number;

packages/voter/scripts/test_gen_deactivate.ts

@@ -0,0 +1,54 @@
+import { genAccounts, VoterClient } from '../src';
+import dotenv from 'dotenv';
+
+dotenv.config();
+
+import * as path from 'path';
+
+async function main() {
+	const secretKey = process.env.ADMIN_PRIVATE_KEY;
+	if (!secretKey) {
+		throw new Error('ADMIN_PRIVATE_KEY not found in environment variables');
+	}
+
+	const coordinator = new VoterClient({
+		secretKey,
+	});
+	console.log('coordinator', coordinator.getPubkey().toPackedData());
+	const { deactivates, root, leaves, tree } = coordinator
+		.getSigner()
+		.genDeactivateRoot(
+			[
+				62071628452838807843875387950635179100467701723619568550128325247586768602836n, // voter pubkey
+				8488296638481981615643178142445511165715108699929572315723118360556015787681n,
+				59183419265525843263552876017551249941309839147094892945935225919011194818766n,
+			],
+			2
+		);
+
+	console.log(root);
+
+	const voterClient = new VoterClient({
+		mnemonic: process.env.VOTER_MNEMONIC,
+	});
+
+	const circuitPower = '2-1-1-5';
+	const genProof = await voterClient.buildPreAddNewKeyPayload({
+		stateTreeDepth: 2,
+		operatorPubkey:
+			15985671812509037697999452079047723323214510694838922960102081803756551067669n,
+		deactivates,
+		wasmFile: path.join(
+			process.cwd(),
+			`add-new-key_v3/${circuitPower}/addKey.wasm`
+		),
+		zkeyFile: path.join(
+			process.cwd(),
+			`add-new-key_v3/${circuitPower}/addKey.zkey`
+		),
+	});
+
+	console.log(genProof);
+}
+
+main();