Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fork privacy-scaling-explorations/p0tion to ethstorage-io/p0tion and do related change #6

Merged
merged 2 commits into from
Jul 15, 2024
Merged

Fork privacy-scaling-explorations/p0tion to ethstorage-io/p0tion and do related change #6

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b17144f
change package name to ethstorage-org and update package version
ping-ke Jul 8, 2024
d9ec79d
change ethstorage-org to ethstorage-io
ping-ke Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,19 +113,19 @@ Our design philosophy ensures that p0tion stands as the optimal choice for runni
<tr>
<td>
<a href="/packages/phase2cli">
@p0tion/phase2cli
@ethstorage-org/phase2cli
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ethstorage.org is not owned by us, or can it be renamed to ethstorage?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ethstorage has been occupied. change to ethstorage-io

</a>
</td>
<td>
<!-- NPM version -->
<a href="https://npmjs.org/package/@p0tion/phase2cli">
<img src="https://img.shields.io/npm/v/@p0tion/phase2cli.svg?style=flat-square" alt="NPM version" />
<a href="https://npmjs.org/package/@ethstorage-org/phase2cli">
<img src="https://img.shields.io/npm/v/@ethstorage-org/phase2cli.svg?style=flat-square" alt="NPM version" />
</a>
</td>
<td>
<!-- Downloads -->
<a href="https://npmjs.org/package/@p0tion/phase2cli">
<img src="https://img.shields.io/npm/dm/@p0tion/phase2cli.svg?style=flat-square" alt="Downloads" />
<a href="https://npmjs.org/package/@ethstorage-org/phase2cli">
<img src="https://img.shields.io/npm/dm/@ethstorage-org/phase2cli.svg?style=flat-square" alt="Downloads" />
</a>
</td>
</tr>
Expand All @@ -138,7 +138,7 @@ Our design philosophy ensures that p0tion stands as the optimal choice for runni
Clone this repository

```bash
git clone https://github.com/privacy-scaling-explorations/p0tion.git
git clone https://github.com/ethstorage/p0tion.git
```

Install the dependencies
Expand Down
4 changes: 2 additions & 2 deletions RELEASE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ To release a new version of `p0tion`, the following steps can be taken:
2. Clone `p0tion`:

```
git clone https://github.com/privacy-scaling-explorations/p0tion.git
git clone https://github.com/ethstorage/p0tion.git
```

3. Install required dependencies:
Expand Down Expand Up @@ -59,4 +59,4 @@ Once the tag is pushed, GitHub Actions will automatically publish the packages t

- @p0tion/actions
- @p0tion/backend
- @p0tion/phase2cli
- @ethstorage-org/phase2cli
10 changes: 5 additions & 5 deletions docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ <h1 style="margin: 0; font-size: 40px">🧪 p0tion packages</h1>
<a
style="margin-right: 15px; text-decoration: none"
target="_blank"
href="https://github.com/privacy-scaling-explorations/p0tion"
href="https://github.com/ethstorage/p0tion"
>
<i class="fa fa-github" style="font-size: 24px; color: #000"></i>
</a>
Expand All @@ -57,22 +57,22 @@ <h1 style="margin: 0; font-size: 40px">🧪 p0tion packages</h1>
</footer>
</body>
<script>
const url = "https://api.github.com/repos/privacy-scaling-explorations/p0tion/contents?ref=gh-pages"
const url = "https://api.github.com/repos/ethstorage/p0tion/contents?ref=gh-pages"

