Skip to content

Commit b114773

Browse files
Updates based on PR review
- minor editorial stuff mainly link naming
1 parent 0582ad5 commit b114773

File tree

22 files changed

+27
-27
lines changed

22 files changed

+27
-27
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ If you are new to the baseline project and are looking for an entry-point to mak
88

99
## Submitting a new issue
1010

11-
If you want to create a new issue that doesn't exist already, follow the guidelines in one of our [Issue Templates](https://github.com/ethereum-oasis-op/baseline/tree/master/.github/ISSUE_TEMPLATE).
11+
If you want to create a new issue that doesn't exist already, follow the guidelines in one of our [Issue Templates](https://github.com/ethereum-oasis-op/baseline/tree/main/.github/ISSUE_TEMPLATE).
1212

1313
## Submitting a new pull request
1414

LICENSE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ so that notice of them may be posted.
55

66
For information on any statements regarding IPR claims related to the work
77
of this project, see the
8-
[OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/master/IPR_STATEMENTS.md)
8+
[OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/main/IPR_STATEMENTS.md)
99
page.
1010

1111
# CC0 1.0 Universal

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ The Baseline Protocol Standard contains three specifications - [CORE](https://gi
5252

5353
## The Baseline Protocol Reference Implementations
5454

55-
A growing number of [Baseline Protocol Reference Implementations](docs/bri/overview-of-reference-implementations.md), along with [demonstrations and examples]https://github.com/ethereum-oasis-op/baseline/tree/master/examples) are available to help you understand baselining and give you ideas for your implementation needs.
55+
A growing number of [Baseline Protocol Reference Implementations](docs/bri/overview-of-reference-implementations.md), along with [demonstrations and examples]https://github.com/ethereum-oasis-op/baseline/tree/main/examples) are available to help you understand baselining and give you ideas for your implementation needs.
5656

5757
## Baseline Protocol Interoperability Demo based on an EU Trustchain grant
5858

community/contributors.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Technical contributors either are working on architecture or developing code...b
3131

3232
## Core Developers <a href="#maintainers" id="maintainers"></a>
3333

34-
Once you've done some work as a Member, you may wish to become a **Maintainer** and have a direct hand in deciding what work is merged to the Main/Master Branch to become official Baseline technology and specifications.
34+
Once you've done some work as a Member, you may wish to become a [**Maintainer**](https://github.com/ethereum-oasis-op/baseline/blob/main/MAINTAINERS.md) and have a direct hand in deciding what work is merged to the Main Branch to become official Baseline technology and specifications.
3535

3636
### What do core developers do? <a href="#what-do-maintainers-do" id="what-do-maintainers-do"></a>
3737

community/members.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Anyone with a github ID can be a [Contributor](contributors.md) to Baseline and
66

77
Being a Member gives you [Write](https://help.github.com/en/github/setting-up-and-managing-organizations-and-teams/repository-permission-levels-for-an-organization) access to the Github Repo as well as the [Zenhub extension](https://help.zenhub.com/support/solutions/articles/43000037261-github-permissions-and-access-in-zenhub).
88

9-
Members can manage Issues in pipelines, assign others to Issues, create Epics and Milestones and push contributions to any unprotected branch other than Master/Main.
9+
Members can manage Issues in pipelines, assign others to Issues, create Epics and Milestones and push contributions to any unprotected branch other than Main.
1010

1111
It's a good idea to become a member if you are making regular contributions and want to be assigned Issues, be responsible for assigning Issues to others, or both. Members can be technical contributors, contributors to specifications, or people stepping up to be accountable for projects.
1212

@@ -36,7 +36,7 @@ Members should:
3636

3737
## Code of Conduct <a href="#code-of-conduct" id="code-of-conduct"></a>
3838

39-
Of course, all members must respect and adhere to the community's [code of conduct](https://github.com/ethereum-oasis-op/baseline/blob/master/CODE\_OF\_CONDUCT.md).
39+
Of course, all members must respect and adhere to the community's [code of conduct](https://github.com/ethereum-oasis-op/baseline/blob/main/CODE\_OF\_CONDUCT.md).
4040

4141
## Removal <a href="#removal" id="removal"></a>
4242

docs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The Baseline Protocol Standard contains three specifications - [CORE](https://gi
3636

3737
## The Baseline Protocol Reference Implementations
3838

39-
A growing number of [Reference Implementations](bri/overview-of-reference-implementations.md) and demos can be [found here ](https://github.com/ethereum-oasis-op/baseline/tree/master/examples)to help you understand baselining through example technical implementations.
39+
A growing number of [Reference Implementations](bri/overview-of-reference-implementations.md) and demos can be [found here ](https://github.com/ethereum-oasis-op/baseline/tree/main/examples)to help you understand baselining through example technical implementations.
4040

4141
The first complete reference implementation, [**BRI-1**](bri/bri-1/) has been developed by individuals and community leaders including Provide, EY, Nethermind, ConsenSys Mesh, and others.
4242

docs/baseline-basics/faq.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ The Baseline Protocol is a standardized framework, with requirements outlined in
1212

1313
Being open-source, open-standard means that anyone is free to build any application or service implementing the protocol. Those applications or services may or may not have their own tokens.
1414

15-
The Baseline Protocol Standard and source code are available under the CC0 1.0 Universal public domain dedication. For the full license text, refer to [license](https://github.com/ethereum-oasis-op/baseline/blob/master/LICENSE).
15+
The Baseline Protocol Standard and source code are available under the CC0 1.0 Universal public domain dedication. For the full license text, refer to [license](https://github.com/ethereum-oasis-op/baseline/blob/main/LICENSE).
1616

1717
## I am interested in contributing, where do I start?
1818

docs/community/governance.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ Additional documentation about the OASIS Open Projects program can be found [her
1010

1111
## License and Patent Policies <a id="license-and-patent-policies"></a>
1212

13-
All repos in the Ethereum OASIS Projects organization, including Baseline Protocol repositories, adhere to OASIS Open Projects [license](https://github.com/oasis-open-projects/documentation/blob/master/policy/licenses.md) and [patent polices](https://github.com/oasis-open-projects/documentation/blob/master/policy/call-for-patent-disclosure.md).
13+
All repos in the Ethereum OASIS Projects organization, including Baseline Protocol repositories, adhere to OASIS Open Projects [license](https://github.com/oasis-open-projects/documentation/blob/main/policy/licenses.md) and [patent polices](https://github.com/oasis-open-projects/documentation/blob/main/policy/call-for-patent-disclosure.md).
1414

1515
In order to ensure clean IPR that allows Baseline to remain an open technology, OASIS rules require an [Entity CLA](https://www.oasis-open.org/open-projects/cla/entity-cla-20210630/) for persons or organizations contributing on behalf of a legal entity, and an [Individual CLA](https://cla-assistant.io/ethereum-oasis-op/managed-open-project) for community contributions. You must [sign the ICLA](https://cla-assistant.io/ethereum-oasis-op/managed-open-project) before your pull requests to the baseline repository will be merged. [Check here](https://community.oasis-open.org/s/searchdirectory?id=a233l0000038IIo) to see if your company has signed the ECLA.
1616

1717
## Code of Conduct <a id="code-of-conduct"></a>
1818

19-
​Here is the link to the official [code of conduct](https://github.com/ethereum-oasis-op/baseline/blob/master/CODE_OF_CONDUCT.md).
19+
​Here is the link to the official [code of conduct](https://github.com/ethereum-oasis-op/baseline/blob/main/CODE_OF_CONDUCT.md).
2020

2121
## **Charter: Baseline Open Source Project Governance** <a id="charter-baseline-open-source-project-governance"></a>
2222

docs/deprecated-work/baseline-protocol-code/baseline-process.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ Once the business logic is rendered into provers, deploy the Workflow as follows
4343

4444
First deploy a Node that has the baseline protocol RPC interface implemented. The Nethermind Ethereum Client is the first to implement this code. Alternatively, you can deploy the [commit-mgr](https://github.com/ethereum-oasis-op/baseline/tree/main/examples/bri-2/commit-mgr) Ethereum client extension plus a client type of your choice (i.e. Besu, Infura, etc.)
4545

46-
Next, use the `IBaselineRPC` call in the Client to deploy the Shield and Verifier contracts on-chain. This can be found [here](https://github.com/ethereum-oasis-op/baseline/tree/master/core/api).
46+
Next, use the `IBaselineRPC` call in the Client to deploy the Shield and Verifier contracts on-chain. This can be found [here](https://github.com/ethereum-oasis-op/baseline/tree/main/core/api).
4747

4848
### Running Worksteps
4949

5050
Now that the Workgroup and Workflow have been established, counterparties can send each other serialized records, confirm consistency between those records, and enforce business rules on the state changes from Workstep to Workstep.
5151

52-
An example of this is in the BRI-1 Reference implementation [here](https://github.com/ethereum-oasis-op/baseline/tree/master/examples/bri-1). And a walkthrough of an "Alice and Bob" simple case is [here](https://youtu.be/2WXvTHR4\_7Q) and [here](https://youtu.be/R0AEww6fKLk).
52+
An example of this is in the BRI-1 Reference implementation [here](https://github.com/ethereum-oasis-op/baseline/tree/main/examples/bri-1). And a walkthrough of an "Alice and Bob" simple case is [here](https://youtu.be/2WXvTHR4\_7Q) and [here](https://youtu.be/R0AEww6fKLk).

docs/deprecated-work/baseline-protocol-code/developer-resources.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ If you want to build with the Baseline Protocol, you will find these helpful:
55
| Resource | Quick Access |
66
| ---------------------------- | ---------------------------------------------------------------------------------------------------------- |
77
| v1.0 Code base documentation | [Here](packages/) |
8-
| v1.0 Code base | [Here](https://github.com/ethereum-oasis-op/baseline/tree/master/core) |
9-
| Branch naming standard | [Here] (./branch-naming.md) | |
8+
| v1.0 Code base | [Here](https://github.com/ethereum-oasis-op/baseline/tree/main/core) |
9+
| Branch naming standard | [Here](https://github.com/ethereum-oasis-op/baseline/tree/main/docs/deprecated-work/baseline-protocol-code/branch-naming.md) | |
1010
| Implementation guide | Soon |
1111
| Developers slack channel | [Here](https://join.slack.com/t/ethereum-baseline/shared\_invite/zt-d6emqeci-bjzBsXBqK4D7tBTZ40AEfQ): #dev |
1212
| Reference implementations | [Here](../bri/overview-of-reference-implementations.md) |

docs/deprecated-work/bri/overview-of-reference-implementations.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ Radish34 might be called BRI-0, but for historical purposes, and so as not to co
4343

4444
### **BRI-1**
4545

46-
Baseline Reference Implementation #1 ([BRI-1](bri-1/)) was developed by contributors from Provide, Nethermind, EY and others, with support and oversight from the entire Baseline Maintainer team. This implementation correctly utilizes the core Baseline Protocol abstract interfaces, which are free of dependencies on any particular set of components or proprietary systems, but it also relies heavily on tools and systems made available by Provide. Provide's [Shuttle](https://shuttle.provide.services/waitlist) infrastructure deployment and manifold system is used by many \_baselining \_developers to make their work easier. Nethermind is the first Ethereum public client to implement the [`IBaselineRPC` interface](https://github.com/ethereum-oasis-op/baseline/tree/master/core/api#interfaces)). NATS is a production-ready enterprise messaging layer that meets the privacy and performance requirements for baselining.
46+
Baseline Reference Implementation #1 ([BRI-1](bri-1/)) was developed by contributors from Provide, Nethermind, EY and others, with support and oversight from the entire Baseline Maintainer team. This implementation correctly utilizes the core Baseline Protocol abstract interfaces, which are free of dependencies on any particular set of components or proprietary systems, but it also relies heavily on tools and systems made available by Provide. Provide's [Shuttle](https://shuttle.provide.services/waitlist) infrastructure deployment and manifold system is used by many \_baselining \_developers to make their work easier. Nethermind is the first Ethereum public client to implement the [`IBaselineRPC` interface](https://github.com/ethereum-oasis-op/baseline/tree/main/core/api#interfaces)). NATS is a production-ready enterprise messaging layer that meets the privacy and performance requirements for baselining.
4747

4848
Details on BRI-1 can be found [here](bri-1/), and the code can be found [here](https://github.com/ethereum-oasis-op/baseline/tree/main/examples/bri-1).
4949

docs/deprecated-work/core/api/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This Open Project operates under the license below.
22
OASIS invites anyone who knows of any IPR claims to disclose them if they may be essential to the implementation of any of the work of this project so that notice of them may be posted.
3-
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/master/IPR_STATEMENTS.md) page.
3+
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/main/IPR_STATEMENTS.md) page.
44

55
# CC0 1.0 Universal
66

docs/deprecated-work/core/contracts/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This Open Project operates under the license below.
22
OASIS invites anyone who knows of any IPR claims to disclose them if they may be essential to the implementation of any of the work of this project so that notice of them may be posted.
3-
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/master/IPR_STATEMENTS.md) page.
3+
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/main/IPR_STATEMENTS.md) page.
44

55
# CC0 1.0 Universal
66

docs/deprecated-work/core/messaging/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This Open Project operates under the license below.
22
OASIS invites anyone who knows of any IPR claims to disclose them if they may be essential to the implementation of any of the work of this project so that notice of them may be posted.
3-
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/master/IPR_STATEMENTS.md) page.
3+
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/main/IPR_STATEMENTS.md) page.
44

55
# CC0 1.0 Universal
66

docs/deprecated-work/core/persistence/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This Open Project operates under the license below.
22
OASIS invites anyone who knows of any IPR claims to disclose them if they may be essential to the implementation of any of the work of this project so that notice of them may be posted.
3-
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/master/IPR_STATEMENTS.md) page.
3+
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/main/IPR_STATEMENTS.md) page.
44

55
# CC0 1.0 Universal
66

docs/deprecated-work/core/privacy/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This Open Project operates under the license below.
22
OASIS invites anyone who knows of any IPR claims to disclose them if they may be essential to the implementation of any of the work of this project so that notice of them may be posted.
3-
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/master/IPR_STATEMENTS.md) page.
3+
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/main/IPR_STATEMENTS.md) page.
44

55
# CC0 1.0 Universal
66

docs/deprecated-work/core/types/LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
This Open Project operates under the license below.
22
OASIS invites anyone who knows of any IPR claims to disclose them if they may be essential to the implementation of any of the work of this project so that notice of them may be posted.
3-
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/master/IPR_STATEMENTS.md) page.
3+
For information on any statements regarding IPR claims related to the work of this project, see the [OASIS OP IPR Statements](https://github.com/oasis-open-projects/administration/blob/main/IPR_STATEMENTS.md) page.
44

55
# CC0 1.0 Universal
66

docs/governance/governance.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ description: The Baseline Protocol is an openly governed project and standards b
66

77
## License and Patent Policies <a href="#license-and-patent-policies" id="license-and-patent-policies"></a>
88

9-
All repos in the Ethereum OASIS organization, including Baseline Protocol repositories, adhere to OASIS Open Projects [license](https://github.com/oasis-open-projects/documentation/blob/master/policy/licenses.md) and [patent polices](https://github.com/oasis-open-projects/documentation/blob/master/policy/call-for-patent-disclosure.md).
9+
All repos in the Ethereum OASIS organization, including Baseline Protocol repositories, adhere to OASIS Open Projects [license](https://github.com/oasis-open-projects/documentation/blob/main/policy/licenses.md) and [patent polices](https://github.com/oasis-open-projects/documentation/blob/main/policy/call-for-patent-disclosure.md).
1010

1111
Contributions to the open source repo shall be under creative commons public domain license [(CC0 1.0 Universal)](https://creativecommons.org/publicdomain/zero/1.0/).
1212

@@ -103,5 +103,5 @@ This document was ratified by the PGB before the public launch of the Baseline P
103103

104104
### Details on OASIS and the Open Ethereum Project <a href="#details-on-oasis-and-the-open-ethereum-project" id="details-on-oasis-and-the-open-ethereum-project"></a>
105105

106-
Governance documents from the existing [Open Ethereum Project](https://github.com/ethereum-oasis-op/oasis-open-project/blob/master/GOVERNANCE.md%E2%80%8B).
106+
Governance documents from the existing [Open Ethereum Project](https://github.com/ethereum-oasis-op/oasis-open-project/blob/main/GOVERNANCE.md%E2%80%8B).
107107

docs/specs/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Oasis Standard 3 - Permissionless CCSM Requirements document: The document descr
2929

3030
## License
3131

32-
All contribution in this repo is released under the CC0 1.0 Universal public domain dedication. For the full license text, refer to [LICENSE](https://github.com/ethereum-oasis-op/baseline/blob/master/LICENSE).
32+
All contribution in this repo is released under the CC0 1.0 Universal public domain dedication. For the full license text, refer to [LICENSE](https://github.com/ethereum-oasis-op/baseline/blob/main/LICENSE).
3333

3434
## Contributions
3535

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Battleship Circuit
22

3-
This circuit is simplifed version of https://github.com/tommymsz006/zkbattleship-circuit/blob/master/circom/battleship_sha256.circom.
3+
This circuit is simplifed version of https://github.com/tommymsz006/zkbattleship-circuit/blob/main/circom/battleship_sha256.circom.
44
Also, this version is using latest circom and snarkjs. To generate wasm, zkey and verifier contract follow steps here https://github.com/iden3/snarkjs.

0 commit comments

Comments
 (0)