@dorafactory/maci-sdk 0.0.40 → 0.0.41

package/dist/libs/crypto/keys.d.ts

@@ -72,3 +72,4 @@ export declare const genAddKeyProof: (depth: number, { coordPubKey, oldKey, deac
     nullifier: bigint;
     oldPrivateKey: bigint;
 } | null>;
+export declare const genRandomKey: () => string;

package/dist/libs/http/http.d.ts

@@ -13,4 +13,5 @@ export declare class Http {
     fetch(url: string, options?: any): Promise<Response>;
     fetchGraphql<T>(query: string, after: string, limit?: number | null): Promise<T>;
     fetchRest(path: string, options?: any): Promise<any>;
+    fetchAllGraphqlPages<T>(query: string, variables: any): Promise<T[]>;
 }

package/dist/libs/indexer/indexer.d.ts

@@ -1,4 +1,4 @@
-import { BalanceResponse, RoundResponse, RoundsResponse, OperatorResponse, OperatorsResponse, CircuitResponse, TransactionResponse, TransactionsResponse, CircuitsResponse, ProofResponse, SignUpEventsResponse, OperatorDelayOperationsResponse, MissRateResponse, SelectiveRoundResponse } from '../../types';
+import { BalanceResponse, RoundResponse, RoundsResponse, OperatorResponse, OperatorsResponse, CircuitResponse, TransactionResponse, TransactionsResponse, CircuitsResponse, ProofResponse, SignUpEventsResponse, OperatorDelayOperationsResponse, MissRateResponse, SelectiveRoundResponse, DeactivateMessage } from '../../types';
 import { IndexerParams } from './types';
 import { Http } from '../http';
 import { Round, UserAccount, Circuit, Operator, Proof, Transaction, Event } from '../query';
@@ -149,4 +149,5 @@ export declare class Indexer {
      * @returns {Promise<SignUpEventsResponse>} The sign up events response.
      */
     getSignUpEventByPubKey(contractAddress: string, pubKey: bigint[]): Promise<SignUpEventsResponse>;
+    fetchAllDeactivateLogs(contractAddress: string): Promise<DeactivateMessage[]>;
 }

package/dist/libs/maci/maci.d.ts

@@ -152,6 +152,9 @@ export declare class MACI {
         gasStation?: boolean;
         fee?: StdFee;
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
+    fetchAllDeactivateLogs({ contractAddress, }: {
+        contractAddress: string;
+    }): Promise<import("../../types").DeactivateMessage[]>;
     claimAMaciRound({ signer, contractAddress, fee, }: {
         signer: OfflineSigner;
         contractAddress: string;

package/dist/libs/query/event.d.ts

@@ -4,4 +4,5 @@ export declare class Event {
     http: Http;
     constructor(http: Http);
     getSignUpEventByPubKey(contractAddress: string, pubKey: bigint[]): Promise<SignUpEventsResponse>;
+    fetchAllDeactivateLogs(contractAddress: string): Promise<any[]>;
 }

package/dist/types/index.d.ts

@@ -381,3 +381,12 @@ export type MissRateType = {
     deactivateCount: number;
     missRate: number;
 };
+export type DeactivateMessage = {
+    id: string;
+    blockHeight: string;
+    timestamp: string;
+    txHash: string;
+    deactivateMessage: string;
+    maciContractAddress: string;
+    maciOperator: string;
+};

package/dist/utils/index.d.ts

@@ -5,3 +5,20 @@ export declare function isValidAddress(address: string): boolean;
  * @returns The decimal string representation of the input.
  */
 export declare function hexToDecimalString(hexString: string): string;
+/**
+ * Converts a hexadecimal string to a BigInt.
+ * @param hexString - The hexadecimal string to convert.
+ * @returns The BigInt representation of the input.
+ */
+export declare function hexToBigInt(hexString: string): bigint;
+/**
+ * Parses a public key string into its x and y coordinates.
+ * @param publickKey - The public key string to parse (128 characters long).
+ * @returns An object containing the x and y coordinates as decimal strings.
+ */
+export declare function decompressPublicKey(compressedPubkey: string): {
+    x: string;
+    y: string;
+};
+export declare function compressPublicKey(decompressedPubkey: any[]): string;
+export declare function transformPubkey(oldPubkey: string): bigint;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dorafactory/maci-sdk",
-  "version": "0.0.40",
+  "version": "0.0.41",
   "description": "SDK for interacting with maci",
   "keywords": [
     "maci",

package/src/libs/crypto/keys.ts

@@ -296,3 +296,26 @@ export const genAddKeyProof = async (
 
   return input;
 };
+
+// LIB
+function randomUint256() {
+  const buffer = [];
+  for (let i = 0; i < 64; i++) {
+    buffer.push(
+      Math.floor(Math.random() * 256)
+        .toString(16)
+        .padStart(2, '0')
+    );
+  }
+  return buffer.join('');
+}
+
+export const genRandomKey = () => {
+  const key = [
+    randomUint256(),
+    randomUint256(),
+    randomUint256(),
+    randomUint256(),
+  ].join('');
+  return ['-----BEGIN MACI KEY-----', key, '-----END MACI KEY-----'].join('\n');
+};

package/src/libs/http/http.ts

@@ -146,4 +146,34 @@ export class Http {
       );
     }
   }
+
+  async fetchAllGraphqlPages<T>(query: string, variables: any): Promise<T[]> {
+    let hasNextPage = true;
+    let offset = 0;
+    const limit = 100; // Adjust the limit as needed
+    const allData: T[] = [];
+
+    while (hasNextPage) {
+      const response = await this.fetch(this.apiEndpoint, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/json',
+        },
+        body: JSON.stringify({
+          query,
+          variables: { ...variables, limit, offset },
+        }),
+      }).then((res) => res.json());
+
+      const key = Object.keys(response.data)[0];
+
+      const { nodes, pageInfo } = response.data[key];
+      allData.push(...nodes);
+      hasNextPage = pageInfo.hasNextPage;
+      offset += limit;
+    }
+
+    return allData;
+  }
 }

