From d8e3e4e2966c66f64a8d6485299bd21203b1b4e1 Mon Sep 17 00:00:00 2001 From: ctrlc03 <93448202+ctrlc03@users.noreply.github.com> Date: Fri, 18 Aug 2023 10:28:00 +0100 Subject: [PATCH 1/4] chore(setup-maci) - upload MACI v1 ceremony config files --- .../p0tionConfig.json | 65 +++++++++++++++++++ 1 file changed, 65 insertions(+) create mode 100644 ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json diff --git a/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json b/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json new file mode 100644 index 0000000..1314a9f --- /dev/null +++ b/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json @@ -0,0 +1,65 @@ +{ + "title": "MACI V1 Trusted Setup Ceremony", + "description": "This is a trusted setup ceremony for the Minimal Anti Collusion Infrastructure (MACI) v1 protocol", + "startDate": "2023-08-18T11:00:00", + "endDate": "2023-10-19T00:00:00", + "timeoutMechanismType": "FIXED", + "penalty": 10, + "circuits": [ + { + "description": "Process Messages 6-8-2-3", + "compiler": { + "version": "2.1.0", + "commitHash": "b7ad01b11f9b4195e38ecc772291251260ab2c67" + }, + "template": { + "source": "https://github.com/privacy-scaling-explorations/maci", + "commitHash": "78609349aecd94186216ac8743d61b1cb81a097f", + "paramConfiguration": [6,8,2,3] + }, + "verification": { + "cfOrVm": "VM", + "vmConfigurationType": "m5.4xlarge", + "vmDiskSize": "30", + "vmDiskType": "gp2" + }, + "artifacts": { + "bucket": "maci-v1---vm-test-p0tion-staging-environment", + "region": "us-east-1", + "r1csStoragePath": "circuits/processmessages_6-8-2-3_test/ProcessMessages_6-8-2-3_test.r1cs", + "wasmStoragePath": "circuits/processmessages_6-8-2-3_test/ProcessMessages_6-8-2-3_test.wasm" + }, + "name": "MACI-ProcessMessages_6-8-2-3", + "fixedTimeWindow": 30, + "sequencePosition": 1 + }, + { + "description": "Tally Votes 6-2-3", + "compiler": { + "version": "2.1.0", + "commitHash": "127414e9088cc017a357233f30f3fd7d91a8906c" + }, + "template": { + "source": "https://github.com/privacy-scaling-explorations/maci", + "commitHash": "78609349aecd94186216ac8743d61b1cb81a097f", + "paramConfiguration": [6,2,3] + }, + "verification": { + "cfOrVm": "VM", + "vmConfigurationType": "m5.4xlarge", + "vmDiskSize": "30", + "vmDiskType": "gp2" + }, + "artifacts": { + "bucket": "maci-v1---vm-test-p0tion-staging-environment", + "region": "us-east-1", + "r1csStoragePath": "circuits/tallyvotes_6-2-3_test/TallyVotes_6-2-3_test.r1cs", + "wasmStoragePath": "circuits/tallyvotes_6-2-3_test/TallyVotes_6-2-3_test.wasm" + }, + "name": "MACI-TallyVotes_6-2-3", + "fixedTimeWindow": 30, + "sequencePosition": 2 + } + ] +} + \ No newline at end of file From e947a3a32d7bf6e435a99c4d48aa3d2c9147446c Mon Sep 17 00:00:00 2001 From: ctrlc03 <93448202+ctrlc03@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:06:54 +0100 Subject: [PATCH 2/4] fix(maci-setup) change bucket origin --- .../p0tionConfig.json | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json b/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json index 1314a9f..94f7984 100644 --- a/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json +++ b/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json @@ -1,7 +1,7 @@ { "title": "MACI V1 Trusted Setup Ceremony", "description": "This is a trusted setup ceremony for the Minimal Anti Collusion Infrastructure (MACI) v1 protocol", - "startDate": "2023-08-18T11:00:00", + "startDate": "2023-08-18T11:30:00", "endDate": "2023-10-19T00:00:00", "timeoutMechanismType": "FIXED", "penalty": 10, @@ -24,41 +24,41 @@ "vmDiskType": "gp2" }, "artifacts": { - "bucket": "maci-v1---vm-test-p0tion-staging-environment", - "region": "us-east-1", - "r1csStoragePath": "circuits/processmessages_6-8-2-3_test/ProcessMessages_6-8-2-3_test.r1cs", - "wasmStoragePath": "circuits/processmessages_6-8-2-3_test/ProcessMessages_6-8-2-3_test.wasm" + "bucket": "maci-v1-setup-artifacts", + "region": "eu-central-1", + "r1csStoragePath": "ProcessMessages_6-8-2-3_test.r1cs", + "wasmStoragePath": "ProcessMessages_6-8-2-3_test.wasm" }, "name": "MACI-ProcessMessages_6-8-2-3", "fixedTimeWindow": 30, "sequencePosition": 1 }, { - "description": "Tally Votes 6-2-3", - "compiler": { - "version": "2.1.0", - "commitHash": "127414e9088cc017a357233f30f3fd7d91a8906c" - }, - "template": { - "source": "https://github.com/privacy-scaling-explorations/maci", - "commitHash": "78609349aecd94186216ac8743d61b1cb81a097f", - "paramConfiguration": [6,2,3] - }, - "verification": { - "cfOrVm": "VM", - "vmConfigurationType": "m5.4xlarge", - "vmDiskSize": "30", - "vmDiskType": "gp2" - }, - "artifacts": { - "bucket": "maci-v1---vm-test-p0tion-staging-environment", - "region": "us-east-1", - "r1csStoragePath": "circuits/tallyvotes_6-2-3_test/TallyVotes_6-2-3_test.r1cs", - "wasmStoragePath": "circuits/tallyvotes_6-2-3_test/TallyVotes_6-2-3_test.wasm" - }, - "name": "MACI-TallyVotes_6-2-3", - "fixedTimeWindow": 30, - "sequencePosition": 2 + "description": "Tally Votes 6-2-3", + "compiler": { + "version": "2.1.0", + "commitHash": "127414e9088cc017a357233f30f3fd7d91a8906c" + }, + "template": { + "source": "https://github.com/privacy-scaling-explorations/maci", + "commitHash": "78609349aecd94186216ac8743d61b1cb81a097f", + "paramConfiguration": [6,2,3] + }, + "verification": { + "cfOrVm": "VM", + "vmConfigurationType": "m5.4xlarge", + "vmDiskSize": "30", + "vmDiskType": "gp2" + }, + "artifacts": { + "bucket": "maci-v1-setup-artifacts", + "region": "eu-central-1", + "r1csStoragePath": "TallyVotes_6-2-3_test.r1cs", + "wasmStoragePath": "TallyVotes_6-2-3_test.wasm" + }, + "name": "MACI-TallyVotes_6-2-3", + "fixedTimeWindow": 30, + "sequencePosition": 2 } ] } From acaaba067a3ac940b4393120db8b7ce8e3d6d378 Mon Sep 17 00:00:00 2001 From: ctrlc03 <93448202+ctrlc03@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:52:08 +0100 Subject: [PATCH 3/4] fix(maci) change bucket --- ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json b/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json index 94f7984..768ac81 100644 --- a/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json +++ b/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json @@ -1,7 +1,7 @@ { "title": "MACI V1 Trusted Setup Ceremony", "description": "This is a trusted setup ceremony for the Minimal Anti Collusion Infrastructure (MACI) v1 protocol", - "startDate": "2023-08-18T11:30:00", + "startDate": "2023-08-18T12:00:00", "endDate": "2023-10-19T00:00:00", "timeoutMechanismType": "FIXED", "penalty": 10, @@ -24,7 +24,7 @@ "vmDiskType": "gp2" }, "artifacts": { - "bucket": "maci-v1-setup-artifacts", + "bucket": "maci-ceremony-artifacts", "region": "eu-central-1", "r1csStoragePath": "ProcessMessages_6-8-2-3_test.r1cs", "wasmStoragePath": "ProcessMessages_6-8-2-3_test.wasm" @@ -51,7 +51,7 @@ "vmDiskType": "gp2" }, "artifacts": { - "bucket": "maci-v1-setup-artifacts", + "bucket": "maci-ceremony-artifacts", "region": "eu-central-1", "r1csStoragePath": "TallyVotes_6-2-3_test.r1cs", "wasmStoragePath": "TallyVotes_6-2-3_test.wasm" From 4681fc6d854e807451ee769e62b4cd0f26ea657c Mon Sep 17 00:00:00 2001 From: ctrlc03 <93448202+ctrlc03@users.noreply.github.com> Date: Fri, 18 Aug 2023 16:51:57 +0100 Subject: [PATCH 4/4] chore(maci) change storage path to URL --- .../maci-v1-trusted-setup-ceremony/p0tionConfig.json | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json b/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json index 768ac81..d7f06d0 100644 --- a/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json +++ b/ceremonies/maci-v1-trusted-setup-ceremony/p0tionConfig.json @@ -24,10 +24,8 @@ "vmDiskType": "gp2" }, "artifacts": { - "bucket": "maci-ceremony-artifacts", - "region": "eu-central-1", - "r1csStoragePath": "ProcessMessages_6-8-2-3_test.r1cs", - "wasmStoragePath": "ProcessMessages_6-8-2-3_test.wasm" + "r1csStoragePath": "https://p0tion-test-definitely-setup.s3.amazonaws.com/ProcessMessages_6-8-2-3_test.r1cs", + "wasmStoragePath": "https://p0tion-test-definitely-setup.s3.amazonaws.com/ProcessMessages_6-8-2-3_test.wasm" }, "name": "MACI-ProcessMessages_6-8-2-3", "fixedTimeWindow": 30, @@ -51,10 +49,8 @@ "vmDiskType": "gp2" }, "artifacts": { - "bucket": "maci-ceremony-artifacts", - "region": "eu-central-1", - "r1csStoragePath": "TallyVotes_6-2-3_test.r1cs", - "wasmStoragePath": "TallyVotes_6-2-3_test.wasm" + "r1csStoragePath": "https://p0tion-test-definitely-setup.s3.amazonaws.com/TallyVotes_6-2-3_test.r1cs", + "wasmStoragePath": "https://p0tion-test-definitely-setup.s3.amazonaws.com/TallyVotes_6-2-3_test.wasm" }, "name": "MACI-TallyVotes_6-2-3", "fixedTimeWindow": 30,