@maci-protocol/coordinator 0.0.0-ci.d969539 → 0.0.0-ci.da13fbb

package/build/ts/proof/proof.service.js

@@ -8,23 +8,21 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 var ProofGeneratorService_1;
-import { Keypair, PrivKey, PubKey } from "@maci-protocol/domainobjs";
-import { Deployment, EContracts, ProofGenerator, Poll__factory as PollFactory, MACI__factory as MACIFactory, Prover, getPoll, mergeSignups, } from "@maci-protocol/sdk";
+import { PublicKey } from "@maci-protocol/domainobjs";
+import { Deployment, EContracts, getPoll, mergeSignups, EMode, } from "@maci-protocol/sdk";
+import { generateProofs, proveOnChain } from "@maci-protocol/sdk";
 import { Logger, Injectable } from "@nestjs/common";
-import { ZeroAddress } from "ethers";
 import hre from "hardhat";
 import fs from "fs";
 import path from "path";
 import { ErrorCodes } from "../common";
-import { getPublicClient } from "../common/accountAbstraction";
-import { CryptoService } from "../crypto/crypto.service";
+import { getCoordinatorKeypair } from "../common/coordinatorKeypair";
 import { FileService } from "../file/file.service";
 import { SessionKeysService } from "../sessionKeys/sessionKeys.service";
 /**
  * ProofGeneratorService is responsible for generating message processing and tally proofs.
  */
 let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorService {
-    cryptoService;
     fileService;
     sessionKeysService;
     /**
@@ -38,8 +36,7 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
     /**
      * Proof generator initialization
      */
-    constructor(cryptoService, fileService, sessionKeysService) {
-        this.cryptoService = cryptoService;
+    constructor(fileService, sessionKeysService) {
         this.fileService = fileService;
         this.sessionKeysService = sessionKeysService;
         this.deployment = Deployment.getInstance({ hre });
@@ -65,13 +62,9 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
      * @param args - generate proofs arguments
      * @returns - generated proofs for message processing and tally
      */
-    async generate({ poll, maciContractAddress, tallyContractAddress, useQuadraticVoting, encryptedCoordinatorPrivateKey, startBlock, endBlock, blocksPerBatch, }, options) {
+    async generate({ approval, sessionKeyAddress, chain, poll, maciContractAddress, mode, startBlock, endBlock, blocksPerBatch, useWasm, }, options) {
         try {
-            const maciContract = await this.deployment.getContract({
-                name: EContracts.MACI,
-                address: maciContractAddress,
-            });
-            const signer = await this.deployment.getDeployer();
+            const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
             const pollData = await getPoll({
                 maciAddress: maciContractAddress,
                 pollId: poll,
@@ -81,58 +74,41 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
                 name: EContracts.Poll,
                 address: pollData.address,
             });
-            const [coordinatorPublicKey, isStateAqMerged] = await Promise.all([
-                pollContract.coordinatorPubKey(),
-                pollContract.stateMerged(),
-            ]);
-            if (!isStateAqMerged) {
-                this.logger.error(`Error: ${ErrorCodes.NOT_MERGED_STATE_TREE}, state tree is not merged`);
-                throw new Error(ErrorCodes.NOT_MERGED_STATE_TREE.toString());
-            }
-            const { privateKey } = await this.fileService.getPrivateKey();
-            const maciPrivateKey = PrivKey.deserialize(this.cryptoService.decrypt(privateKey, encryptedCoordinatorPrivateKey));
-            const coordinatorKeypair = new Keypair(maciPrivateKey);
-            const publicKey = new PubKey([
-                BigInt(coordinatorPublicKey.x.toString()),
-                BigInt(coordinatorPublicKey.y.toString()),
+            const publicKeyOnChain = await pollContract.coordinatorPublicKey();
+            const coordinatorPublicKeyOnChain = new PublicKey([
+                BigInt(publicKeyOnChain.x.toString()),
+                BigInt(publicKeyOnChain.y.toString()),
             ]);
-            if (!coordinatorKeypair.pubKey.equals(publicKey)) {
+            const coordinatorKeypair = getCoordinatorKeypair();
+            if (!coordinatorKeypair.publicKey.equals(coordinatorPublicKeyOnChain)) {
                 this.logger.error(`Error: ${ErrorCodes.PRIVATE_KEY_MISMATCH}, wrong private key`);
                 throw new Error(ErrorCodes.PRIVATE_KEY_MISMATCH.toString());
             }
-            const outputDir = path.resolve("./proofs");
-            const maciState = await ProofGenerator.prepareState({
-                maciContract,
-                pollContract,
-                maciPrivateKey,
-                coordinatorKeypair,
-                pollId: poll,
+            // There are only QV and Non-QV modes available for tally circuit
+            const tally = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, 
+            // if FULL use NON_QV because there are only VoteTallyQV and VoteTallyNonQV zkeys
+            mode === EMode.FULL ? EMode.NON_QV : mode);
+            const messageProcessor = this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, mode);
+            const { processProofs, tallyProofs, tallyData } = await generateProofs({
+                outputDir: path.resolve("./proofs"),
+                coordinatorPrivateKey: coordinatorKeypair.privateKey.serialize(),
                 signer,
-                outputDir,
-                options: {
-                    startBlock,
-                    endBlock,
-                    blocksPerBatch,
-                },
-            });
-            const foundPoll = maciState.polls.get(BigInt(poll));
-            if (!foundPoll) {
-                this.logger.error(`Error: ${ErrorCodes.POLL_NOT_FOUND}, Poll ${poll} not found in maci state`);
-                throw new Error(ErrorCodes.POLL_NOT_FOUND.toString());
-            }
-            const proofGenerator = new ProofGenerator({
-                poll: foundPoll,
-                maciContractAddress,
-                tallyContractAddress,
-                tally: this.fileService.getZkeyFilePaths(process.env.COORDINATOR_TALLY_ZKEY_NAME, useQuadraticVoting),
-                mp: this.fileService.getZkeyFilePaths(process.env.COORDINATOR_MESSAGE_PROCESS_ZKEY_NAME, useQuadraticVoting),
+                maciAddress: maciContractAddress,
+                pollId: BigInt(poll),
+                startBlock,
+                endBlock,
+                blocksPerBatch,
+                useWasm,
                 rapidsnark: process.env.COORDINATOR_RAPIDSNARK_EXE,
-                outputDir,
-                tallyOutputFile: path.resolve("./tally.json"),
-                useQuadraticVoting,
+                mode,
+                voteTallyZkey: tally.zkey,
+                voteTallyWitnessGenerator: tally.witnessGenerator,
+                voteTallyWasm: tally.wasm,
+                messageProcessorZkey: messageProcessor.zkey,
+                messageProcessorWitnessGenerator: messageProcessor.witnessGenerator,
+                messageProcessorWasm: messageProcessor.wasm,
+                tallyFile: path.resolve("./tally.json"),
             });
-            const processProofs = await proofGenerator.generateMpProofs(options);
-            const { proofs: tallyProofs, tallyData } = await proofGenerator.generateTallyProofs(hre.network.name, String(hre.network.config.chainId || 1), options);
             return {
                 processProofs,
                 tallyProofs,
@@ -151,9 +127,7 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
      * @returns whether the proofs were successfully merged
      */
     async merge({ maciContractAddress, pollId, approval, sessionKeyAddress, chain }) {
-        // get a kernel client
-        const kernelClient = await this.sessionKeysService.generateClientFromSessionKey(sessionKeyAddress, approval, chain);
-        const signer = await this.sessionKeysService.getKernelClientSigner(kernelClient);
+        const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
         await mergeSignups({
             maciAddress: maciContractAddress,
             pollId: BigInt(pollId),
@@ -166,80 +140,24 @@ let ProofGeneratorService = ProofGeneratorService_1 = class ProofGeneratorServic
      *
      * @param args - submit proofs on-chain arguments
      */
-    async submit({ maciContractAddress, pollId, chain }) {
-        const publicClient = getPublicClient(chain);
-        // get the poll address
-        const pollContracts = await publicClient.readContract({
-            address: maciContractAddress,
-            abi: MACIFactory.abi,
-            functionName: "getPoll",
-            args: [BigInt(pollId)],
-        });
-        const pollAddress = pollContracts.poll;
-        if (pollAddress.toLowerCase() === ZeroAddress.toLowerCase()) {
-            this.logger.error(`Error: ${ErrorCodes.POLL_NOT_FOUND}, Poll ${pollId} not found`);
-            throw new Error(ErrorCodes.POLL_NOT_FOUND.toString());
-        }
-        // check if state tree has been merged
-        const isStateMerged = await publicClient.readContract({
-            address: pollAddress,
-            abi: PollFactory.abi,
-            functionName: "stateMerged",
+    async submit({ maciContractAddress, pollId, sessionKeyAddress, approval, chain, }) {
+        const signer = await this.sessionKeysService.getCoordinatorSigner(chain, sessionKeyAddress, approval);
+        const tallyData = await proveOnChain({
+            pollId: BigInt(pollId),
+            maciAddress: maciContractAddress,
+            proofDir: "./proofs",
+            tallyFile: "./tally.json",
+            signer,
         });
-        if (!isStateMerged) {
-            this.logger.error(`Error: ${ErrorCodes.NOT_MERGED_STATE_TREE}, state tree is not merged`);
-            throw new Error(ErrorCodes.NOT_MERGED_STATE_TREE.toString());
+        if (!tallyData) {
+            throw new Error("Tally data is undefined");
         }
-        const [maciContract, mpContract, pollContract, tallyContract, vkRegistryContract, verifierContract] = await Promise.all([
-            this.deployment.getContract({
-                name: EContracts.MACI,
-                address: maciContractAddress,
-            }),
-            this.deployment.getContract({
-                name: EContracts.MessageProcessor,
-                address: pollContracts.messageProcessor,
-            }),
-            this.deployment.getContract({
-                name: EContracts.Poll,
-                address: pollContracts.poll,
-            }),
-            this.deployment.getContract({
-                name: EContracts.Tally,
-                address: pollContracts.tally,
-            }),
-            this.deployment.getContract({ name: EContracts.VkRegistry }),
-            this.deployment.getContract({ name: EContracts.Verifier }),
-        ]);
-        const prover = new Prover({
-            maciContract,
-            mpContract,
-            pollContract,
-            tallyContract,
-            vkRegistryContract,
-            verifierContract,
-        });
-        const data = {
-            processProofs: await this.readProofs(path.resolve("./proofs"), "process"),
-            tallyProofs: await this.readProofs(path.resolve("./proofs"), "tally"),
-        };
-        // prove message processing
-        await prover.proveMessageProcessing(data.processProofs);
-        // read tally data
-        const tallyData = await fs.promises
-            .readFile("./tally.json", "utf8")
-            .then((result) => JSON.parse(result));
-        // prove tally
-        await prover.proveTally(data.tallyProofs);
-        // submit results
-        const voteOptions = Number(await pollContract.voteOptions());
-        await prover.submitResults(tallyData, voteOptions);
-        return true;
+        return tallyData;
     }
 };
 ProofGeneratorService = ProofGeneratorService_1 = __decorate([
     Injectable(),
-    __metadata("design:paramtypes", [CryptoService,
-        FileService,
+    __metadata("design:paramtypes", [FileService,
         SessionKeysService])
 ], ProofGeneratorService);
 export { ProofGeneratorService };

package/build/ts/proof/proof.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"proof.service.js","sourceRoot":"","sources":["../../../ts/proof/proof.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"proof.service.js","sourceRoot":"","sources":["../../../ts/proof/proof.service.ts"],"names":[],"mappings":"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"}

package/build/ts/proof/types.d.ts

@@ -1,4 +1,4 @@
-import type { ITallyData, IProof } from "@maci-protocol/sdk";
+import type { ITallyData, IProof, EMode } from "@maci-protocol/sdk";
 import type { Hex } from "viem";
 import { ESupportedNetworks } from "../common";
 /**
@@ -24,6 +24,18 @@ export interface IReadProofsResults {
  * Interface that represents generate proofs arguments
  */
 export interface IGenerateArgs {
+    /**
+     * Approval for the session key
+     */
+    approval?: string;
+    /**
+     * Session key address
+     */
+    sessionKeyAddress?: Hex;
+    /**
+     * Chain
+     */
+    chain: ESupportedNetworks;
     /**
      * Poll id
      */
@@ -32,18 +44,10 @@ export interface IGenerateArgs {
      * Maci contract address
      */
     maciContractAddress: string;
-    /**
-     * Tally contract address
-     */
-    tallyContractAddress: string;
     /**
      * Whether to use Qv or NonQv
      */
-    useQuadraticVoting: boolean;
-    /**
-     * Encrypted coordinator private key with RSA public key (see .env.example)
-     */
-    encryptedCoordinatorPrivateKey: string;
+    mode: EMode;
     /**
      * Start block for event processing
      */
@@ -56,6 +60,7 @@ export interface IGenerateArgs {
      * Blocks per batch for event processing
      */
     blocksPerBatch?: number;
+    useWasm?: boolean;
 }
 /**
  * Interface that represents generated proofs data
@@ -102,11 +107,11 @@ export interface IMergeArgs {
     /**
      * Approval for the session key
      */
-    approval: string;
+    approval?: string;
     /**
      * Session key address
      */
-    sessionKeyAddress: Hex;
+    sessionKeyAddress?: Hex;
     /**
      * Chain
      */
@@ -127,11 +132,11 @@ export interface ISubmitProofsArgs {
     /**
      * Approval for the session key
      */
-    approval: string;
+    approval?: string;
     /**
      * Session key address
      */
-    sessionKeyAddress: Hex;
+    sessionKeyAddress?: Hex;
     /**
      * Chain
      */

package/build/ts/proof/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/proof/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C;;GAEG;AACH,oBAAY,sBAAsB;IAChC,KAAK,qBAAqB;IAC1B,QAAQ,wBAAwB;IAChC,MAAM,sBAAsB;IAC5B,KAAK,cAAc;CACpB;AAKD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,oBAAoB,EAAE,MAAM,CAAC;IAE7B;;OAEG;IACH,kBAAkB,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,8BAA8B,EAAE,MAAM,CAAC;IAEvC;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IAExB;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB;;OAEG;IACH,SAAS,EAAE,UAAU,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,iBAAiB,EAAE,GAAG,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAC5B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,iBAAiB,EAAE,GAAG,CAAC;IACvB;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAAC;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../ts/proof/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAE/C;;GAEG;AACH,oBAAY,sBAAsB;IAChC,KAAK,qBAAqB;IAC1B,QAAQ,wBAAwB;IAChC,MAAM,sBAAsB;IAC5B,KAAK,cAAc;CACpB;AAKD,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,OAAO,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,iBAAiB,CAAC,EAAE,GAAG,CAAC;IAExB;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAAC;IAE1B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,IAAI,EAAE,KAAK,CAAC;IAEZ;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAC;IAKxB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,aAAa;IAC5B;;OAEG;IACH,aAAa,EAAE,MAAM,EAAE,CAAC;IAExB;;OAEG;IACH,WAAW,EAAE,MAAM,EAAE,CAAC;IAEtB;;OAEG;IACH,SAAS,EAAE,UAAU,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,iBAAiB,CAAC,EAAE,GAAG,CAAC;IAExB;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAAC;CAC3B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAiB;IAChC;;OAEG;IACH,mBAAmB,EAAE,MAAM,CAAC;IAE5B;;OAEG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,iBAAiB,CAAC,EAAE,GAAG,CAAC;IAExB;;OAEG;IACH,KAAK,EAAE,kBAAkB,CAAC;CAC3B"}

package/build/ts/sessionKeys/provider/KernelEIP1193Provider.d.ts

@@ -0,0 +1,53 @@
+import { KernelAccountClient } from "@zerodev/sdk";
+import { encodeFunctionData } from "viem";
+import { EventEmitter } from "events";
+import type { EIP1193Parameters, EIP1193RequestFn, Hex } from "viem";
+export declare const SafeCreateCallAbi: readonly [{
+    readonly name: "performCreate";
+    readonly type: "function";
+    readonly stateMutability: "nonpayable";
+    readonly inputs: readonly [{
+        readonly type: "uint256";
+        readonly name: "value";
+    }, {
+        readonly type: "bytes";
+        readonly name: "deploymentData";
+    }];
+    readonly outputs: readonly [{
+        readonly type: "address";
+        readonly name: "newContract";
+    }];
+}, {
+    readonly name: "performCreate2";
+    readonly type: "function";
+    readonly stateMutability: "nonpayable";
+    readonly inputs: readonly [{
+        readonly type: "uint256";
+        readonly name: "value";
+    }, {
+        readonly type: "bytes";
+        readonly name: "deploymentData";
+    }, {
+        readonly type: "bytes32";
+        readonly name: "salt";
+    }];
+    readonly outputs: readonly [{
+        readonly type: "address";
+        readonly name: "newContract";
+    }];
+}];
+type EncodeExecuteDelegateCallArgs = Parameters<typeof encodeFunctionData<typeof SafeCreateCallAbi, "performCreate">>[0]["args"];
+export declare const encodeSafeCreateCall: (args: EncodeExecuteDelegateCallArgs) => Hex;
+export declare class KernelEIP1193Provider extends EventEmitter {
+    private kernelClient;
+    constructor(kernelClient: KernelAccountClient);
+    request({ method, params }: EIP1193Parameters): ReturnType<EIP1193RequestFn>;
+    private handleEthRequestAccounts;
+    private handleEthAccounts;
+    private handleEthSendTransaction;
+    private handleEthSign;
+    private handlePersonalSign;
+    private handleEthSignTypedDataV4;
+}
+export {};
+//# sourceMappingURL=KernelEIP1193Provider.d.ts.map

package/build/ts/sessionKeys/provider/KernelEIP1193Provider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"KernelEIP1193Provider.d.ts","sourceRoot":"","sources":["../../../../ts/sessionKeys/provider/KernelEIP1193Provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAY,MAAM,MAAM,CAAC;AAEpD,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAEtC,OAAO,KAAK,EAAE,iBAAiB,EAAE,gBAAgB,EAAQ,GAAG,EAA8C,MAAM,MAAM,CAAC;AAEvH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAG5B,CAAC;AAEH,KAAK,6BAA6B,GAAG,UAAU,CAC7C,OAAO,kBAAkB,CAAC,OAAO,iBAAiB,EAAE,eAAe,CAAC,CACrE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAEb,eAAO,MAAM,oBAAoB,GAAI,MAAM,6BAA6B,KAAG,GAKvE,CAAC;AAEL,qBAAa,qBAAsB,SAAQ,YAAY;IACrD,OAAO,CAAC,YAAY,CAAsB;gBAE9B,YAAY,EAAE,mBAAmB;IAKvC,OAAO,CAAC,EAAE,MAAM,EAAE,MAAW,EAAE,EAAE,iBAAiB,GAAG,UAAU,CAAC,gBAAgB,CAAC;IAoBvF,OAAO,CAAC,wBAAwB;IAQhC,OAAO,CAAC,iBAAiB;YAQX,wBAAwB;YAexB,aAAa;YAiBb,kBAAkB;YAiBlB,wBAAwB;CA0BvC"}

package/build/ts/sessionKeys/provider/KernelEIP1193Provider.js

@@ -0,0 +1,105 @@
+import { safeCreateCallAddress } from "@zerodev/sdk/constants";
+import { encodeFunctionData, parseAbi } from "viem";
+import { EventEmitter } from "events";
+export const SafeCreateCallAbi = parseAbi([
+    "function performCreate(uint256 value, bytes memory deploymentData) public returns (address newContract)",
+    "function performCreate2(uint256 value, bytes memory deploymentData, bytes32 salt) public returns (address newContract)",
+]);
+export const encodeSafeCreateCall = (args) => encodeFunctionData({
+    abi: SafeCreateCallAbi,
+    functionName: "performCreate",
+    args,
+});
+export class KernelEIP1193Provider extends EventEmitter {
+    kernelClient;
+    constructor(kernelClient) {
+        super();
+        this.kernelClient = kernelClient;
+    }
+    async request({ method, params = [] }) {
+        switch (method) {
+            case "eth_requestAccounts":
+                return this.handleEthRequestAccounts();
+            case "eth_accounts":
+                return this.handleEthAccounts();
+            case "eth_sendTransaction":
+                return this.handleEthSendTransaction(params);
+            case "eth_sign":
+                return this.handleEthSign(params);
+            case "personal_sign":
+                return this.handlePersonalSign(params);
+            case "eth_signTypedData":
+            case "eth_signTypedData_v4":
+                return this.handleEthSignTypedDataV4(params);
+            default:
+                return this.kernelClient.transport.request({ method, params });
+        }
+    }
+    handleEthRequestAccounts() {
+        if (!this.kernelClient.account) {
+            return [];
+        }
+        return [this.kernelClient.account.address];
+    }
+    handleEthAccounts() {
+        if (!this.kernelClient.account) {
+            return [];
+        }
+        return [this.kernelClient.account.address];
+    }
+    async handleEthSendTransaction(params) {
+        const [tx] = params;
+        if (!("to" in tx) && tx.data) {
+            // contract deployment
+            tx.data = encodeSafeCreateCall([0n, tx.data]);
+            tx.to = safeCreateCallAddress;
+            return this.kernelClient.sendTransaction(tx);
+        }
+        // eth transaction (function call or eth transfer)
+        return this.kernelClient.sendTransaction(tx);
+    }
+    async handleEthSign(params) {
+        if (!this.kernelClient.account) {
+            throw new Error("account not connected!");
+        }
+        const [address, message] = params;
+        if (address.toLowerCase() !== this.kernelClient.account.address.toLowerCase()) {
+            throw new Error("cannot sign for address that is not the current account");
+        }
+        return this.kernelClient.signMessage({
+            message,
+            account: this.kernelClient.account,
+        });
+    }
+    async handlePersonalSign(params) {
+        if (!this.kernelClient.account) {
+            throw new Error("account not connected!");
+        }
+        const [message, address] = params;
+        if (address.toLowerCase() !== this.kernelClient.account.address.toLowerCase()) {
+            throw new Error("cannot sign for address that is not the current account");
+        }
+        return this.kernelClient.signMessage({
+            message,
+            account: this.kernelClient.account,
+        });
+    }
+    async handleEthSignTypedDataV4(params) {
+        if (!this.kernelClient.account) {
+            throw new Error("account not connected!");
+        }
+        const [address, typedDataJSON] = params;
+        const typedData = JSON.parse(typedDataJSON);
+        if (address.toLowerCase() !== this.kernelClient.account.address.toLowerCase()) {
+            throw new Error("cannot sign for address that is not the current account");
+        }
+        return this.kernelClient.signTypedData({
+            account: this.kernelClient.account,
+            domain: typedData.domain,
+            types: typedData.types,
+            message: typedData.message,
+            primaryType: typedData.primaryType,
+        });
+    }
+}
+//# sourceMappingURL=KernelEIP1193Provider.js.map

package/build/ts/sessionKeys/provider/KernelEIP1193Provider.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"KernelEIP1193Provider.js","sourceRoot":"","sources":["../../../../ts/sessionKeys/provider/KernelEIP1193Provider.ts"],"names":[],"mappings":"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"}

package/build/ts/sessionKeys/sessionKeys.service.d.ts

@@ -1,4 +1,5 @@
-import { JsonRpcSigner } from "ethers";
+import { Signer } from "ethers";
+import type { AASigner } from "@maci-protocol/contracts";
 import type { Hex } from "viem";
 import { ESupportedNetworks, KernelClientType } from "../common";
 import { FileService } from "../file/file.service";
@@ -39,7 +40,17 @@ export declare class SessionKeysService {
      * @param kernelClient - kernel client
      * @returns signer
      */
-    getKernelClientSigner(kernelClient: KernelClientType): Promise<JsonRpcSigner>;
+    getKernelClientSigner(kernelClient: KernelClientType): Promise<AASigner>;
+    /**
+     * Get a signer that would execute all the contract interactions in the coordinator service.
+     * There are particular cases where the AA signer does not work so we default to the normal signer.
+     * (e.g. `deployPoll`)
+     * @param chain - the chain to use
+     * @param sessionKeyAddress - the address of the session key. Defaults to normal signer if not provided
+     * @param approval - the approval string. Defaults to normal signer if not provided
+     * @returns a signer
+     */
+    getCoordinatorSigner(chain: ESupportedNetworks, sessionKeyAddress?: Hex, approval?: string): Promise<AASigner | Signer>;
     /**
      * Deactivate a session key
      *

package/build/ts/sessionKeys/sessionKeys.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sessionKeys.service.d.ts","sourceRoot":"","sources":["../../../ts/sessionKeys/sessionKeys.service.ts"],"names":[],"mappings":"AAGA,OAAO,EAAmB,aAAa,EAAE,MAAM,QAAQ,CAAC;AAGxD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAc,kBAAkB,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAE7E,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAEpD;;GAEG;AACH,qBACa,kBAAkB;IAWjB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAVxC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC;;;;OAIG;gBAC0B,WAAW,EAAE,WAAW;IAIrD;;;;OAIG;IACG,kBAAkB,IAAI,OAAO,CAAC,yBAAyB,CAAC;IAiB9D;;;;;;;OAOG;IACG,4BAA4B,CAChC,iBAAiB,EAAE,GAAG,EACtB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,gBAAgB,CAAC;IAkB5B;;;;;OAKG;IACG,qBAAqB,CAAC,YAAY,EAAE,gBAAgB,GAAG,OAAO,CAAC,aAAa,CAAC;IAOnF;;;;OAIG;IACH,oBAAoB,CAAC,iBAAiB,EAAE,GAAG,GAAG,IAAI;CAGnD"}
+{"version":3,"file":"sessionKeys.service.d.ts","sourceRoot":"","sources":["../../../ts/sessionKeys/sessionKeys.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAmB,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AAEhC,OAAO,EAAc,kBAAkB,EAAa,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAExF,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAGnD,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAEpD;;GAEG;AACH,qBACa,kBAAkB;IAWjB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAVxC;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAS;IAEhC;;;;OAIG;gBAC0B,WAAW,EAAE,WAAW;IAIrD;;;;OAIG;IACG,kBAAkB,IAAI,OAAO,CAAC,yBAAyB,CAAC;IAiB9D;;;;;;;OAOG;IACG,4BAA4B,CAChC,iBAAiB,EAAE,GAAG,EACtB,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,kBAAkB,GACxB,OAAO,CAAC,gBAAgB,CAAC;IAkB5B;;;;;OAKG;IACG,qBAAqB,CAAC,YAAY,EAAE,gBAAgB,GAAG,OAAO,CAAC,QAAQ,CAAC;IAU9E;;;;;;;;OAQG;IACG,oBAAoB,CACxB,KAAK,EAAE,kBAAkB,EACzB,iBAAiB,CAAC,EAAE,GAAG,EACvB,QAAQ,CAAC,EAAE,MAAM,GAChB,OAAO,CAAC,QAAQ,GAAG,MAAM,CAAC;IAS7B;;;;OAIG;IACH,oBAAoB,CAAC,iBAAiB,EAAE,GAAG,GAAG,IAAI;CAGnD"}

package/build/ts/sessionKeys/sessionKeys.service.js

@@ -10,12 +10,12 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var SessionKeysService_1;
 import { Injectable, Logger } from "@nestjs/common";
 import { toECDSASigner } from "@zerodev/permissions/signers";
-import { KernelEIP1193Provider } from "@zerodev/sdk";
 import { BrowserProvider } from "ethers";
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
-import { ErrorCodes } from "../common";
+import { ErrorCodes, getSigner } from "../common";
 import { getKernelClient } from "../common/accountAbstraction";
 import { FileService } from "../file/file.service";
+import { KernelEIP1193Provider } from "./provider/KernelEIP1193Provider";
 /**
  * SessionKeysService is responsible for generating and managing session keys.
  */
@@ -71,7 +71,7 @@ let SessionKeysService = SessionKeysService_1 = class SessionKeysService {
             return kernelClient;
         }
         catch (error) {
-            this.logger.error(`Error: ${ErrorCodes.INVALID_APPROVAL}`, error);
+            this.logger.error("Error:", error);
             throw new Error(ErrorCodes.INVALID_APPROVAL.toString());
         }
     }
@@ -85,7 +85,25 @@ let SessionKeysService = SessionKeysService_1 = class SessionKeysService {
         const kernelProvider = new KernelEIP1193Provider(kernelClient);
         const ethersProvider = new BrowserProvider(kernelProvider);
         const signer = await ethersProvider.getSigner();
-        return signer;
+        const aaSigner = signer;
+        aaSigner.isAA = true;
+        return aaSigner;
+    }
+    /**
+     * Get a signer that would execute all the contract interactions in the coordinator service.
+     * There are particular cases where the AA signer does not work so we default to the normal signer.
+     * (e.g. `deployPoll`)
+     * @param chain - the chain to use
+     * @param sessionKeyAddress - the address of the session key. Defaults to normal signer if not provided
+     * @param approval - the approval string. Defaults to normal signer if not provided
+     * @returns a signer
+     */
+    async getCoordinatorSigner(chain, sessionKeyAddress, approval) {
+        if (sessionKeyAddress && approval) {
+            const kernelClient = await this.generateClientFromSessionKey(sessionKeyAddress, approval, chain);
+            return this.getKernelClientSigner(kernelClient);
+        }
+        return getSigner(chain);
     }
     /**
      * Deactivate a session key