package/src/libs/indexer/indexer.ts

@@ -13,6 +13,7 @@ import {
   OperatorDelayOperationsResponse,
   MissRateResponse,
   SelectiveRoundResponse,
+  DeactivateMessage,
 } from '../../types';
 import { IndexerParams } from './types';
 import { Http } from '../http';
@@ -291,4 +292,10 @@ export class Indexer {
   ): Promise<SignUpEventsResponse> {
     return await this.event.getSignUpEventByPubKey(contractAddress, pubKey);
   }
+
+  async fetchAllDeactivateLogs(
+    contractAddress: string
+  ): Promise<DeactivateMessage[]> {
+    return await this.event.fetchAllDeactivateLogs(contractAddress);
+  }
 }

package/src/libs/maci/maci.ts

@@ -1,5 +1,11 @@
 import { OfflineSigner } from '@cosmjs/proto-signing';
-import { Keypair, batchGenMessage, PubKey, stringizing } from '../crypto';
+import {
+  Keypair,
+  batchGenMessage,
+  PubKey,
+  stringizing,
+  genAddKeyProof,
+} from '../crypto';
 import { Contract } from '../contract';
 import { Indexer } from '../indexer';
 import { OracleCertificate } from '../oracle-certificate';
@@ -782,6 +788,123 @@ export class MACI {
     );
   }
 
