Merge pull request #15500 from MinaProtocol/merge/develop-main-2

Merge develop into o1js-main
MinaProtocol · Apr 10, 2024 · 898f759 · 898f759
2 parents 48443f5 + a90c040
commit 898f759
Show file tree

Hide file tree

Showing 405 changed files with 14,019 additions and 16,607 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -14,3 +14,5 @@ frontend/website/static/*.bc.js filter=lfs diff=lfs merge=lfs -text
 src/app/archive/archive_graphql_schema.json linguist-generated=true
 docs/res/block_production_fsm.dot.png filter=lfs diff=lfs merge=lfs -text
 rfcs/res/hard-fork-package-generation-buildkite-pipeline.dot.png filter=lfs diff=lfs merge=lfs -text
+*.ml linguist-language=OCaml
+*.mli linguist-language=OCaml
diff --git a/.github/ISSUE_TEMPLATE/1-BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/1-BUG_REPORT.yml
@@ -55,6 +55,13 @@ body:
       description: Describe what actually happened.
     validations:
       required: true
+  - type: textarea
+    attributes:
+      label: Daemon version
+      description: Use the command "mina version" to get this information.
+      placeholder: Commit 68200c7b409e105d174f079c5c39f7926819784b on branch master
+    validations:
+      required: true      
   - type: dropdown
     id: frequency
     validations:

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -4,8 +4,14 @@ on:
   schedule:
     - cron: '0 0 * * *'
 
+permissions:
+  contents: read
+
 jobs:
   stale:
+    permissions:
+      issues: write  # for actions/stale to close stale issues
+      pull-requests: write  # for actions/stale to close stale PRs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/stale@main

diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,5 @@
+ember arlynx <ember@lunar.town> <ember@lunar.town>        
+ember arlynx <ember@lunar.town> <cmr@o1labs.org>                          
+ember arlynx <ember@lunar.town> <corey@octayn.net>        
+ember arlynx <ember@lunar.town> <ember@o1labs.org>
+ember arlynx <ember@lunar.town> <ember.arlynx@o1labs.org>
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -83,7 +83,7 @@ for common troubleshooting steps.
 
 There are three main pieces of Mina documentation:
 
-1. The [https://github.com/o1-labs/docs2)](https://github.com/o1-labs/docs2) repository for the [Mina Protocol](https://docs.minaprotocol.com/) docs website.
+1. The [https://github.com/o1-labs/docs2](https://github.com/o1-labs/docs2) repository for the [Mina Protocol](https://docs.minaprotocol.com/) docs website.
 2. The `README.md` files in various directories explain the contents of that
    directory at a high level: the purpose of the library, design constraints, anything else
    specific to that directory.

diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
    same "printed page" as the copyright notice for easier
    identification within third-party archives.
 
-Copyright [yyyy] [name of copyright owner]
+Copyright 2024. Mina Foundation
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/Makefile b/Makefile
@@ -125,11 +125,6 @@ rosetta_lib_encodings_nonconsensus: ocaml_checks
 	(ulimit -s 65532 || true) && (ulimit -n 10240 || true) && dune build src/nonconsensus/rosetta_lib/test/test_encodings.exe --profile=nonconsensus_mainnet
 	$(info Build complete)
 
-dhall_types: ocaml_checks
-	$(info Starting Build)
-	(ulimit -s 65532 || true) && (ulimit -n 10240 || true) && dune build src/app/dhall_types/dump_dhall_types.exe --profile=dev
-	$(info Build complete)
-
 replayer: ocaml_checks
 	$(info Starting Build)
 	ulimit -s 65532 && (ulimit -n 10240 || true) && dune build src/app/replayer/replayer.exe --profile=devnet
@@ -309,8 +304,10 @@ endif
 %.conv.tex.png: %.conv.tex
 	cd $(dir $@) && pdflatex -halt-on-error -shell-escape $(notdir $<)
 
+# TODO: this, but smarter so we don't have to add every library
 doc_diagram_sources=$(addprefix docs/res/,*.dot *.tex *.conv.tex)
 doc_diagram_sources+=$(addprefix rfcs/res/,*.dot *.tex *.conv.tex)
+doc_diagram_sources+=$(addprefix src/lib/transition_frontier/res/,*.dot *.tex *.conv.tex)
 doc_diagrams: $(addsuffix .png,$(wildcard $(doc_diagram_sources)))
 
 ########################################

diff --git a/README-ci-failures.md b/README-ci-failures.md
@@ -19,7 +19,7 @@ for the changes before attempting to deploy the fixed script.
 ## Integration test failures
 
 If your CI error is related to a timeout logged by one of the integration test
-runnners, this is a known issue and re-running the test in the Buildkite 
+runners, this is a known issue and re-running the test in the Buildkite 
 interface will usually succeed.
 
 If an issue arises, please post an update in both `development` on the Mina
@@ -32,7 +32,7 @@ The CI runs its jobs in multiple Docker images. The images that it is using are
 specified in `buildkite/src/Constants/COntainerImages.dhall`: the CI uses all
 Debian images prefixed by `minaToolchainBuster`.
 
-Theses images are generated by the CI itself, in particular based on the content of the
+These images are generated by the CI itself, in particular based on the content of the
 `dockerfiles` directory and the `opam.export` file (which describes versions of
 OCaml packages). If you PR modifies how the images are generated (for example by
 changing a package version in `opam.export`), then the CI will not automatically