Skip to content

Commit 6b8ad67

Browse files
authored
Merge branch 'develop' into patch-1
2 parents acbdc2a + 9645358 commit 6b8ad67

File tree

3,320 files changed

+351439
-1063940
lines changed

Some content is hidden

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

3,320 files changed

+351439
-1063940
lines changed

.bazelrc

-32
This file was deleted.

.github/ISSUE_TEMPLATE/1-BUG_REPORT.yml

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: "🐛 Bug report"
22
description: Something isn't working as expected? Report your bugs here.
3-
labels: "type: bug"
3+
labels: ["bug", "triage"]
44
body:
55
- type: markdown
66
attributes:
@@ -55,6 +55,13 @@ body:
5555
description: Describe what actually happened.
5656
validations:
5757
required: true
58+
- type: textarea
59+
attributes:
60+
label: Daemon version
61+
description: Use the command "mina version" to get this information.
62+
placeholder: Commit 68200c7b409e105d174f079c5c39f7926819784b on branch master
63+
validations:
64+
required: true
5865
- type: dropdown
5966
id: frequency
6067
validations:

.github/PULL_REQUEST_TEMPLATE.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,10 @@ Explain your changes:
3535
Explain how you tested your changes:
3636
*
3737

38-
3938
Checklist:
4039

40+
- [ ] Dependency versions are unchanged
41+
- Notify Velocity team if dependencies must change in CI
4142
- [ ] Modified the current draft of release notes with details on what is completed or incomplete within this project
4243
- [ ] Document code purpose, how to use it
4344
- Mention expected invariants, implicit constraints

.gitignore

+25-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ src/libp2p_ipc/libp2p_ipc_capnp.mli
3636
maintenance/*.dot
3737
maintenance/*.png
3838

39-
scripts/genesis_ledger.json
39+
scripts/mina-local-network/genesis_ledger.json
40+
scripts/mina-local-network/annotated_ledger.json
4041

4142
automation/*config.json
4243
automation/!bsconfig.json
@@ -54,6 +55,7 @@ automation/keys/testnet-keys/*
5455
automation/keys/libp2p/*
5556
automation/src/*.js
5657
automation/node_modules/
58+
automation/terraform/testnets/**/keys
5759

5860
automation/scripts/offline_fish_keys
5961
automation/scripts/offline_whale_keys
@@ -80,6 +82,28 @@ automation/services/watchdog/check_libp2p/check_libp2p
8082
*.backup
8183

8284
*.terraform.lock.hcl
85+
*gcloud-keyfile.json*
8386
_opam
8487

88+
target
89+
release
8590
.vscode
91+
92+
### IntelliJ IDEA ###
93+
**/.idea/
94+
*.iws
95+
*.iml
96+
*.ipr
97+
98+
### Direnv ###
99+
.env
100+
.envrc
101+
.direnv/
102+
103+
# pipenv
104+
Pipfile
105+
Pipfile.lock
106+
107+
# coverage report files
108+
*.coverage
109+
_coverage/

.gitmodules

-28
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,13 @@
44
[submodule "src/external/ppx_optcomp"]
55
path = src/external/ppx_optcomp
66
url = https://github.com/MinaProtocol/ppx_optcomp
7-
[submodule "src/external/async_kernel"]
8-
path = src/external/async_kernel
9-
url = https://github.com/MinaProtocol/async_kernel
10-
[submodule "src/external/ocaml-extlib"]
11-
path = src/external/ocaml-extlib
12-
url = https://github.com/MinaProtocol/ocaml-extlib.git
13-
[submodule "src/external/rpc_parallel"]
14-
path = src/external/rpc_parallel
15-
url = https://github.com/MinaProtocol/rpc_parallel.git
16-
[submodule "frontend/wallet/tablecloth"]
17-
path = frontend/wallet/tablecloth
18-
url = https://github.com/bkase/tablecloth
19-
[submodule "src/external/graphql_ppx"]
20-
path = src/external/graphql_ppx
21-
url = https://github.com/o1-labs/graphql_ppx.git
227
[submodule "src/lib/crypto/proof-systems"]
238
path = src/lib/crypto/proof-systems
249
url = https://github.com/o1-labs/proof-systems.git
25-
[submodule "src/external/ppx_version"]
26-
path = src/external/ppx_version
27-
url = https://github.com/o1-labs/ppx_version.git
28-
[submodule "src/external/ppx_deriving_yojson"]
29-
path = src/external/ppx_deriving_yojson
30-
url = https://github.com/MinaProtocol/ppx_deriving_yojson.git
31-
branch = master
3210
[submodule "src/external/prometheus"]
3311
path = src/external/prometheus
3412
url = https://github.com/MinaProtocol/prometheus.git
3513
branch = master
3614
[submodule "src/external/c-reference-signer"]
3715
path = src/external/c-reference-signer
3816
url = https://github.com/MinaProtocol/c-reference-signer.git
39-
[submodule "src/external/capnp-ocaml"]
40-
path = src/external/capnp-ocaml
41-
url = https://github.com/o1-labs/capnp-ocaml.git
42-
[submodule "src/external/wasm-bindgen-rayon"]
43-
path = src/external/wasm-bindgen-rayon
44-
url = https://github.com/o1-labs/wasm-bindgen-rayon.git