+  // async submitDeactivate({
+  //   signer,
+  //   client,
+  //   address,
+  //   maciAccount,
+  //   contractAddress,
+  //   gasStation,
+  //   fee,
+  // }: {
+  //   signer: OfflineSigner;
+  //   client: SigningCosmWasmClient;
+  //   address?: string;
+  //   maciAccount: Keypair;
+  //   contractAddress: string;
+  //   gasStation: boolean;
+  //   fee?: StdFee;
+  // }) {
+  //   try {
+  //     address = address || (await signer.getAccounts())[0].address;
+
+  //     const stateIdx = await this.getStateIdxInc({
+  //       signer,
+  //       address,
+  //       contractAddress,
+  //     });
+
+  //     const operatorCoordPubKey = await this.getRoundInfo({
+  //       contractAddress,
+  //     });
+
+  //     const payload = batchGenMessage(
+  //       Number(stateIdx),
+  //       maciAccount,
+  //       [
+  //         BigInt(operatorCoordPubKey.coordinatorPubkeyX),
+  //         BigInt(operatorCoordPubKey.coordinatorPubkeyY),
+  //       ],
+  //       [[0, 0]]
+  //     );
+
+  //     const { msg, encPubkeys } = payload[0];
+
+  //     const gasPrice = GasPrice.fromString('100000000000peaka');
+  //     fee = fee || calculateFee(20000000, gasPrice);
+
+  //     return client.execute(
+  //       address,
+  //       contractAddress,
+  //       stringizing({
+  //         publish_deactivate_message: {
+  //           enc_pub_key: {
+  //             x: encPubkeys[0],
+  //             y: encPubkeys[1],
+  //           },
+  //           message: {
+  //             data: msg,
+  //           },
+  //         },
+  //       }),
+  //       gasStation === true
+  //         ? {
+  //             amount: fee.amount,
+  //             gas: fee.gas,
+  //             granter: contractAddress,
+  //           }
+  //         : fee
+  //     );
+  //   } catch (error) {
+  //     throw Error(`Submit deactivate failed! ${error}`);
+  //   }
+  // }
+
+  async fetchAllDeactivateLogs({
+    contractAddress,
+  }: {
+    contractAddress: string;
+  }) {
+    const deactivates =
+      await this.indexer.fetchAllDeactivateLogs(contractAddress);
+    return deactivates;
+  }
+
+  // async addNewKey({
+  //   signer,
+  //   client,
+  //   address,
+  //   maciAccount,
+  //   contractAddress,
+  //   gasStation,
+  //   fee,
+  // }: {
+  //   signer: OfflineSigner;
+  //   client: SigningCosmWasmClient;
+  //   address?: string;
+  //   maciAccount: Keypair;
+  //   contractAddress: string;
+  //   gasStation: boolean;
+  //   fee?: StdFee;
+  // }) {
+  //   const deactivates = await this.fetchAllDeactivateLogs({
+  //     contractAddress,
+  //   });
+
+  //   const roundInfo = await this.getRoundInfo({
+  //     contractAddress,
+  //   });
+
+  //   const inputObj = await genAddKeyProof(4, {
+  //     coordPubKey: [
+  //       BigInt(roundInfo.coordinatorPubkeyX),
+  //       BigInt(roundInfo.coordinatorPubkeyY),
+  //     ],
+  //     oldKey: maciAccount,
+  //     deactivates: deactivates.map((d: any) => d.map(BigInt)),
+  //   });
+  // }
+
   async claimAMaciRound({
     signer,
     contractAddress,

package/src/libs/query/event.ts

@@ -1,5 +1,9 @@
 import { Http } from '../../libs';
-import { SignUpEventsGraphqlResponse, SignUpEventsResponse } from '../../types';
+import {
+  DeactivateMessage,
+  SignUpEventsGraphqlResponse,
+  SignUpEventsResponse,
+} from '../../types';
 import { handleError, ErrorType } from '../errors';
 import { ERROR } from '../errors/types';
 
@@ -75,4 +79,43 @@ query signUpEvents($limit: Int, $after: Cursor) {
       return handleError(error as ErrorType);
     }
   }
+
+  async fetchAllDeactivateLogs(contractAddress: string) {
+    const DEACTIVATE_MESSAGE_QUERY = `query ($limit: Int, $offset: Int) {
+  deactivateMessages(
+    first: $limit,
+    offset: $offset,
+    orderBy: [BLOCK_HEIGHT_ASC],
+    filter: {
+      maciContractAddress: { 
+        equalTo: "${contractAddress}" 
+      },
+    }
+  ) {
+	  totalCount
+	  pageInfo {
+      endCursor
+      hasNextPage
+	  }
+    nodes {
+      id
+      blockHeight
+      timestamp
+      txHash
+      deactivateMessage
+      maciContractAddress
+      maciOperator
+    }
+  }
+}`;
+    const ds = await this.http.fetchAllGraphqlPages<DeactivateMessage>(
+      DEACTIVATE_MESSAGE_QUERY,
+      {}
+    );
+
+    return ds.reduce(
+      (s, c) => [...s, ...JSON.parse(c.deactivateMessage)],
+      [] as string[][]
+    );
+  }
 }

package/src/maci.ts

