@dorafactory/maci-sdk 0.0.3 → 0.0.5

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

@@ -10,10 +10,12 @@ export declare class Contract {
     registryAddress: string;
     maciCodeId: number;
     oracleCodeId: number;
-    constructor({ rpcEndpoint, registryAddress, maciCodeId, oracleCodeId, }: ContractParams);
+    feegrantOperator: string;
+    whitelistBackendPubkey: string;
+    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, whitelistBackendPubkey, whitelistEcosystem, whitelistSnapshotHeight, whitelistVotingPowerArgs, feegrantOperator, }: CreateOracleMaciRoundParams): 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>;
     queryRoundInfo({ signer, roundAddress, }: {
         signer: OfflineSigner;
         roundAddress: string;

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

@@ -26,13 +26,11 @@ export type CreateMaciRoundParams = {
 } & CreateRoundParams;
 export type CreateOracleMaciRoundParams = {
     operatorPubkey: string;
-    whitelistEcosystem: string;
+    whitelistEcosystem: 'cosmoshub' | 'doravota';
     whitelistSnapshotHeight: string;
     whitelistVotingPowerArgs: {
-        mode: string;
+        mode: 'slope' | 'threshold';
         slope: string;
         threshold: string;
     };
-    whitelistBackendPubkey?: string;
-    feegrantOperator?: string;
 } & CreateRoundParams;

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

@@ -55,13 +55,4 @@ export declare function getContractParams(type: MaciRoundType, circuitType: Maci
     maciVoteType?: undefined;
     maciCertSystem?: undefined;
 };
-/**
- * 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 parsePubkey(publickKey: string): {
-    x: string;
-    y: string;
-};
 export {};

package/dist/maci.d.ts

@@ -16,11 +16,13 @@ export declare class MaciClient {
     http: Http;
     indexer: Indexer;
     contract: Contract;
+    feegrantOperator: string;
+    whitelistBackendPubkey: string;
     /**
      * @constructor
      * @param {ClientParams} params - The parameters for the Maci Client instance.
      */
-    constructor({ network, rpcEndpoint, restEndpoint, apiEndpoint, registryAddress, maciCodeId, oracleCodeId, customFetch, defaultOptions, }: ClientParams);
+    constructor({ network, rpcEndpoint, restEndpoint, apiEndpoint, registryAddress, maciCodeId, oracleCodeId, customFetch, defaultOptions, feegrantOperator, whitelistBackendPubkey, }: ClientParams);
     oracleMaciClient({ signer, contractAddress, }: {
         signer: OfflineSigner;
         contractAddress: string;

package/dist/types/index.d.ts

@@ -23,12 +23,16 @@ export type ClientParams = {
     oracleCodeId?: number;
     customFetch?: typeof fetch;
     defaultOptions?: FetchOptions;
+    feegrantOperator?: string;
+    whitelistBackendPubkey?: string;
 };
 export type ContractParams = {
     rpcEndpoint: string;
     registryAddress: string;
     maciCodeId: number;
     oracleCodeId: number;
+    whitelistBackendPubkey: string;
+    feegrantOperator: string;
 };
 export type TransactionType = {
     id: string;

package/dist/utils/index.d.ts

@@ -1 +1,17 @@
 export declare function isValidAddress(address: string): boolean;
+/**
+ * Converts a hexadecimal string to a decimal string.
+ * @param hexString - The hexadecimal string to convert.
+ * @returns The decimal string representation of the input.
+ */
+export declare function hexToDecimalString(hexString: string): string;
+/**
+ * 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;

package/package.json

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

package/src/index.ts

@@ -10,3 +10,4 @@ export { Circuit } from './libs/query';
 export { Operator } from './libs/query';
 export { Proof } from './libs/query';
 export { Transaction } from './libs/query';
+export * from './utils';

package/src/libs/contract/contract.ts

@@ -27,9 +27,10 @@ import {
   CreateMaciRoundParams,
   CreateOracleMaciRoundParams,
 } from './types';
-import { getContractParams, parsePubkey } from './utils';
+import { getContractParams } from './utils';
 import { QTR_LIB } from './vars';
 import { MaciRoundType, MaciCertSystemType } from '../../types';
+import { decompressPublicKey } from '../../utils';
 
 export const prefix = 'dora';
 
@@ -38,17 +39,23 @@ export class Contract {
   public registryAddress: string;
   public maciCodeId: number;
   public oracleCodeId: number;
+  public feegrantOperator: string;
+  public whitelistBackendPubkey: string;
 
   constructor({
     rpcEndpoint,
     registryAddress,
     maciCodeId,
     oracleCodeId,
+    feegrantOperator,
+    whitelistBackendPubkey,
   }: ContractParams) {
     this.rpcEndpoint = rpcEndpoint;
     this.registryAddress = registryAddress;
     this.maciCodeId = maciCodeId;
     this.oracleCodeId = oracleCodeId;
+    this.feegrantOperator = feegrantOperator;
+    this.whitelistBackendPubkey = whitelistBackendPubkey;
   }
 
   async createAMaciRound({
@@ -131,7 +138,7 @@ export class Contract {
     const [{ address }] = await signer.getAccounts();
     const client = await createContractClientByWallet(this.rpcEndpoint, signer);
     const { x: operatorPubkeyX, y: operatorPubkeyY } =
-      parsePubkey(operatorPubkey);
+      decompressPublicKey(operatorPubkey);
     const {
       parameters,
       groth16ProcessVkey,
@@ -189,18 +196,16 @@ export class Contract {
     maxVoter,
     maxOption,
     circuitType,
-    whitelistBackendPubkey,
     whitelistEcosystem,
     whitelistSnapshotHeight,
     whitelistVotingPowerArgs,
-    feegrantOperator,
   }: CreateOracleMaciRoundParams) {
     const start_time = (startVoting.getTime() * 1_000_000).toString();
     const end_time = (endVoting.getTime() * 1_000_000).toString();
     const [{ address }] = await signer.getAccounts();
     const client = await createContractClientByWallet(this.rpcEndpoint, signer);
     const { x: operatorPubkeyX, y: operatorPubkeyY } =
-      parsePubkey(operatorPubkey);
+      decompressPublicKey(operatorPubkey);
     const {
       parameters,
       groth16ProcessVkey,
@@ -235,14 +240,14 @@ export class Contract {
         plonk_process_vkey: plonkProcessVkey,
         plonk_tally_vkey: plonkTallyVkey,
         max_vote_options: maxOption,
-        whitelist_backend_pubkey: whitelistBackendPubkey,
+        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: feegrantOperator,
+        feegrant_operator: this.feegrantOperator,
       },
       '[Oracle MACI]' + title,
       'auto'

package/src/libs/contract/types.ts

@@ -30,13 +30,13 @@ export type CreateMaciRoundParams = {
 
 export type CreateOracleMaciRoundParams = {
   operatorPubkey: string;
-  whitelistEcosystem: string;
+  whitelistEcosystem: 'cosmoshub' | 'doravota';
   whitelistSnapshotHeight: string;
   whitelistVotingPowerArgs: {
-    mode: string;
+    mode: 'slope' | 'threshold';
     slope: string;
     threshold: string;
   };
-  whitelistBackendPubkey?: string;
-  feegrantOperator?: string;
+  // whitelistBackendPubkey?: string;
+  // feegrantOperator?: string;
 } & CreateRoundParams;

package/src/libs/contract/utils.ts

@@ -152,28 +152,3 @@ export function getContractParams(
       };
   }
 }
-
-/**
- * Converts a hexadecimal string to a decimal string.
- * @param hexString - The hexadecimal string to convert.
- * @returns The decimal string representation of the input.
- */
-function hexToDecimalString(hexString: string) {
-  const decimalString = BigInt('0x' + hexString).toString(10);
-  return decimalString;
-}
-
-/**
- * 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 parsePubkey(publickKey: string) {
-  const x = publickKey.slice(0, 64);
-  const y = publickKey.slice(64);
-
-  return {
-    x: hexToDecimalString(x),
-    y: hexToDecimalString(y),
-  };
-}

package/src/maci.ts

@@ -36,6 +36,9 @@ export class MaciClient {
   public indexer: Indexer;
   public contract: Contract;
 
+  public feegrantOperator: string;
+  public whitelistBackendPubkey: string;
+
   /**
    * @constructor
    * @param {ClientParams} params - The parameters for the Maci Client instance.
@@ -50,6 +53,8 @@ export class MaciClient {
     oracleCodeId,
     customFetch,
     defaultOptions,
+    feegrantOperator,
+    whitelistBackendPubkey,
   }: ClientParams) {
     const defaultParams = getDefaultParams(network);
 
@@ -59,6 +64,10 @@ export class MaciClient {
     this.registryAddress = registryAddress || defaultParams.registryAddress;
     this.maciCodeId = maciCodeId || defaultParams.maciCodeId;
     this.oracleCodeId = oracleCodeId || defaultParams.oracleCodeId;
+    this.feegrantOperator =
+      feegrantOperator || defaultParams.oracleFeegrantOperator;
+    this.whitelistBackendPubkey =
+      whitelistBackendPubkey || defaultParams.oracleWhitelistBackendPubkey;
 
     this.http = new Http(
       this.apiEndpoint,
@@ -77,6 +86,8 @@ export class MaciClient {
       registryAddress: this.registryAddress,
       maciCodeId: this.maciCodeId,
       oracleCodeId: this.oracleCodeId,
+      feegrantOperator: this.feegrantOperator,
+      whitelistBackendPubkey: this.whitelistBackendPubkey,
     });
   }
 

package/src/types/index.ts

@@ -27,6 +27,8 @@ export type ClientParams = {
   oracleCodeId?: number;
   customFetch?: typeof fetch;
   defaultOptions?: FetchOptions;
+  feegrantOperator?: string;
+  whitelistBackendPubkey?: string;
 };
 
 export type ContractParams = {
@@ -34,6 +36,8 @@ export type ContractParams = {
   registryAddress: string;
   maciCodeId: number;
   oracleCodeId: number;
+  whitelistBackendPubkey: string;
+  feegrantOperator: string;
 };
 
 export type TransactionType = {

package/src/utils/index.ts

@@ -15,30 +15,46 @@ export function isValidAddress(address: string): boolean {
   return address.startsWith('dora') && verifyIsBech32(address) === undefined;
 }
 
-// export async function fetchBaseUrl(url: string) {
-//   const response = await fetch(url);
-//   return response;
-// }
-
-// export async function fetchPages<T>(
-//   query: string,
-//   after: string,
-//   limit: number | null = 10
-// ): Promise<T> {
-//   const isFirstPage = after === 'first';
-//   // after = isFirstPage ? null : after;
-
-//   const response = await fetch(apiEndpoint, {
-//     method: 'POST',
-//     headers: {
-//       'Content-Type': 'application/json',
-//       Accept: 'application/json',
-//     },
-//     body: JSON.stringify({
-//       query,
-//       variables: { limit, after: isFirstPage ? undefined : after },
-//     }),
-//   }).then((res) => res.json());
-
-//   return response;
-// }
+/**
+ * Converts a hexadecimal string to a decimal string.
+ * @param hexString - The hexadecimal string to convert.
+ * @returns The decimal string representation of the input.
+ */
+export function hexToDecimalString(hexString: string) {
+  const decimalString = BigInt('0x' + hexString).toString(10);
+  return decimalString;
+}
+
+function padWithZerosIfNeeded(inputString: string) {
+  if (inputString.length === 64) {
+    return inputString;
+  } else if (inputString.length < 64) {
+    const zerosToAdd = 64 - inputString.length;
+    const zeroPadding = '0'.repeat(zerosToAdd);
+    return zeroPadding + inputString;
+  }
+  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;
+}