.mailmap

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2+
3+
4+
5+

.prettierignore

-1
This file was deleted.

.xrefcheck.yaml

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Parameters of repository traversal.
2+
traversal:
3+
# Files and folders which we pretend do not exist
4+
# (so they are neither analyzed nor can be referenced).
5+
ignored:
6+
# Git files
7+
- .git
8+
# Build artifacts
9+
- _build
10+
- _opam
11+
# Git submodules
12+
- src/external
13+
- src/lib/marlin
14+
- src/lib/crypto/proof-systems
15+
- src/lib/snarky
16+
- frontend/wallet/tablecloth
17+
# Unsure of the relevance anymore
18+
- frontend/wallet/README.md
19+
20+
# Verification parameters.
21+
verification:
22+
# On 'anchor not found' error, how much similar anchors should be displayed as
23+
# hint. Number should be between 0 and 1, larger value means stricter filter.
24+
anchorSimilarityThreshold: 0.5
25+
26+
# When checking external references, how long to wait on request before
27+
# declaring "Response timeout".
28+
externalRefCheckTimeout: 10s
29+
30+
# Prefixes of files, references in which should not be analyzed.
31+
notScanned:
32+
- .github/pull_request_template.md
33+
- .github/issue_template.md
34+
- .github/PULL_REQUEST_TEMPLATE
35+
- .github/ISSUE_TEMPLATE
36+
37+
# Glob patterns describing the files which do not physically exist in the
38+
# repository but should be treated as existing nevertheless.
39+
virtualFiles:
40+
- ../../../issues
41+
- ../../../issues/*
42+
- ../../../pulls
43+
- ../../../pulls/*
44+
45+
# POSIX extended regular expressions that match external references
46+
# that have to be ignored (not verified).
47+
# It is an optional parameter, so it can be omitted.
48+
ignoreRefs:
49+
- "https://github.com/.*" # Otherwise Resource unavailable (429 too many requests)
50+
51+
# Check localhost links.
52+
checkLocalhost: false
53+
54+
# Skip links which return 403 or 401 code.
55+
ignoreAuthFailures: true
56+
57+
# Parameters of scanners for various file types.
58+
scanners:
59+
markdown:
60+
# Flavor of markdown, e.g. GitHub-flavor.
61+
#
62+
# This affects which anchors are generated for headers.
63+
flavor: GitHub

BUILD.bazel

-3
This file was deleted.

CHANGES

+6
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,9 @@ Current changes
55

66
* #9530: Remove verifier process automatic restart, which was
77
intended to work around memory leaks, now fixed (Paul Steckler)
8+
9+
### Breaking changes
10+
11+
* #11696: The GraphQL API now uses more descriptive scalar types (such as `Fee` or `Amount` instead of `UInt64`).
12+
This enables GraphQL clients to automatically parse these scalars into the correct internal types.
13+
Even though the JSON shape of messages does not change, third party tools that make use of the GraphQL schema for parsing responses may have to be adapted to these new types.

CODEOWNERS

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
/CODEOWNERS @nholland94 @bkase @imeckler
1+
/CODEOWNERS @nholland94 @bkase @aneesharaines @mrmr1993
22
/buildkite @MinaProtocol/infra-eng-reviewers
33
/frontend/ @MinaProtocol/product-eng-reviewers
44
/dockerfiles/ @MinaProtocol/infra-eng-reviewers
55
/scripts/ @MinaProtocol/infra-eng-reviewers @MinaProtocol/protocol-eng-reviewers
66
/Makefile @MinaProtocol/infra-eng-reviewers
77
/src/config/dev.mlh @MinaProtocol/infra-eng-reviewers @MinaProtocol/protocol-eng-reviewers
88
/src/config/testnet_postake_medium_curves.mlh @MinaProtocol/infra-eng-reviewers @MinaProtocol/protocol-eng-reviewers
9-
/CODE_OF_CONDUCT.md @imeckler @emberian
9+
/CODE_OF_CONDUCT.md @aneesharaines
1010
/CONTRIBUTING.md @MinaProtocol/product-eng-reviewers
11-
/LICENSE @imeckler
11+
/LICENSE @aneesharaines
1212
/README.md @MinaProtocol/product-eng-reviewers
1313
/README-dev.md @MinaProtocol/protocol-eng-reviewers
14+
/graphql_schema.json @MinaProtocol/product-eng-reviewers
1415

15-
/src/external/ @emberian @bkase @psteckler @imeckler @mrmr1993
16+
/src/external/ @bkase @psteckler @aneesharaines @mrmr1993
1617

17-
/src/app/archive @MinaProtocol/product-eng-reviewers
18-
/src/app/cli/src/tests @MinaProtocol/protocol-eng-reviewers
18+
/src/app/archive @MinaProtocol/protocol-eng-reviewers
1919
/src/app/cli/src/mina.ml @MinaProtocol/protocol-eng-reviewers
2020
/src/app/cli/src/init @MinaProtocol/protocol-eng-reviewers
2121
/src/app/libp2p_helper @MinaProtocol/protocol-eng-reviewers
@@ -25,32 +25,33 @@
2525
/src/app/archive_blocks/ @MinaProtocol/protocol-eng-reviewers
2626
/src/app/extract_blocks/ @MinaProtocol/protocol-eng-reviewers
2727
/src/app/patch_archive_test/ @MinaProtocol/protocol-eng-reviewers
28+
/src/app/rosetta/ @MinaProtocol/mina-foundation-eng
2829

2930
/src/lib/ @MinaProtocol/protocol-eng-reviewers
3031

3132
/src/lib/blake2/ @MinaProtocol/crypto-eng-reviewers
32-
/src/lib/cli_lib/ @MinaProtocol/product-eng-reviewers
33-
/src/lib/mina_commands @MinaProtocol/product-eng-reviewers
3433
/src/lib/mina_graphql @MinaProtocol/product-eng-reviewers
3534
/src/lib/mina_numbers/ @MinaProtocol/crypto-eng-reviewers
3635
/src/lib/crs/ @MinaProtocol/crypto-eng-reviewers
3736
/src/lib/crypto_params/ @MinaProtocol/crypto-eng-reviewers
37+
/src/lib/crypto @MinaProtocol/crypto-eng-reviewers
3838
/src/lib/dummy_values/ @MinaProtocol/crypto-eng-reviewers
3939
/src/lib/hash_prefixes/ @MinaProtocol/crypto-eng-reviewers
4040
/src/lib/non_zero_curve_point/ @MinaProtocol/crypto-eng-reviewers
4141
/src/lib/outside_hash_image/ @MinaProtocol/crypto-eng-reviewers
42-
/src/lib/pokolog/ @MinaProtocol/crypto-eng-reviewers
42+
/src/lib/pickles_base/ @MinaProtocol/crypto-eng-reviewers
43+
/src/lib/pickles_types/ @MinaProtocol/crypto-eng-reviewers
44+
/src/lib/pickles/ @MinaProtocol/crypto-eng-reviewers
4345
/src/lib/precomputed_values/ @MinaProtocol/crypto-eng-reviewers
46+
/src/lib/promise @MinaProtocol/protocol-eng-reviewers @MinaProtocol/product-eng-reviewers
4447
/src/lib/sha256_lib/ @MinaProtocol/crypto-eng-reviewers
4548
/src/lib/signature_lib/ @MinaProtocol/crypto-eng-reviewers
46-
/src/lib/snark_keys/ @MinaProtocol/crypto-eng-reviewers
4749
/src/lib/snarky/ @MinaProtocol/crypto-eng-reviewers
4850
/src/lib/snarky_blake2/ @MinaProtocol/crypto-eng-reviewers
4951
/src/lib/snarky_curves/ @MinaProtocol/crypto-eng-reviewers
5052
/src/lib/snarky_field_extensions/ @MinaProtocol/crypto-eng-reviewers
5153
/src/lib/snarky_group_map/ @MinaProtocol/crypto-eng-reviewers
5254
/src/lib/snarky_log/ @MinaProtocol/crypto-eng-reviewers
53-
/src/lib/snarky_pairing/ @MinaProtocol/crypto-eng-reviewers
5455
/src/lib/unsigned_extended/ @MinaProtocol/crypto-eng-reviewers
5556

5657
/src/nonconsensus @MinaProtocol/protocol-eng-reviewers

CODE_OF_CONDUCT.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ If a community member engages in unacceptable behavior, the community organizers
5454

5555
## 6. Reporting Guidelines
5656

57-
If you are subject to or witness unacceptable behavior, or have any other concerns, please notify the Mina community as soon as possible by emailing [email protected]. Please see the [Reporting Guidelines](/docs/reporting-guidelines.md). You can also contact an admin in the [Discord server](https://bit.ly/MinaDiscord).
57+
If you are subject to or witness unacceptable behavior, or have any other concerns, please notify the Mina community as soon as possible by emailing [email protected]. You can also contact an admin in the [Discord server](https://bit.ly/MinaDiscord).
5858

5959
Additionally, community organizers are available to help community members engage with local law enforcement or to otherwise help those experiencing unacceptable behavior feel safe. In the context of in-person events, organizers will also provide escorts as desired by the person experiencing distress.
6060

@@ -68,6 +68,6 @@ This Code of Conduct and its related procedures also applies to unacceptable beh
6868

6969
## 8. License and attribution
7070

71-
This Code of Conduct is adapted from the [Stumptown Syndicate](http://stumptownsyndicate.org) Code of Conduct under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
71+
This Code of Conduct is adapted from the [Stumptown Syndicate](https://github.com/stumpsyn) Code of Conduct under a [Creative Commons Attribution-ShareAlike license](http://creativecommons.org/licenses/by-sa/3.0/).
7272

7373
Portions of text derived from the [Django Code of Conduct](https://www.djangoproject.com/conduct/) and the [Geek Feminism Anti-Harassment Policy](http://geekfeminism.wikia.com/wiki/Conference_anti-harassment/Policy).

0 commit comments

Comments
 (0)