@@ -195,21 +195,21 @@ export class MaciClient {
 
   async createAMaciRound(params: CreateAMaciRoundParams) {
     return await this.contract.createAMaciRound({
-      signer: this.getSigner(),
+      signer: this.getSigner(params.signer),
       ...params,
     });
   }
 
   async createMaciRound(params: CreateMaciRoundParams) {
     return await this.contract.createMaciRound({
-      signer: this.getSigner(),
+      signer: this.getSigner(params.signer),
       ...params,
     });
   }
 
   async createOracleMaciRound(params: CreateOracleMaciRoundParams) {
     return await this.contract.createOracleMaciRound({
-      signer: this.getSigner(),
+      signer: this.getSigner(params.signer),
       ...params,
     });
   }

package/src/types/index.ts

@@ -459,3 +459,13 @@ export type MissRateType = {
   deactivateCount: number;
   missRate: number;
 };
+
+export type DeactivateMessage = {
+  id: string;
+  blockHeight: string;
+  timestamp: string;
+  txHash: string;
+  deactivateMessage: string; // '[["0", "1", "2", "3", "4"]]'
+  maciContractAddress: string;
+  maciOperator: string;
+};

package/src/utils/index.ts

@@ -1,4 +1,5 @@
 import { decode } from 'bech32';
+import { packPubKey, PubKey } from 'src/libs/crypto';
 
 function verifyIsBech32(address: string): Error | undefined {
   try {
@@ -25,6 +26,16 @@ export function hexToDecimalString(hexString: string) {
   return decimalString;
 }
 
+/**
+ * Converts a hexadecimal string to a BigInt.
+ * @param hexString - The hexadecimal string to convert.
+ * @returns The BigInt representation of the input.
+ */
+export function hexToBigInt(hexString: string) {
+  return BigInt('0x' + hexString);
+}
+
+
 function padWithZerosIfNeeded(inputString: string) {
   if (inputString.length === 64) {
     return inputString;
@@ -36,25 +47,37 @@ function padWithZerosIfNeeded(inputString: string) {
   throw new Error('Invalid input string length');
 }
 
-// /**
-//  * Parses a public key string into its x and y coordinates.
-//  * @param publickKey - The public key string to parse (128 characters long).
-//  * @returns An object containing the x and y coordinates as decimal strings.
-//  */
-// export function decompressPublicKey(compressedPubkey: string) {
-//   const x = compressedPubkey.slice(0, 64);
-//   const y = compressedPubkey.slice(64);
-
-//   return {
-//     x: hexToDecimalString(x),
-//     y: hexToDecimalString(y),
-//   };
-// }
-
-// export function compressPublicKey(decompressedPubkey: any[]) {
-//   const x = decompressedPubkey[0];
-//   const y = decompressedPubkey[1];
-//   const compressedPubkey =
-//     padWithZerosIfNeeded(x.toString(16)) + padWithZerosIfNeeded(y.toString(16));
-//   return compressedPubkey;
-// }
+/**
+ * Parses a public key string into its x and y coordinates.
+ * @param publickKey - The public key string to parse (128 characters long).
+ * @returns An object containing the x and y coordinates as decimal strings.
+ */
+export function decompressPublicKey(compressedPubkey: string) {
+  const x = compressedPubkey.slice(0, 64);
+  const y = compressedPubkey.slice(64);
+
+  return {
+    x: hexToDecimalString(x),
+    y: hexToDecimalString(y),
+  };
+}
+
+export function compressPublicKey(decompressedPubkey: any[]) {
+  const x = decompressedPubkey[0];
+  const y = decompressedPubkey[1];
+  const compressedPubkey =
+    padWithZerosIfNeeded(x.toString(16)) + padWithZerosIfNeeded(y.toString(16));
+  return compressedPubkey;
+}
+
+
+export function transformPubkey(oldPubkey: string) {
+  const x = oldPubkey.slice(0, 64);
+  const y = oldPubkey.slice(64);
+
+  const pubkey: PubKey = [hexToBigInt(x), hexToBigInt(y)];
+  console.log(pubkey)
+  console.log([hexToDecimalString(x), hexToDecimalString(y)])
+  const packedPubkey = packPubKey(pubkey);
+  return packedPubkey;
+}