From 8488952ee24ef118accac92f3d18d3858728623e Mon Sep 17 00:00:00 2001 From: braveocheretovych Date: Wed, 11 Dec 2024 11:31:51 +0200 Subject: [PATCH 1/3] chore: fix 404 status URL (#1963) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 79dd190831..7ebd16c853 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ The base branch of the project is `dev`, which is used for ongoing development. This project uses tags for releases. [View all MACI releases](https://github.com/privacy-scaling-explorations/maci/releases). -To contribute to MACI, create feature/fix branches, then open PRs into `dev`. [Learn more about contributing](https://maci.pse.dev/docs/contributing). +To contribute to MACI, create feature/fix branches, then open PRs into `dev`. [Learn more about contributing](https://maci.pse.dev/docs/guides/compile-circuits#installation). ### Local development @@ -60,7 +60,7 @@ own unit tests. ### Testing -Please refer to the [testing documentation](https://maci.pse.dev/docs/testing) for more information. +Please refer to the [testing documentation](https://maci.pse.dev/docs/guides/testing/testing-in-detail) for more information. ### CI pipeline From f18060169350dc8f5a640b9f3d9e69864c6a9d41 Mon Sep 17 00:00:00 2001 From: Crisgarner Date: Wed, 11 Dec 2024 10:46:23 -0600 Subject: [PATCH 2/3] docs(subgraph-docs): added alchemy to subgraph docs (#1964) Co-authored-by: Crisgarner <@crisgarner> --- .../version-v2.x/guides/subgraph.md | 28 +++++++++++++++++-- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/apps/website/versioned_docs/version-v2.x/guides/subgraph.md b/apps/website/versioned_docs/version-v2.x/guides/subgraph.md index 35281743c8..863457c36e 100644 --- a/apps/website/versioned_docs/version-v2.x/guides/subgraph.md +++ b/apps/website/versioned_docs/version-v2.x/guides/subgraph.md @@ -7,10 +7,10 @@ sidebar_position: 1 # Subgraph Deployment -In some instances like a frontend you might need to deploy a subgraph, in the MACI repository you can find the configuration to deploy a subgraph on The Graph Network. +In some instances like a frontend you might need to deploy a subgraph, in the MACI repository you can find the configuration to deploy a subgraph on The Graph Network or Alchemy Subgraphs. :::important -MACI subgraphs can be deployed in Alchemy and The Graph network, this guide focuses on deploying on The Graph. +While the free plan of The Graph and Alchemy can work well, it's recommended to use a paid plan for production. ::: ## Configuration @@ -37,7 +37,7 @@ See the supported networks of The Graph **[here](https://thegraph.com/docs/en/de Create a subgraph in [the graph studio](https://thegraph.com/studio/) and name it `maci-subgraph`. -## Deployment +## The Graph Deployment The first thing you need to do is to copy the `key` in subgraph studio dashboard and run the following command to authenticate: @@ -55,3 +55,25 @@ pnpm run deploy :::important The `pnpm run deploy` command uses `maci-subgraph` as the subgraph name by default, but if you named your subgraph differently (e.g. maci-graph, my-graph, etc.), please change the command to `graph deploy --node https://api.studio.thegraph.com/deploy/ your_subgraph_name` ::: + +## Alchemy Deployment + +Deploying to the Alchemy subgraph service requires some changes to the `subgraph.template.yaml` file located in the `templates` folder. You need to remove the following keys: + +```yaml +indexerHints: + prune: auto +``` + +Now you can run the deploy command with some minor changes: + +```bash +graph deploy SUBGRAPH_NAME \ + --version-label VERSION \ + --node https://subgraphs.alchemy.com/api/subgraphs/deploy \ + --deploy-key API_KEY +``` + +:::note +In order to get a subgraph deploy key for alchemy, head to the subgraph dashboard section and select `add subgraph` and pick `Deploy a New Subgraph` here you will see the deploy key. +::: From 6d7ea862745aff58c6068e56ba3417e7968fef46 Mon Sep 17 00:00:00 2001 From: Anton <14254374+0xmad@users.noreply.github.com> Date: Wed, 11 Dec 2024 12:08:33 -0600 Subject: [PATCH 3/3] fix(contracts): use correct param for poll contract verification --- packages/contracts/tasks/deploy/poll/01-poll.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/contracts/tasks/deploy/poll/01-poll.ts b/packages/contracts/tasks/deploy/poll/01-poll.ts index 905e4a6b48..4a6459019a 100644 --- a/packages/contracts/tasks/deploy/poll/01-poll.ts +++ b/packages/contracts/tasks/deploy/poll/01-poll.ts @@ -100,9 +100,7 @@ deployment.deployTask(EDeploySteps.Poll, "Deploy poll").then((task) => intStateTreeDepth, voteOptionTreeDepth, }, - { - messageBatchSize, - }, + messageBatchSize, unserializedKey.asContractParam(), extContracts, emptyBallotRoot.toString(),