function insertLinks(packages) {
const [element] = window.document.getElementsByTagName("ul")
let html = ""

for (const package of packages) {
html += `<li style="display: flex; align-items: center; margin-bottom: 8px">
<a style="margin-right: 15px" target="_blank" href="https://github.com/privacy-scaling-explorations/p0tion/tree/main/packages/${package}">
<a style="margin-right: 15px" target="_blank" href="https://github.com/ethstorage/p0tion/tree/main/packages/${package}">
<i class="fa fa-github" style="font-size: 24px; color: #000"></i>
</a>
<a style="color: #000; text-decoration: none; font-size: 16px"
onmouseover="this.style.color='#404A4E';"
onmouseout="this.style.color='#000';"
target="_blank" href="https://privacy-scaling-explorations.github.io/p0tion/${package}">
@privacy-scaling-explorations/${package} >
target="_blank" href="https://ethstorage.github.io/p0tion/${package}">
@ethstorage-org/${package} >
</a></li>`
}

Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "p0tion",
"name": "ethstorge-org",
"description": "MPC Phase 2 suite of tools for conducting zkSNARKs trusted setup ceremonies",
"repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
"homepage": "https://github.com/privacy-scaling-explorations/p0tion",
"bugs": "https://github.com/privacy-scaling-explorations/p0tion/issues",
"repository": "git@github.com:ethstorage/p0tion.git",
"homepage": "https://github.com/ethstorage/p0tion",
"bugs": "https://github.com/ethstorage/p0tion/issues",
"license": "MIT",
"private": true,
"keywords": [
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/.firebaserc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"projects": {
"dev": "demo-p0tion",
"prod": "p0tion-ci-environment"
"prod": "ethstorage-trusted-setup"
}
}
2 changes: 1 addition & 1 deletion packages/backend/aws/lambda/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { EC2Client, DescribeInstancesCommand, StopInstancesCommand, CreateTagsCommand } from "@aws-sdk/client-ec2"

const ec2 = new EC2Client({ region: "us-east-1" })
const ec2 = new EC2Client({ region: "us-west-2" })

export const handler = async (event) => {
console.log("Received event:", JSON.stringify(event, null, 2))
Expand Down
12 changes: 6 additions & 6 deletions packages/backend/aws/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
provider "aws" {
region = "us-east-1"
region = "us-west-2"
}

# create SNS
Expand Down Expand Up @@ -88,7 +88,7 @@ resource "aws_sns_topic_subscription" "lambda" {
data "aws_iam_policy_document" "p0tion_assume_role_policy_ec2" {
statement {
actions = ["sts:AssumeRole"]

principals {
type = "Service"
identifiers = ["ec2.amazonaws.com"]
Expand All @@ -110,7 +110,7 @@ resource "aws_iam_instance_profile" "p0tion_ec2_instance_profile" {
# EC2 SNS policy
resource "aws_iam_role_policy" "p0tion_ec2_sns" {
name = "p0tion_ec2_sns"
role = aws_iam_role.p0tion_ec2_role.id
role = aws_iam_role.p0tion_ec2_role.id

policy = <<EOF
{
Expand All @@ -130,7 +130,7 @@ resource "aws_iam_role_policy" "p0tion_ec2_sns" {
# EC2 S3 and SSM policy
resource "aws_iam_role_policy" "p0tion_ec2_s3_ssm" {
name = "p0tion_ec2_s3_ssm"
role = aws_iam_role.p0tion_ec2_role.id
role = aws_iam_role.p0tion_ec2_role.id

policy = <<EOF
{
Expand All @@ -157,7 +157,7 @@ resource "aws_iam_role_policy" "p0tion_ec2_s3_ssm" {
EOF
}

# IAM user for all operations
# IAM user for all operations
resource "aws_iam_user" "p0tion_iam_user" {
name = "p0tion_iam_user"
}
Expand Down Expand Up @@ -285,4 +285,4 @@ output "p0tion_ec2_role_arn" {
output "p0tion_sns_topic_arn" {
value = aws_sns_topic.p0tion_sns_topic.arn
description = "The sns topic arn to put in the .env"
}
}
2 changes: 1 addition & 1 deletion packages/backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"docs": "typedoc src/**/*.ts --out ../../docs/backend"
},
"devDependencies": {
"@firebase/rules-unit-testing": "^2.0.7",
"@firebase/rules-unit-testing": "^3.0.2",
"@types/rollup-plugin-auto-external": "^2.0.2",
"@types/uuid": "^9.0.1",
"firebase-functions-test": "^3.1.0",
Expand Down
22 changes: 11 additions & 11 deletions packages/phase2cli/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
</p>

<p align="center">
<a href="https://github.com/privacy-scaling-explorations/p0tion">
<a href="https://github.com/ethstorage/p0tion">
<img src="https://img.shields.io/badge/project-p0tion-blue.svg?style=flat-square">
</a>
<a href="https://github.com/privacy-scaling-explorations/p0tion/blob/main/LICENSE">
<a href="https://github.com/ethstorage/p0tion/blob/main/LICENSE">
<img alt="Github License" src="https://img.shields.io/github/license/privacy-scaling-explorations/p0tion.svg?style=flat-square">
</a>
<a href="https://www.npmjs.com/package/@p0tion/phase2cli">
<img alt="NPM Version" src="https://img.shields.io/npm/v/@p0tion/phase2cli?style=flat-square" />
<a href="https://www.npmjs.com/package/@ethstorage-org/phase2cli">
<img alt="NPM Version" src="https://img.shields.io/npm/v/@ethstorage-org/phase2cli?style=flat-square" />
</a>
<a href="https://npmjs.org/package/@p0tion/phase2cli">
<img alt="Downloads" src="https://img.shields.io/npm/dm/@p0tion/phase2cli.svg?style=flat-square" />
<a href="https://npmjs.org/package/@ethstorage-org/phase2cli">
<img alt="Downloads" src="https://img.shields.io/npm/dm/@ethstorage-org/phase2cli.svg?style=flat-square" />
</a>
<a href="https://eslint.org/">
<img alt="Linter" src="https://img.shields.io/badge/linter-eslint-8080f2?style=flat-square&logo=eslint" />
Expand All @@ -28,11 +28,11 @@

<div align="center">
<h4>
<a href="https://github.com/privacy-scaling-explorations/p0tion/blob/main/CONTRIBUTING.md">
<a href="https://github.com/ethstorage/p0tion/blob/main/CONTRIBUTING.md">
👥 Contributing
</a>
<span>&nbsp;&nbsp;|&nbsp;&nbsp;</span>
<a href="https://github.com/privacy-scaling-explorations/p0tion/blob/main/CODE_OF_CONDUCT.md">
<a href="https://github.com/ethstorage/p0tion/blob/main/CODE_OF_CONDUCT.md">
🤝 Code of conduct
</a>
<span>&nbsp;&nbsp;|&nbsp;&nbsp;</span>
Expand All @@ -49,16 +49,16 @@ Rounding up the option of using a unique tool for different ceremony stages make

## 🛠 Installation

Install the `@p0tion/phase2cli` package globally
Install the `@ethstorage-org/phase2cli` package globally

```bash
npm i -g @p0tion/phase2cli
npm i -g @ethstorage-org/phase2cli
```

or run specific commands with `npx`:

```bash
npx @p0tion/phase2cli contribute
npx @ethstorage-org/phase2cli contribute
```

> Please note that phase2cli only runs on Linux or Mac systems. If a Windows user, please install [WSL2](https://learn.microsoft.com/en-us/windows/wsl/install) first.
Expand Down
11 changes: 6 additions & 5 deletions packages/phase2cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@p0tion/phase2cli",
"name": "@ethstorage-org/phase2cli",
"type": "module",
"version": "1.2.4",
"version": "1.2.12",
"description": "All-in-one interactive command-line for interfacing with zkSNARK Phase 2 Trusted Setup ceremonies",
"repository": "git@github.com:privacy-scaling-explorations/p0tion.git",
"homepage": "https://github.com/privacy-scaling-explorations/p0tion",
"bugs": "https://github.com/privacy-scaling-explorations/p0tion/issues",
"repository": "git@github.com:ethstorage/p0tion.git",
"homepage": "https://github.com/ethstorage/p0tion",
"bugs": "https://github.com/ethstorage/p0tion/issues",
"license": "MIT",
"bin": "dist/index.js",
"main": "dist/index.js",
Expand All @@ -14,6 +14,7 @@
"node": ">=16.14.0"
},
"files": [
"dist/.env",
"dist/",
"src/",
"types/",
Expand Down
2 changes: 1 addition & 1 deletion packages/phase2cli/src/lib/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ export const generateCustomUrlToTweetAboutParticipation = (
ceremonyName.toLowerCase().includes("ceremony")
? "!"
: "%20Phase%202%20Trusted%20Setup%20ceremony!"
}%20You%20can%20view%20the%20steps%20to%20contribute%20here:%20https://ceremony.pse.dev%20You%20can%20view%20my%20attestation%20here:%20${gistUrl}%20#Ethereum%20#ZKP`
}%20You%20can%20view%20the%20steps%20to%20contribute%20here:%20https://ceremony.ethstorage.io%20You%20can%20view%20my%20attestation%20here:%20${gistUrl}%20#Ethereum%20#ZKP`

/**
* Return a custom progress bar.
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4794,9 +4794,9 @@ __metadata:
languageName: unknown
linkType: soft

"@p0tion/phase2cli@workspace:packages/phase2cli":
"@ethstorage-org/phase2cli@workspace:packages/phase2cli":
version: 0.0.0-use.local
resolution: "@p0tion/phase2cli@workspace:packages/phase2cli"
resolution: "@ethstorage-org/phase2cli@workspace:packages/phase2cli"
dependencies:
"@adobe/node-fetch-retry": ^2.2.0
"@aws-sdk/client-s3": ^3.329.0
Expand Down