@dorafactory/maci-sdk 0.0.9 → 0.0.10

package/dist/libs/contract/contract.d.ts

@@ -16,7 +16,7 @@ export declare class Contract {
     constructor({ rpcEndpoint, registryAddress, maciCodeId, oracleCodeId, feegrantOperator, whitelistBackendPubkey, }: ContractParams);
     createAMaciRound({ signer, startVoting, endVoting, operator, whitelist, title, description, link, maxVoter, maxOption, voiceCreditAmount, circuitType, preDeactivateRoot, }: CreateAMaciRoundParams): Promise<string>;
     createMaciRound({ signer, operatorPubkey, startVoting, endVoting, whitelist, title, description, link, maxVoter, maxOption, circuitType, certSystemType, }: CreateMaciRoundParams): Promise<import("@cosmjs/cosmwasm-stargate").InstantiateResult>;
-    createOracleMaciRound({ signer, operatorPubkey, startVoting, endVoting, title, description, link, maxVoter, maxOption, circuitType, whitelistEcosystem, whitelistSnapshotHeight, whitelistVotingPowerArgs, }: CreateOracleMaciRoundParams): Promise<import("@cosmjs/cosmwasm-stargate").InstantiateResult>;
+    createOracleMaciRound({ signer, operatorPubkey, startVoting, endVoting, title, description, link, voteOptionMap, circuitType, whitelistEcosystem, whitelistSnapshotHeight, whitelistVotingPowerArgs, }: CreateOracleMaciRoundParams): Promise<import("@cosmjs/cosmwasm-stargate").InstantiateResult>;
     queryRoundInfo({ signer, roundAddress, }: {
         signer: OfflineSigner;
         roundAddress: string;

package/dist/libs/contract/types.d.ts

@@ -9,22 +9,25 @@ export type CreateRoundParams = {
     link?: string;
     startVoting: Date;
     endVoting: Date;
-    maxVoter: string;
-    maxOption: string;
     circuitType: MaciCircuitType;
 };
 export type CreateAMaciRoundParams = {
+    maxVoter: string;
+    maxOption: string;
     operator: string;
     whitelist: RegistryWhitelist;
     voiceCreditAmount: string;
     preDeactivateRoot?: string;
 } & CreateRoundParams;
 export type CreateMaciRoundParams = {
+    maxVoter: string;
+    maxOption: string;
     operatorPubkey: string;
     whitelist: MaciWhitelist;
     certSystemType: MaciCertSystemType;
 } & CreateRoundParams;
 export type CreateOracleMaciRoundParams = {
+    voteOptionMap: string[];
     operatorPubkey: string;
     whitelistEcosystem: CertificateEcosystem;
     whitelistSnapshotHeight: string;

package/dist/libs/contract/utils.d.ts

@@ -3,6 +3,7 @@ type MixedData<T> = T | Array<MixedData<T>> | {
     [key: string]: MixedData<T>;
 };
 export declare const stringizing: (o: MixedData<bigint>, path?: MixedData<bigint>[]) => MixedData<string>;
+export declare function getCircuitType(circuitType: MaciCircuitType): string;
 export declare function getContractParams(type: MaciRoundType, circuitType: MaciCircuitType, proofSystem: MaciCertSystemType, maxVoter: string, maxOption: string): {
     parameters: {
         state_tree_depth: string;

package/package.json

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

package/src/libs/const.ts

@@ -171,7 +171,7 @@ export function getDefaultParams(
         registryAddress:
           'dora1smg5qp5trjdkcekdjssqpjehdjf6n4cjss0clyvqcud3t3u3948s8rmgg4',
         maciCodeId: 106,
-        oracleCodeId: 111,
+        oracleCodeId: 116,
         oracleWhitelistBackendPubkey:
           'A61YtCv2ibMZmDeM02nEElil8wlHx1tLKogBk5dPgf/Q',
         oracleFeegrantOperator: 'dora16s9tljk8dy9ae335yvyzlm8gvkypx9228q8pq8',
@@ -188,7 +188,7 @@ export function getDefaultParams(
         registryAddress:
           'dora13c8aecstyxrhax9znvvh5zey89edrmd2k5va57pxvpe3fxtfsfeqlhsjnd',
         maciCodeId: 107,
-        oracleCodeId: 110,
+        oracleCodeId: 113,
         oracleWhitelistBackendPubkey:
           'AoYo/zENN/JquagPdG0/NMbWBBYxOM8BVN677mBXJKJQ',
         oracleFeegrantOperator: 'dora1xp0twdzsdeq4qg3c64v66552deax8zmvq4zw78',

package/src/libs/contract/contract.ts

@@ -27,7 +27,7 @@ import {
   CreateMaciRoundParams,
   CreateOracleMaciRoundParams,
 } from './types';
-import { getContractParams } from './utils';
+import { getCircuitType, getContractParams } from './utils';
 import { QTR_LIB } from './vars';
 import { MaciRoundType, MaciCertSystemType } from '../../types';
 import { decompressPublicKey } from '../../utils';
@@ -192,8 +192,7 @@ export class Contract {
     title,
     description,
     link,
-    maxVoter,
-    maxOption,
+    voteOptionMap,
     circuitType,
     whitelistEcosystem,
     whitelistSnapshotHeight,
@@ -205,20 +204,12 @@ export class Contract {
     const client = await createContractClientByWallet(this.rpcEndpoint, signer);
     const { x: operatorPubkeyX, y: operatorPubkeyY } =
       decompressPublicKey(operatorPubkey);
-    const {
-      parameters,
-      groth16ProcessVkey,
-      groth16TallyVkey,
-      plonkProcessVkey,
-      plonkTallyVkey,
-      maciVoteType,
-      maciCertSystem,
-    } = getContractParams(
+    const { maciVoteType, maciCertSystem } = getContractParams(
       MaciRoundType.ORACLE_MACI,
       circuitType,
       MaciCertSystemType.GROTH16,
-      maxVoter,
-      maxOption
+      '0',
+      '0'
     );
     const instantiateResponse = await client.instantiate(
       address,
@@ -229,23 +220,17 @@ export class Contract {
           start_time,
           end_time,
         },
-        parameters,
         coordinator: {
           x: operatorPubkeyX,
           y: operatorPubkeyY,
         },
-        groth16_process_vkey: groth16ProcessVkey,
-        groth16_tally_vkey: groth16TallyVkey,
-        plonk_process_vkey: plonkProcessVkey,
-        plonk_tally_vkey: plonkTallyVkey,
-        max_vote_options: maxOption,
+        vote_option_map: voteOptionMap,
         whitelist_backend_pubkey: this.whitelistBackendPubkey,
         whitelist_ecosystem: whitelistEcosystem,
         whitelist_snapshot_height: whitelistSnapshotHeight,
         whitelist_voting_power_args: whitelistVotingPowerArgs,
         circuit_type: maciVoteType,
         certification_system: maciCertSystem,
-        qtr_lib: QTR_LIB,
         feegrant_operator: this.feegrantOperator,
       },
       `[Oracle MACI] ${title}`,

package/src/libs/contract/types.ts

@@ -14,12 +14,12 @@ export type CreateRoundParams = {
   link?: string;
   startVoting: Date;
   endVoting: Date;
-  maxVoter: string;
-  maxOption: string;
   circuitType: MaciCircuitType;
 };
 
 export type CreateAMaciRoundParams = {
+  maxVoter: string;
+  maxOption: string;
   operator: string;
   whitelist: RegistryWhitelist;
   voiceCreditAmount: string;
@@ -27,12 +27,15 @@ export type CreateAMaciRoundParams = {
 } & CreateRoundParams;
 
 export type CreateMaciRoundParams = {
+  maxVoter: string;
+  maxOption: string;
   operatorPubkey: string;
   whitelist: MaciWhitelist;
   certSystemType: MaciCertSystemType;
 } & CreateRoundParams;
 
 export type CreateOracleMaciRoundParams = {
+  voteOptionMap: string[];
   operatorPubkey: string;
   whitelistEcosystem: CertificateEcosystem;
   whitelistSnapshotHeight: string;

package/src/libs/contract/utils.ts

@@ -29,6 +29,23 @@ export const stringizing = (
   }
 };
 
+export function getCircuitType(circuitType: MaciCircuitType) {
+  let maciVoteType = null;
+  switch (circuitType) {
+    case MaciCircuitType.IP1V:
+      maciVoteType = '0';
+      break;
+    case MaciCircuitType.QV:
+      maciVoteType = '1';
+      break;
+    default:
+      throw new Error(
+        `Invalid circuit type ${circuitType}, only support 1P1V and QV`
+      );
+  }
+  return maciVoteType;
+}
+
 export function getContractParams(
   type: MaciRoundType,
   circuitType: MaciCircuitType,