Skip to content

Commit d45f4a2

Browse files
authored
Merge pull request #17954 from MinaProtocol/lyh/rocksdb-10.5.1-for-non-nix
Bump RocksDB to 10.5.1 for non-nix builds
2 parents 86ab30a + d5e0954 commit d45f4a2

File tree

8 files changed

+24
-23
lines changed

8 files changed

+24
-23
lines changed

buildkite/src/Constants/ContainerImages.dhall

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,22 @@
55
{ toolchainBase = "codaprotocol/ci-toolchain-base:v3"
66
, minaToolchainBookworm =
77
{ amd64 =
8-
"gcr.io/o1labs-192920/mina-toolchain@sha256:dfa8a0eb32742900d890590875a7f7436545cd46d8c4ff147fc6a29997e5d4f3"
8+
"gcr.io/o1labs-192920/mina-toolchain@sha256:a3517722b1573ac19f9361d42aa0b5f15a108d62fa73f97f0a74e195af1a2e90"
99
, arm64 =
10-
"gcr.io/o1labs-192920/mina-toolchain@sha256:8e92e0b4c9202e0e5f31afd48713d28bde903959ff7e55cbc1c080b0a8df5e3d"
10+
"gcr.io/o1labs-192920/mina-toolchain@sha256:b4a7040b64473f89e51372ab6e11f9332730e085766aa157c25e28c6b9c0c6d4"
1111
}
1212
, minaToolchainBullseye.amd64 =
13-
"gcr.io/o1labs-192920/mina-toolchain@sha256:bcc6b9899d5d99c83287c2735fb686a6169268d48b11262d9dfa03c1dfd0cece"
13+
"gcr.io/o1labs-192920/mina-toolchain@sha256:524a3fb77d6702f38ad63ec737e398478e082387753b8d01e1ccf607d2917343"
1414
, minaToolchainNoble =
1515
{ amd64 =
16-
"gcr.io/o1labs-192920/mina-toolchain@sha256:0c6f1c0921c7f76be7b86948e1f9e82d8270002fc19f0b48647bb1604489268f"
16+
"gcr.io/o1labs-192920/mina-toolchain@sha256:3fd6ebfedb905ba358903639c2ebcdbd2277316b854d80f12c74df8dcd83734b"
1717
, arm64 =
18-
"gcr.io/o1labs-192920/mina-toolchain@sha256:182f0aa05988c5a00cc1ca5a5b651904282f3a0f7cd75faabe0a52e7d332cecb"
18+
"gcr.io/o1labs-192920/mina-toolchain@sha256:adfff17bf21b79efc3b2d54d0648049a36fa7b54b732773bd7f2f651869c1f54"
1919
}
2020
, minaToolchainJammy.amd64 =
21-
"gcr.io/o1labs-192920/mina-toolchain@sha256:a3e5c7dc30c67d8a9769deee282f0b5b2a513629bf272aa9b9ec7d6aee68a4e4"
21+
"gcr.io/o1labs-192920/mina-toolchain@sha256:6db30a6faf94f7dcc23a14bcbc01d558b2164955067fd21eb92a981fe231dfe1"
2222
, minaToolchain =
23-
"gcr.io/o1labs-192920/mina-toolchain@sha256:bcc6b9899d5d99c83287c2735fb686a6169268d48b11262d9dfa03c1dfd0cece"
23+
"gcr.io/o1labs-192920/mina-toolchain@sha256:524a3fb77d6702f38ad63ec737e398478e082387753b8d01e1ccf607d2917343"
2424
, postgres = "postgres:12.4-alpine"
2525
, xrefcheck =
2626
"dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"

changes/17954.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Mina Daemon now use RocksDB 10.5.1 under the hood to parse genesis/epoch ledger tars. It's tested that RocksDB preserved backward compatibility on the ledger tars we serve with old RocksDB version.

dockerfiles/stages/1-build-deps

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ ARG OPAM_VERSION=2.3.0
4545
# `nix flake update opam-repository`).
4646
# - scripts/update_opam_switch.sh
4747
ARG OPAM_REPOSITORY_COMMIT=08d8c16c16dc6b23a5278b06dff0ac6c7a217356
48-
ARG O1LABS_OPAM_REPOSITORY_COMMIT=cabde639f92d259d4c131b00200d7a53d854ee74
48+
ARG O1LABS_OPAM_REPOSITORY_COMMIT=dd90c5c72b7b7caeca3db3224b2503924deea08a
4949

5050
# Golang version number used to detemine tarball name
5151
ARG GO_VERSION=1.19.11

flake.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@
3131
inputs.describe-dune.inputs.nixpkgs.follows = "nixpkgs";
3232
inputs.describe-dune.inputs.flake-utils.follows = "utils";
3333

34-
inputs.o1-opam-repository.url = "github:o1-labs/opam-repository/cabde639f92d259d4c131b00200d7a53d854ee74";
34+
inputs.o1-opam-repository.url = "github:o1-labs/opam-repository/dd90c5c72b7b7caeca3db3224b2503924deea08a";
3535
inputs.o1-opam-repository.flake = false;
3636

3737
# The version must be the same as the version used in:
3838
# - dockerfiles/1-build-deps
3939
# - flake.nix (and flake.lock after running
4040
# `nix flake update opam-repository`).
41-
# - scripts/update_opam_switch.sh
41+
# - scripts/update-opam-switch.sh
4242
inputs.opam-repository.url =
4343
"github:ocaml/opam-repository/08d8c16c16dc6b23a5278b06dff0ac6c7a217356";
4444
inputs.opam-repository.flake = false;

nix/ocaml.nix

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,9 @@ let
6666
};
6767

