Skip to content

Commit cd52995

Browse files
authored
Merge pull request #17186 from MinaProtocol/dw/merge-compatible-into-develop-20250513
Merge compatible into develop - 20250513
2 parents dece7b9 + 3df6f8e commit cd52995

File tree

75 files changed

+1398
-949
lines changed

Some content is hidden

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

75 files changed

+1398
-949
lines changed

Makefile

Lines changed: 161 additions & 74 deletions
Large diffs are not rendered by default.

changes/16966.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
RAM optimization: use disk cache to store proofs from zkapp transactions and complete works. In RAM proofs are replaced with integer tags that refer to an entry in LMDB database which stores actual proof bytes. This optimization caps RAM usage of Mina node even under high transaction loads at a much lower value than was achieved before (precise number to be comnfirmed from experiments that will follow).

nix/ocaml.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,6 @@ let
300300
"dune"
301301
"dune-project"
302302
"./graphql_schema.json"
303-
".ocamlformat"
304303
"opam.export"
305304
];
306305
};

scripts/container.sh

Lines changed: 0 additions & 43 deletions
This file was deleted.

scripts/debug-dist-coda.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

scripts/get-wallet-keys.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

scripts/node-status-crawl.py

Lines changed: 0 additions & 122 deletions
This file was deleted.

scripts/update-opam-switch.sh

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,27 @@ cd "$SCRIPT_DIR/.."
1010

1111
sum="$(cksum opam.export | grep -oE '^\S*')"
1212
switch_dir=opam_switches/"$sum"
13-
rm -Rf _opam
14-
if [[ ! -d "$switch_dir" ]]; then
15-
# We add o1-labs opam repository and make it default (if it's repeated, it's a no-op)
16-
opam repository add --yes --all --set-default o1-labs https://github.com/o1-labs/opam-repository.git
17-
opam update
18-
opam switch import -y --switch . opam.export
19-
mkdir -p opam_switches
20-
mv _opam "$switch_dir"
13+
14+
if [[ -d _opam ]]; then
15+
read -rp "Directory '_opam' exists and will be removed. Continue? [y/N] " \
16+
confirm
17+
if [[ "${confirm}" =~ ^[Yy]$ ]]; then
18+
rm -Rf _opam
19+
else
20+
echo "Aborted."
21+
exit 1
22+
fi
23+
fi
24+
25+
if [[ ! -d "${switch_dir}" ]]; then
26+
# We add o1-labs opam repository and make it default
27+
# (if it's repeated, it's a no-op)
28+
opam repository add --yes --all --set-default o1-labs \
29+
https://github.com/o1-labs/opam-repository.git
30+
opam update
31+
opam switch import -y --switch . opam.export
32+
mkdir -p opam_switches
33+
mv _opam "${switch_dir}"
2134
fi
22-
ln -s "$switch_dir" _opam
35+
36+
ln -s "${switch_dir}" _opam
File renamed without changes.

src/app/benchmarks/.ocamlformat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../.ocamlformat

0 commit comments

Comments
 (0)