Skip to content

Commit a27d3cc

Browse files
committed
Merge remote-tracking branch 'origin/compatible' into fabrizio-m/wide-merkle-queries
2 parents db10629 + ecc244a commit a27d3cc

File tree

263 files changed

+7287
-5626
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+7287
-5626
lines changed

.xrefcheck.yaml

-63
This file was deleted.

README.md

+16-8
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
1-
### Build status
1+
<img src="https://github.com/MinaProtocol/mina-resources/blob/main/mina.png?raw=true" >
22

3-
| Develop | Berkeley | Compatible |
4-
| ------- | -------- | ---------- |
5-
| [![Build status - develop](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=develop)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) | [![Build status - berkeley](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=berkeley)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) | [![Build status - compatible](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=compatible)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies)
3+
<h1 align="center" > Mina </h1>
64

7-
<a href="https://minaprotocol.com">
8-
<img src="https://github.com/MinaProtocol/docs/blob/main/public/static/img/svg/mina-wordmark-redviolet.svg?raw=true&sanitize=true" width="350" alt="Mina logo">
9-
</a>
5+
<div align="center">
106

11-
# Mina
7+
![GitHub stars](https://img.shields.io/github/stars/minaprotocol/mina)&nbsp;&nbsp;![GitHub forks](https://img.shields.io/github/forks/minaprotocol/mina)
8+
9+
![GitHub contributors](https://img.shields.io/github/contributors/minaprotocol/mina)&nbsp;&nbsp;![GitHub commit activity](https://img.shields.io/github/commit-activity/m/minaprotocol/mina)&nbsp;&nbsp;![GitHub last commit](https://img.shields.io/github/last-commit/minaprotocol/mina)
10+
11+
| Develop[^1] | Compatible[^2] | Master[^3] |
12+
| ------- | ---------- | ---------- |
13+
| [![Build status - develop](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=develop)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) | [![Build status - compatible](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=compatible)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) | [![Build status - master](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=master)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies)
14+
15+
</div>
1216

1317
Mina is the first cryptocurrency with a lightweight, constant-sized blockchain. This is the main source code repository for the Mina project and contains code for the OCaml protocol implementation, the [Mina Protocol website](https://minaprotocol.com), and wallet. Enjoy!
1418

@@ -60,3 +64,7 @@ The [Node Developers](https://docs.minaprotocol.com/node-developers) docs contai
6064
[Apache 2.0](LICENSE)
6165

6266
Commits older than 2018-10-03 do not have a [LICENSE](LICENSE) file or this notice, but are distributed under the same terms.
67+
68+
[^1]: Develop is a mainline branch containing code that may be not compatible with current mainnet and may require major upgrade (hardfork).
69+
[^2]: Compatible is a mainline branch containing code which does not need hardfork in order to apply it to mainnet.
70+
[^3]: Branch which contains current mainnet code.

automation/services/mina-bp-stats/.gitignore

-1
This file was deleted.

automation/services/mina-bp-stats/ingest-lambda/README.md

-10
This file was deleted.

automation/services/mina-bp-stats/ingest-lambda/index.js

-44
This file was deleted.

automation/services/mina-bp-stats/ingest-lambda/package.json

-7
This file was deleted.

automation/services/mina-bp-stats/sidecar/.gitignore

-2
This file was deleted.

automation/services/mina-bp-stats/sidecar/Dockerfile

-5
This file was deleted.

automation/services/mina-bp-stats/sidecar/README.md

-155
This file was deleted.

automation/services/mina-bp-stats/sidecar/build.sh

-39
This file was deleted.

automation/services/mina-bp-stats/sidecar/mina-bp-stats-sidecar.service

-7
This file was deleted.

automation/services/mina-bp-stats/sidecar/mina-sidecar-example.json

-4
This file was deleted.

0 commit comments

Comments
 (0)