From 18bca6991251f6464eb433b2c80e89d0f8f750c0 Mon Sep 17 00:00:00 2001 From: ctrlc03 <93448202+ctrlc03@users.noreply.github.com> Date: Sat, 24 Aug 2024 11:24:45 +0100 Subject: [PATCH] fix: ensure prove task works --- .github/workflows/hardhat-tasks.yml | 3 +-- packages/contracts/deploy-config-example.json | 4 ++-- packages/contracts/tasks/helpers/Prover.ts | 7 +++---- packages/contracts/tasks/runner/prove.ts | 2 +- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/hardhat-tasks.yml b/.github/workflows/hardhat-tasks.yml index 67cffc4999..81bf928ce3 100644 --- a/.github/workflows/hardhat-tasks.yml +++ b/.github/workflows/hardhat-tasks.yml @@ -42,8 +42,7 @@ jobs: - name: hardhat tasks run: | cp ./deploy-config-example.json ./deploy-config.json - pnpm deploy:localhost - pnpm deploy-poll:localhost + bash ./testScriptLocalhost.sh working-directory: packages/contracts - name: Stop Hardhat diff --git a/packages/contracts/deploy-config-example.json b/packages/contracts/deploy-config-example.json index 056e770045..f0e55cc9ee 100644 --- a/packages/contracts/deploy-config-example.json +++ b/packages/contracts/deploy-config-example.json @@ -303,8 +303,8 @@ } }, "Poll": { - "pollDuration": 3600, - "coordinatorPubkey": "macipk.9a59264310d95cfd8eb7083aebeba221b5c26e77427f12b7c0f50bc1cc35e621", + "pollDuration": 30, + "coordinatorPubkey": "macipk.29add77d27341c4cdfc2fb623175ecfd6527a286e3e7ded785d9fd7afbbdf399", "useQuadraticVoting": false } }, diff --git a/packages/contracts/tasks/helpers/Prover.ts b/packages/contracts/tasks/helpers/Prover.ts index 99db75d1ca..0d634a469e 100644 --- a/packages/contracts/tasks/helpers/Prover.ts +++ b/packages/contracts/tasks/helpers/Prover.ts @@ -176,12 +176,11 @@ export class Prover { onChainProcessVk.ic.map(([x, y]) => new G1Point(x, y)), ); - // verify the proof onchain using the verifier contract - + // verify the proof on chain using the verifier contract const isValidOnChain = await this.verifierContract.verify( formattedProof, vk.asContractParam() as IVerifyingKeyStruct, - publicInputsOnChain, + [...publicInputsOnChain], ); if (!isValidOnChain) { @@ -286,7 +285,7 @@ export class Prover { const isValidOnChain = await this.verifierContract.verify( formattedProof, vk.asContractParam() as IVerifyingKeyStruct, - publicInputsOnChain, + [...publicInputsOnChain], ); if (!isValidOnChain) { diff --git a/packages/contracts/tasks/runner/prove.ts b/packages/contracts/tasks/runner/prove.ts index f26940be00..afaa141dd3 100644 --- a/packages/contracts/tasks/runner/prove.ts +++ b/packages/contracts/tasks/runner/prove.ts @@ -128,7 +128,7 @@ task("prove", "Command to generate proof and prove the result of a poll on-chain } const mpContract = await deployment.getContract({ - name: EContracts.Poll, + name: EContracts.MessageProcessor, address: pollContracts.messageProcessor, });