@dorafactory/maci-sdk 0.0.41 → 0.0.50

package/README.md

@@ -217,10 +217,12 @@ const voteResponse = await client.maci.vote({
 **Voting Rules:**
 
 MACI supports two voting rules:
+
 1. 1P1V (One Person One Vote): Each voting weight (vc) directly counts as votes
 2. QV (Quadratic Voting): The sum of squares of voting weights (vc) is consumed as total voting power
 
 Vote options format:
+
 ```typescript
 selectedOptions: [
   { idx: number, vc: number }, // idx: option index, vc: voting weight
@@ -229,13 +231,14 @@ selectedOptions: [
 ```
 
 Examples:
+
 ```typescript
 // 1P1V mode example (total voting power: 4)
 const options1p1v = [
   { idx: 0, vc: 2 }, // 2 votes for option 0
   { idx: 1, vc: 1 }, // 1 vote for option 1
   { idx: 4, vc: 1 }, // 1 vote for option 4
-]; 
+];
 // Total voting power consumed = 2 + 1 + 1 = 4
 
 // QV mode example (total voting power: 6)
@@ -248,6 +251,7 @@ const optionsQv = [
 ```
 
 **Important Notes:**
+
 - Option indices (idx) must be unique
 - Voting weights (vc) must be positive integers
 - In QV mode, total voting power consumed is the sum of squares of voting weights

package/dist/index.js

@@ -51,7 +51,7 @@ __export(index_exports, {
   bigInt2Buffer: () => bigInt2Buffer,
   circuits: () => circuits,
   formatPrivKeyForBabyJub: () => formatPrivKeyForBabyJub,
-  genAddKeyProof: () => genAddKeyProof,
+  genAddKeyInput: () => genAddKeyInput,
   genEcdhSharedKey: () => genEcdhSharedKey,
   genKeypair: () => genKeypair,
   genKeypairFromSign: () => genKeypairFromSign,
@@ -534,7 +534,7 @@ var Circuit = class {
 var import_bech32 = require("bech32");
 
 // src/libs/crypto/keys.ts
-var import_crypto2 = require("crypto");
+var import_crypto_js2 = __toESM(require("crypto-js"));
 
 // src/libs/crypto/bigintUtils.ts
 var stringizing = (o, path = []) => {
@@ -572,7 +572,7 @@ var import_eddsa_poseidon2 = require("@zk-kit/eddsa-poseidon");
 
 // src/libs/crypto/babyjub.ts
 var import_assert2 = __toESM(require("assert"));
-var import_crypto = require("crypto");
+var import_crypto_js = __toESM(require("crypto-js"));
 
 // src/libs/crypto/constants.ts
 var import_baby_jubjub = require("@zk-kit/baby-jubjub");
@@ -664,10 +664,14 @@ var G2Point = class {
   }
 };
 var genRandomBabyJubValue = () => {
-  const min = BigInt("6350874878119819312338956282401532410528162663560392320966563075034087161851");
+  const min = BigInt(
+    "6350874878119819312338956282401532410528162663560392320966563075034087161851"
+  );
   let privKey = SNARK_FIELD_SIZE;
   do {
-    const rand = BigInt(`0x${(0, import_crypto.randomBytes)(32).toString("hex")}`);
+    const rand = BigInt(
+      `0x${import_crypto_js.default.lib.WordArray.random(32).toString(import_crypto_js.default.enc.Hex)}`
+    );
     if (rand >= min) {
       privKey = rand % SNARK_FIELD_SIZE;
     }
@@ -896,7 +900,7 @@ var tree_default = Tree;
 
 // src/libs/crypto/keys.ts
 var SNARK_FIELD_SIZE2 = 21888242871839275222246405745257275088548364400416034343698204186575808495617n;
-var genPrivKey = () => BigInt(`0x${(0, import_crypto2.randomBytes)(32).toString("hex")}`);
+var genPrivKey = () => BigInt(`0x${import_crypto_js2.default.lib.WordArray.random(32).toString(import_crypto_js2.default.enc.Hex)}`);
 var genRandomSalt = () => genRandomBabyJubValue();
 var formatPrivKeyForBabyJub = (privKey) => BigInt((0, import_eddsa_poseidon.deriveSecretScalar)(bigInt2Buffer(privKey)));
 var packPubKey = (pubKey) => BigInt((0, import_eddsa_poseidon2.packPublicKey)(pubKey));
@@ -918,7 +922,9 @@ var genKeypair = (pkey) => {
 var genEcdhSharedKey = (privKey, pubKey) => (0, import_baby_jubjub2.mulPointEscalar)(pubKey, formatPrivKeyForBabyJub(privKey));
 var genMessageFactory = (stateIdx, signPriKey, signPubKey, coordPubKey) => (encPriKey, nonce, voIdx, newVotes, isLastCmd, salt) => {
   if (!salt) {
-    salt = BigInt("0x" + (0, import_crypto2.randomBytes)(7).toString("hex"));
+    salt = BigInt(
+      `0x${import_crypto_js2.default.lib.WordArray.random(7).toString(import_crypto_js2.default.enc.Hex)}`
+    );
   }
   const packaged = BigInt(nonce) + (BigInt(stateIdx) << 32n) + (BigInt(voIdx) << 64n) + (BigInt(newVotes) << 96n) + (BigInt(salt) << 192n);
   let newPubKey = [...signPubKey];
@@ -989,7 +995,7 @@ var rerandomize = (pubKey, ciphertext, randomVal = genRandomSalt()) => {
     d2
   };
 };
-var genAddKeyProof = async (depth, {
+var genAddKeyInput = (depth, {
   coordPubKey,
   oldKey,
   deactivates
@@ -5215,31 +5221,39 @@ var MACI = class {
     signer,
     address,
     contractAddress,
-    certificate,
-    mode = "maci"
+    certificate
   }) {
     if (!address) {
       address = (await signer.getAccounts())[0].address;
     }
-    if (mode === "amaci") {
+    const round = await this.indexer.getRoundWithFields(contractAddress, [
+      "maciType",
+      "voiceCreditAmount"
+    ]);
+    if (isErrorResponse(round)) {
+      throw new Error(
+        `Failed to get round info: ${round.error.type} ${round.error.message}`
+      );
+    }
+    if (round.data.round.maciType === "aMACI") {
       const isWhiteListed = await this.isWhitelisted({
         signer,
         address,
         contractAddress
       });
       if (isWhiteListed) {
-        const round = await this.indexer.getRoundWithFields(contractAddress, [
+        const round2 = await this.indexer.getRoundWithFields(contractAddress, [
           "voiceCreditAmount"
         ]);
-        if (!isErrorResponse(round)) {
-          if (round.data.round.voiceCreditAmount) {
-            return round.data.round.voiceCreditAmount;
+        if (!isErrorResponse(round2)) {
+          if (round2.data.round.voiceCreditAmount) {
+            return round2.data.round.voiceCreditAmount;
           } else {
             return "0";
           }
         } else {
           throw new Error(
-            `Failed to query amaci voice credit: ${round.error.type} ${round.error.message}`
+            `Failed to query amaci voice credit: ${round2.error.type} ${round2.error.message}`
           );
         }
       } else {
@@ -5499,11 +5513,47 @@ var MACI = class {
       throw new Error("State index is not set, Please signup first");
     }
     try {
-      const voiceCreditBalance = await this.getVoiceCreditBalance({
-        signer,
-        stateIdx,
-        contractAddress
-      });
+      const round = await this.indexer.getRoundWithFields(contractAddress, [
+        "maciType",
+        "voiceCreditAmount"
+      ]);
+      if (isErrorResponse(round)) {
+        throw new Error(
+          `Failed to get round info: ${round.error.type} ${round.error.message}`
+        );
+      }
+      let voiceCreditBalance;
+      if (round.data.round.maciType === "aMACI") {
+        const isWhiteListed = await this.isWhitelisted({
+          signer,
+          address,
+          contractAddress
+        });
+        if (isWhiteListed) {
+          const round2 = await this.indexer.getRoundWithFields(contractAddress, [
+            "voiceCreditAmount"
+          ]);
+          if (!isErrorResponse(round2)) {
+            if (round2.data.round.voiceCreditAmount) {
+              voiceCreditBalance = round2.data.round.voiceCreditAmount;
+            } else {
+              voiceCreditBalance = "0";
+            }
+          } else {
+            throw new Error(
+              `Failed to query amaci voice credit: ${round2.error.type} ${round2.error.message}`
+            );
+          }
+        } else {
+          voiceCreditBalance = "0";
+        }
+      } else {
+        voiceCreditBalance = await this.getVoiceCreditBalance({
+          signer,
+          stateIdx,
+          contractAddress
+        });
+      }
       const options = await this.processVoteOptions({
         selectedOptions,
         contractAddress,
@@ -5636,28 +5686,6 @@ var MACI = class {
   }) {
     const gasPrice = import_stargate2.GasPrice.fromString("100000000000peaka");
     fee = fee || (0, import_stargate2.calculateFee)(6e7, gasPrice);
-    if (gasStation === true) {
-      const grantFee = {
-        amount: fee.amount,
-        gas: fee.gas,
-        granter: contractAddress
-      };
-      return client.execute(
-        address,
-        contractAddress,
-        {
-          sign_up: {
-            pubkey: {
-              x: pubKey[0].toString(),
-              y: pubKey[1].toString()
-            },
-            amount: oracleCertificate.amount,
-            certificate: oracleCertificate.signature
-          }
-        },
-        grantFee
-      );
-    }
     return client.execute(
       address,
       contractAddress,
@@ -5671,74 +5699,73 @@ var MACI = class {
           certificate: oracleCertificate.signature
         }
       },
-      fee
+      gasStation === true ? {
+        amount: fee.amount,
+        gas: fee.gas,
+        granter: contractAddress
+      } : fee
     );
   }
-  // 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 deactivate({
+    signer,
+    address,
+    maciKeypair,
+    contractAddress,
+    gasStation,
+    fee
+  }) {
+    try {
+      address = address || (await signer.getAccounts())[0].address;
+      if (maciKeypair === void 0) {
+        maciKeypair = this.maciKeypair;
+      }
+      const client = await this.contract.contractClient({
+        signer
+      });
+      const stateIdx = await this.getStateIdxInc({
+        signer,
+        address,
+        contractAddress
+      });
+      const operatorCoordPubKey = await this.getRoundInfo({
+        contractAddress
+      });
+      const payload = batchGenMessage(
+        Number(stateIdx),
+        maciKeypair,
+        [
+          BigInt(operatorCoordPubKey.coordinatorPubkeyX),
+          BigInt(operatorCoordPubKey.coordinatorPubkeyY)
+        ],
+        [[0, 0]]
+      );
+      const { msg, encPubkeys } = payload[0];
+      const gasPrice = import_stargate2.GasPrice.fromString("100000000000peaka");
+      fee = fee || (0, import_stargate2.calculateFee)(2e7, 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
   }) {
@@ -5749,7 +5776,8 @@ var MACI = class {
   //   signer,
   //   client,
   //   address,
-  //   maciAccount,
+  //   maciKeypair,
+  //   newMaciKeypair,
   //   contractAddress,
   //   gasStation,
   //   fee,
@@ -5757,7 +5785,8 @@ var MACI = class {
   //   signer: OfflineSigner;
   //   client: SigningCosmWasmClient;
   //   address?: string;
-  //   maciAccount: Keypair;
+  //   maciKeypair: Keypair;
+  //   newMaciKeypair: Keypair;
   //   contractAddress: string;
   //   gasStation: boolean;
   //   fee?: StdFee;
@@ -5773,9 +5802,32 @@ var MACI = class {
   //       BigInt(roundInfo.coordinatorPubkeyX),
   //       BigInt(roundInfo.coordinatorPubkeyY),
   //     ],
-  //     oldKey: maciAccount,
+  //     oldKey: maciKeypair,
   //     deactivates: deactivates.map((d: any) => d.map(BigInt)),
   //   });
+  //   if (!inputObj) {
+  //     throw new Error('Failed to generate add key proof');
+  //   }
+  //   const amaciClient = await this.contract.amaciClient({
+  //     signer,
+  //     contractAddress,
+  //   });
+  //   const d = [
+  //     inputObj.c1[0].toString(),
+  //     inputObj.c1[1].toString(),
+  //     inputObj.c2[0].toString(),
+  //     inputObj.c2[1].toString(),
+  //   ];
+  //   const result = await amaciClient.addNewKey({
+  //     d: d,
+  //     groth16Proof: inputObj.proof,
+  //     nullifier: inputObj.nullifier.toString(),
+  //     pubkey: {
+  //       x: newMaciKeypair.pubKey[0].toString(),
+  //       y: newMaciKeypair.pubKey[1].toString(),
+  //     },
+  //   });
+  //   return result;
   // }
   async claimAMaciRound({
     signer,
@@ -6094,7 +6146,7 @@ var MaciClient2 = class {
   }) {
     return await this.maci.getStateIdxByPubKey({
       contractAddress,
-      pubKey
+      pubKey: pubKey || this.maciKeypair.pubKey
     });
   }
   async feegrantAllowance({
@@ -6123,8 +6175,7 @@ var MaciClient2 = class {
     signer,
     address,
     contractAddress,
-    certificate,
-    mode = "maci"
+    certificate
   }) {
     signer = this.getSigner(signer);
     if (!address) {
@@ -6134,8 +6185,7 @@ var MaciClient2 = class {
       signer,
       address,
       contractAddress,
-      certificate,
-      mode
+      certificate
     });
   }
   async isWhitelisted({
@@ -6252,6 +6302,23 @@ var MaciClient2 = class {
       gasStation
     });
   }
+  async deactivate({
+    signer,
+    address,
+    contractAddress,
+    gasStation = false,
+    maciKeypair,
+    fee
+  }) {
+    return await this.maci.deactivate({
+      signer: this.getSigner(signer),
+      address,
+      maciKeypair,
+      contractAddress,
+      gasStation,
+      fee
+    });
+  }
   async claimAMaciRound({
     signer,
     contractAddress,
@@ -6324,7 +6391,7 @@ var MaciClient2 = class {
   bigInt2Buffer,
   circuits,
   formatPrivKeyForBabyJub,
-  genAddKeyProof,
+  genAddKeyInput,
   genEcdhSharedKey,
   genKeypair,
   genKeypairFromSign,