@dorafactory/maci-sdk 0.0.41 → 0.0.51

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

@@ -53,11 +53,11 @@ export declare const batchGenMessage: (stateIdx: number, keypair: Keypair, coord
     encPubkeys: PubKey<bigint>;
 }[];
 export declare const privateKeyFromTxt: (txt: string) => Keypair | undefined;
-export declare const genAddKeyProof: (depth: number, { coordPubKey, oldKey, deactivates, }: {
+export declare const genAddKeyInput: (depth: number, { coordPubKey, oldKey, deactivates, }: {
     coordPubKey: PubKey;
     oldKey: Keypair;
     deactivates: bigint[][];
-}) => Promise<{
+}) => {
     inputHash: bigint;
     coordPubKey: PubKey;
     deactivateRoot: bigint;
@@ -71,5 +71,5 @@ export declare const genAddKeyProof: (depth: number, { coordPubKey, oldKey, deac
     deactivateLeafPathElements: bigint[][];
     nullifier: bigint;
     oldPrivateKey: bigint;
-} | null>;
+} | null;
 export declare const genRandomKey: () => string;

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

@@ -8,6 +8,7 @@ import { StdFee } from '@cosmjs/stargate';
 import { CertificateEcosystem, ErrorResponse, RoundType } from '../../types';
 import { SignatureResponse } from '../oracle-certificate/types';
 import { OracleWhitelistConfig } from '../contract/ts/OracleMaci.types';
+import { Groth16ProofType } from '../contract/ts/Maci.types';
 export declare function isErrorResponse(response: unknown): response is ErrorResponse;
 export declare class MACI {
     contract: Contract;
@@ -42,7 +43,7 @@ export declare class MACI {
         address: string;
         contractAddress: string;
     }): Promise<boolean>;
-    queryWhitelistBalanceOf({ signer, address, contractAddress, certificate, mode, }: {
+    queryWhitelistBalanceOf({ signer, address, contractAddress, certificate, }: {
         signer: OfflineSigner;
         address?: string;
         contractAddress: string;
@@ -50,7 +51,6 @@ export declare class MACI {
             signature: string;
             amount: string;
         };
-        mode?: 'maci' | 'amaci';
     }): Promise<string>;
     isWhitelisted({ signer, address, contractAddress, }: {
         signer: OfflineSigner;
@@ -152,9 +152,44 @@ export declare class MACI {
         gasStation?: boolean;
         fee?: StdFee;
     }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
+    deactivate({ signer, address, maciKeypair, contractAddress, gasStation, fee, }: {
+        signer: OfflineSigner;
+        address?: string;
+        maciKeypair?: Keypair;
+        contractAddress: string;
+        gasStation?: boolean;
+        fee?: StdFee;
+    }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
     fetchAllDeactivateLogs({ contractAddress, }: {
         contractAddress: string;
     }): Promise<import("../../types").DeactivateMessage[]>;
+    genAddKeyInput({ maciKeypair, contractAddress, }: {
+        maciKeypair: Keypair;
+        contractAddress: string;
+    }): Promise<{
+        inputHash: bigint;
+        coordPubKey: PubKey;
+        deactivateRoot: bigint;
+        deactivateIndex: number;
+        deactivateLeaf: bigint;
+        c1: bigint[];
+        c2: bigint[];
+        randomVal: bigint;
+        d1: bigint[];
+        d2: bigint[];
+        deactivateLeafPathElements: bigint[][];
+        nullifier: bigint;
+        oldPrivateKey: bigint;
+    } | null>;
+    addNewKey({ signer, contractAddress, d, proof, nullifier, newMaciKeypair, fee, }: {
+        signer: OfflineSigner;
+        contractAddress: string;
+        d: string[];
+        proof: Groth16ProofType;
+        nullifier: bigint;
+        newMaciKeypair: Keypair;
+        fee?: number | StdFee | 'auto';
+    }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
     claimAMaciRound({ signer, contractAddress, fee, }: {
         signer: OfflineSigner;
         contractAddress: string;

package/dist/maci.d.ts

@@ -6,6 +6,7 @@ import { Keypair, PubKey } from './libs/crypto';
 import { OracleWhitelistConfig } from './libs/contract/ts/OracleMaci.types';
 import { SignatureResponse } from './libs/oracle-certificate/types';
 import { StdFee } from '@cosmjs/amino';
+import { Groth16ProofType } from './libs/contract/ts/Maci.types';
 /**
  * @class MaciClient
  * @description This class is used to interact with Maci Client.
@@ -82,7 +83,7 @@ export declare class MaciClient {
     }): Promise<string>;
     getStateIdxByPubKey({ contractAddress, pubKey, }: {
         contractAddress: string;
-        pubKey: bigint[];
+        pubKey?: bigint[];
     }): Promise<number>;
     feegrantAllowance({ signer, address, contractAddress, }: {
         signer?: OfflineSigner;
@@ -94,7 +95,7 @@ export declare class MaciClient {
         address?: string;
         contractAddress: string;
     }): Promise<boolean>;
-    queryWhitelistBalanceOf({ signer, address, contractAddress, certificate, mode, }: {
+    queryWhitelistBalanceOf({ signer, address, contractAddress, certificate, }: {
         signer?: OfflineSigner;
         address?: string;
         contractAddress: string;
@@ -102,7 +103,6 @@ export declare class MaciClient {
             signature: string;
             amount: string;
         };
-        mode?: 'maci' | 'amaci';
     }): Promise<string>;
     isWhitelisted({ signer, address, contractAddress, }: {
         signer?: OfflineSigner;
@@ -173,6 +173,41 @@ export declare class MaciClient {
         maciKeypair?: Keypair;
         gasStation?: boolean;
     }): Promise<import("@cosmjs/stargate").DeliverTxResponse>;
+    deactivate({ signer, address, contractAddress, gasStation, maciKeypair, fee, }: {
+        signer?: OfflineSigner;
+        address?: string;
+        contractAddress: string;
+        gasStation?: boolean;
+        maciKeypair?: Keypair;
+        fee?: StdFee;
+    }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
+    genAddKeyInput({ contractAddress, maciKeypair, }: {
+        contractAddress: string;
+        maciKeypair?: Keypair;
+    }): Promise<{
+        inputHash: bigint;
+        coordPubKey: PubKey;
+        deactivateRoot: bigint;
+        deactivateIndex: number;
+        deactivateLeaf: bigint;
+        c1: bigint[];
+        c2: bigint[];
+        randomVal: bigint;
+        d1: bigint[];
+        d2: bigint[];
+        deactivateLeafPathElements: bigint[][];
+        nullifier: bigint;
+        oldPrivateKey: bigint;
+    } | null>;
+    addNewKey({ signer, contractAddress, d, proof, nullifier, newMaciKeypair, fee, }: {
+        signer?: OfflineSigner;
+        contractAddress: string;
+        d: string[];
+        proof: Groth16ProofType;
+        nullifier: bigint;
+        newMaciKeypair: Keypair;
+        fee?: number | StdFee | 'auto';
+    }): Promise<import("@cosmjs/cosmwasm-stargate").ExecuteResult>;
     claimAMaciRound({ signer, contractAddress, fee, }: {
         signer?: OfflineSigner;
         contractAddress: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dorafactory/maci-sdk",
-  "version": "0.0.41",
+  "version": "0.0.51",
   "description": "SDK for interacting with maci",
   "keywords": [
     "maci",
@@ -39,12 +39,14 @@
     "assert": "^2.1.0",
     "bech32": "1.1.4",
     "cosmjs-types": "^0.9.0",
+    "crypto-js": "^4.2.0",
     "ethers": "^6.13.4"
   },
   "devDependencies": {
     "@commitlint/cli": "^18.0.0",
     "@commitlint/config-conventional": "^18.0.0",
     "@commitlint/prompt-cli": "^18.0.0",
+    "@types/crypto-js": "^4.2.2",
     "@types/node": "^20.8.7",
     "@types/tmp": "^0.2.5",
     "@typescript-eslint/eslint-plugin": "^6.8.0",

package/src/libs/contract/ts/Maci.types.ts

@@ -59,7 +59,7 @@ export interface QuinaryTreeRoot {
     Uint256,
     Uint256,
     Uint256,
-    Uint256
+    Uint256,
   ];
 }
 export interface RoundInfo {

package/src/libs/contract/ts/OracleMaci.types.ts

@@ -65,7 +65,7 @@ export interface QuinaryTreeRoot {
     Uint256,
     Uint256,
     Uint256,
-    Uint256
+    Uint256,
   ];
 }
 export interface RoundInfo {

package/src/libs/crypto/babyjub.ts

@@ -1,9 +1,9 @@
-import assert from "assert";
-import { randomBytes } from "crypto";
+import assert from 'assert';
+import CryptoJS from 'crypto-js';
 
-import type { PrivKey } from "./types";
+import type { PrivKey } from './types';
 
-import { SNARK_FIELD_SIZE } from "./constants";
+import { SNARK_FIELD_SIZE } from './constants';
 
 /**
  * @notice A class representing a point on the first group (G1)
@@ -20,8 +20,8 @@ export class G1Point {
    * @param y the y coordinate
    */
   constructor(x: bigint, y: bigint) {
-    assert(x < SNARK_FIELD_SIZE && x >= 0, "G1Point x out of range");
-    assert(y < SNARK_FIELD_SIZE && y >= 0, "G1Point y out of range");
+    assert(x < SNARK_FIELD_SIZE && x >= 0, 'G1Point x out of range');
+    assert(y < SNARK_FIELD_SIZE && y >= 0, 'G1Point y out of range');
     this.x = x;
     this.y = y;
   }
@@ -63,8 +63,8 @@ export class G2Point {
    * @param y the y coordinate
    */
   constructor(x: bigint[], y: bigint[]) {
-    this.checkPointsRange(x, "x");
-    this.checkPointsRange(y, "y");
+    this.checkPointsRange(x, 'x');
+    this.checkPointsRange(y, 'y');
 
     this.x = x;
     this.y = y;
@@ -76,7 +76,12 @@ export class G2Point {
    * @returns whether they are equal or not
    */
   equals(pt: G2Point): boolean {
-    return this.x[0] === pt.x[0] && this.x[1] === pt.x[1] && this.y[0] === pt.y[0] && this.y[1] === pt.y[1];
+    return (
+      this.x[0] === pt.x[0] &&
+      this.x[1] === pt.x[1] &&
+      this.y[0] === pt.y[0] &&
+      this.y[1] === pt.y[1]
+    );
   }
 
   /**
@@ -95,10 +100,10 @@ export class G2Point {
    * @param x the x coordinate
    * @param type the type of the coordinate
    */
-  private checkPointsRange(x: bigint[], type: "x" | "y") {
+  private checkPointsRange(x: bigint[], type: 'x' | 'y') {
     assert(
       x.every((n) => n < SNARK_FIELD_SIZE && n >= 0),
-      `G2Point ${type} out of range`,
+      `G2Point ${type} out of range`
     );
   }
 }
@@ -116,12 +121,16 @@ export const genRandomBabyJubValue = (): bigint => {
   // Prevent modulo bias
   // const lim = BigInt('0x10000000000000000000000000000000000000000000000000000000000000000')
   // const min = (lim - SNARK_FIELD_SIZE) % SNARK_FIELD_SIZE
-  const min = BigInt("6350874878119819312338956282401532410528162663560392320966563075034087161851");
+  const min = BigInt(
+    '6350874878119819312338956282401532410528162663560392320966563075034087161851'
+  );
 
   let privKey: PrivKey = SNARK_FIELD_SIZE;
 
   do {
-    const rand = BigInt(`0x${randomBytes(32).toString("hex")}`);
+    const rand = BigInt(
+      `0x${CryptoJS.lib.WordArray.random(32).toString(CryptoJS.enc.Hex)}`
+    );
 
     if (rand >= min) {
       privKey = rand % SNARK_FIELD_SIZE;

package/src/libs/crypto/keys.ts

@@ -1,4 +1,4 @@
-import { randomBytes } from 'crypto';
+import CryptoJS from 'crypto-js';
 import { bigInt2Buffer, stringizing } from './bigintUtils';
 import { poseidonEncrypt } from '@zk-kit/poseidon-cipher';
 import * as BabyJub from '@zk-kit/baby-jubjub';
@@ -27,7 +27,7 @@ const SNARK_FIELD_SIZE =
  * @returns A random seed for a private key.
  */
 export const genPrivKey = (): bigint =>
-  BigInt(`0x${randomBytes(32).toString('hex')}`);
+  BigInt(`0x${CryptoJS.lib.WordArray.random(32).toString(CryptoJS.enc.Hex)}`);
 
 /**
  * Generate a random value
@@ -116,7 +116,9 @@ export const genMessageFactory =
   ): bigint[] => {
     if (!salt) {
       // uint56
-      salt = BigInt('0x' + randomBytes(7).toString('hex'));
+      salt = BigInt(
+        `0x${CryptoJS.lib.WordArray.random(7).toString(CryptoJS.enc.Hex)}`
+      );
     }
 
     const packaged =
@@ -223,7 +225,7 @@ const rerandomize = (
   } as { d1: bigint[]; d2: bigint[] };
 };
 
-export const genAddKeyProof = async (
+export const genAddKeyInput = (
   depth: number,
   {
     coordPubKey,

package/src/libs/errors/index.ts

@@ -1,5 +1,9 @@
 export class BaseError extends Error {
-  constructor(message: string, public code: number, public type: string) {
+  constructor(
+    message: string,
+    public code: number,
+    public type: string
+  ) {
     super(message);
     this.name = this.constructor.name;
   }