6868
rocksdb_stubs =
69-
# TODO uncomment after updating rocksdb_stubs to 10.5.1
70-
# assert (super.rocksdb_stubs.version == pkgs.rocksdb-mina.version)
71-
# || builtins.throw
72-
# "rocksdb_stubs version (${super.rocksdb_stubs.version}) does not match rocksdb-mina version (${pkgs.rocksdb-mina.version})";
69+
assert (super.rocksdb_stubs.version == pkgs.rocksdb-mina.version)
70+
|| builtins.throw
71+
"rocksdb_stubs version (${super.rocksdb_stubs.version}) does not match rocksdb-mina version (${pkgs.rocksdb-mina.version})";
7372
super.rocksdb_stubs.overrideAttrs {
7473
MINA_ROCKSDB = "${pkgs.rocksdb-mina}/lib/librocksdb.a";
7574
};

opam.export

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ roots: [
4949
"qcheck-alcotest.0.20"
5050
"re2.v0.14.0"
5151
"rocks.0.2.0"
52-
"rocksdb_stubs.10.2.1"
52+
"rocksdb_stubs.10.5.1"
5353
"rpc_parallel.v0.14.0"
5454
"sexp_diff_kernel.v0.14.0"
5555
"sodium.dev"
@@ -250,7 +250,7 @@ installed: [
250250
"res.5.0.1"
251251
"result.1.5"
252252
"rocks.0.2.0"
253-
"rocksdb_stubs.10.2.1"
253+
"rocksdb_stubs.10.5.1"
254254
"rpc_parallel.v0.14.0"
255255
"rresult.0.6.0"
256256
"seq.base"

scripts/update-opam-switch.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ ocaml_version=4.14.2
2929
# - flake.nix (and flake.lock after running
3030
# `nix flake update opam-repository`).
3131
# - scripts/update_opam_switch.sh
32-
opam_repository_commit=08d8c16c16dc6b23a5278b06dff0ac6c7a217356
32+
OPAM_REPOSITORY_COMMIT=08d8c16c16dc6b23a5278b06dff0ac6c7a217356
33+
O1LABS_OPAM_REPOSITORY_COMMIT=dd90c5c72b7b7caeca3db3224b2503924deea08a
3334

3435
if [[ -d _opam ]]; then
3536
read -rp "Directory '_opam' exists and will be removed. You can also bypass the check by setting the variable BYPASS_OPAM_SWITCH_UPDATE to any value. Continue? [y/N] " \
@@ -48,14 +49,14 @@ if [[ ! -d "${switch_dir}" ]]; then
4849
# We add o1-labs opam repository and make it default
4950
# (if it's repeated, it's a no-op)
5051
opam repository add --yes --set-default o1-labs \
51-
https://github.com/o1-labs/opam-repository.git
52+
"https://github.com/o1-labs/opam-repository.git#${O1LABS_OPAM_REPOSITORY_COMMIT}"
5253
# The default opam repository is set to a specific commit as some of our
5354
# dependencies have been archived.
5455
# See https://github.com/MinaProtocol/mina/pull/17450
5556
opam repository \
5657
set-url \
5758
default \
58-
"git+https://github.com/ocaml/opam-repository.git#${opam_repository_commit}"
59+
"git+https://github.com/ocaml/opam-repository.git#${OPAM_REPOSITORY_COMMIT}"
5960
opam update
6061
opam switch import -y --switch . opam.export
6162
mkdir -p opam_switches

0 commit comments

Comments
 (0)