fix: export typechain instead of contract (#1590)

privacy-scaling-explorations · Jun 21, 2024 · 4e792c4 · 4e792c4
1 parent 149df59
commit 4e792c4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/cli/ts/commands/mergeMessages.ts b/cli/ts/commands/mergeMessages.ts
@@ -2,7 +2,7 @@ import {
   MACI__factory as MACIFactory,
   Poll__factory as PollFactory,
   AccQueue__factory as AccQueueFactory,
-} from "maci-contracts";
+} from "maci-contracts/typechain-types";
 
 import {
   DEFAULT_SR_QUEUE_OPS,

diff --git a/cli/ts/commands/mergeSignups.ts b/cli/ts/commands/mergeSignups.ts
@@ -1,4 +1,4 @@
-import { MACI__factory as MACIFactory, Poll__factory as PollFactory } from "maci-contracts";
+import { MACI__factory as MACIFactory, Poll__factory as PollFactory } from "maci-contracts/typechain-types";
 
 import {
   banner,

diff --git a/cli/ts/commands/proveOnChain.ts b/cli/ts/commands/proveOnChain.ts
@@ -1,5 +1,6 @@
 /* eslint-disable no-await-in-loop */
 import { type BigNumberish } from "ethers";
+import { type IVerifyingKeyStruct, formatProofForVerifierContract } from "maci-contracts";
 import {
   MACI__factory as MACIFactory,
   AccQueue__factory as AccQueueFactory,
@@ -8,9 +9,7 @@ import {
   Poll__factory as PollFactory,
   VkRegistry__factory as VkRegistryFactory,
   Verifier__factory as VerifierFactory,
-  formatProofForVerifierContract,
-  type IVerifyingKeyStruct,
-} from "maci-contracts";
+} from "maci-contracts/typechain-types";
 import { MESSAGE_TREE_ARITY, STATE_TREE_ARITY } from "maci-core";
 import { G1Point, G2Point, hashLeftRight } from "maci-crypto";
 import { VerifyingKey } from "maci-domainobjs";
@@ -158,7 +157,7 @@ export const proveOnChain = async ({
     logRed(
       quiet,
       error(
-        `The proof files inside ${proofDir} do not have the correct number of message processign proofs` +
+        `The proof files inside ${proofDir} do not have the correct number of message processing proofs` +
           `(expected ${totalMessageBatches}, got ${numProcessProofs}).`,
       ),
     );

diff --git a/cli/ts/commands/setVerifyingKeys.ts b/cli/ts/commands/setVerifyingKeys.ts
@@ -1,5 +1,6 @@
 import { extractVk } from "maci-circuits";
-import { type IVerifyingKeyStruct, VkRegistry__factory as VkRegistryFactory, EMode } from "maci-contracts";
+import { type IVerifyingKeyStruct, EMode } from "maci-contracts";
+import { VkRegistry__factory as VkRegistryFactory } from "maci-contracts/typechain-types";
 import { genProcessVkSig, genTallyVkSig, MESSAGE_TREE_ARITY } from "maci-core";
 import { VerifyingKey } from "maci-domainobjs";