From 5618bbff96cbb57041993ea2aa3711c29b104a90 Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Wed, 26 Apr 2023 17:10:50 +0200 Subject: [PATCH 1/3] Manifest: upgrade to irmin.3.7.2 --- manifest/main.ml | 4 ++-- opam/octez-dac-node.opam | 4 ++-- opam/octez-dal-node.opam | 4 ++-- opam/octez-smart-rollup-node-PtMumbai.opam | 4 ++-- opam/octez-smart-rollup-node-PtNairob.opam | 4 ++-- opam/octez-smart-rollup-node-alpha.opam | 4 ++-- opam/tezos-context.opam | 4 ++-- opam/tezos-layer2-store.opam | 4 ++-- opam/tezos-store.opam | 2 +- opam/virtual/octez-deps.opam | 4 ++-- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 2c0e23e89a6c..a2d2b8a8ccc2 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -177,10 +177,10 @@ let ipaddr = let ipaddr_unix = external_sublib ipaddr "ipaddr.unix" -let irmin = external_lib "irmin" V.(at_least "3.6.1" && less_than "3.7.0") +let irmin = external_lib "irmin" V.(at_least "3.7.2" && less_than "3.8.0") let irmin_pack = - external_lib "irmin-pack" V.(at_least "3.6.1" && less_than "3.7.0") + external_lib "irmin-pack" V.(at_least "3.7.2" && less_than "3.8.0") let irmin_pack_unix = external_sublib irmin_pack "irmin-pack.unix" diff --git a/opam/octez-dac-node.opam b/opam/octez-dac-node.opam index 0742cfccc97b..07be7002c921 100644 --- a/opam/octez-dac-node.opam +++ b/opam/octez-dac-node.opam @@ -23,8 +23,8 @@ depends: [ "tezos-stdlib" "tezos-dac-node-lib" "tezos-layer2-store" - "irmin-pack" { >= "3.6.1" & < "3.7.0" } - "irmin" { >= "3.6.1" & < "3.7.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } + "irmin" { >= "3.7.2" & < "3.8.0" } "tezos-dac-017-PtNairob" ] depopts: [ diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index 09b6be7fd94f..cdd9beee0de0 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -31,8 +31,8 @@ depends: [ "tezos-p2p" "tezos-p2p-services" "tezos-crypto" - "irmin-pack" { >= "3.6.1" & < "3.7.0" } - "irmin" { >= "3.6.1" & < "3.7.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } + "irmin" { >= "3.7.2" & < "3.8.0" } "tezos-dal-016-PtMumbai" "tezos-dal-017-PtNairob" ] diff --git a/opam/octez-smart-rollup-node-PtMumbai.opam b/opam/octez-smart-rollup-node-PtMumbai.opam index c5797475fba1..177faba01d7d 100644 --- a/opam/octez-smart-rollup-node-PtMumbai.opam +++ b/opam/octez-smart-rollup-node-PtMumbai.opam @@ -33,8 +33,8 @@ depends: [ "octez-crawler" "tezos-tree-encoding" "data-encoding" { >= "0.7.1" & < "1.0.0" } - "irmin-pack" { >= "3.6.1" & < "3.7.0" } - "irmin" { >= "3.6.1" & < "3.7.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } + "irmin" { >= "3.7.2" & < "3.8.0" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "octez-injector" diff --git a/opam/octez-smart-rollup-node-PtNairob.opam b/opam/octez-smart-rollup-node-PtNairob.opam index 5b6236098190..4a17b4d5e925 100644 --- a/opam/octez-smart-rollup-node-PtNairob.opam +++ b/opam/octez-smart-rollup-node-PtNairob.opam @@ -33,8 +33,8 @@ depends: [ "octez-crawler" "tezos-tree-encoding" "data-encoding" { >= "0.7.1" & < "1.0.0" } - "irmin-pack" { >= "3.6.1" & < "3.7.0" } - "irmin" { >= "3.6.1" & < "3.7.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } + "irmin" { >= "3.7.2" & < "3.8.0" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "octez-injector" diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index 2faca42435c2..8cda3456f7d2 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -36,8 +36,8 @@ depends: [ "octez-crawler" "tezos-tree-encoding" "data-encoding" { >= "0.7.1" & < "1.0.0" } - "irmin-pack" { >= "3.6.1" & < "3.7.0" } - "irmin" { >= "3.6.1" & < "3.7.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } + "irmin" { >= "3.7.2" & < "3.8.0" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "octez-injector" diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam index 3990e8438eb4..65302d805546 100644 --- a/opam/tezos-context.opam +++ b/opam/tezos-context.opam @@ -12,8 +12,8 @@ depends: [ "ocaml" { >= "4.14" } "tezos-base" "tezos-stdlib" - "irmin" { >= "3.6.1" & < "3.7.0" } - "irmin-pack" { >= "3.6.1" & < "3.7.0" } + "irmin" { >= "3.7.2" & < "3.8.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } "tezos-stdlib-unix" "fmt" { >= "0.8.7" } "bigstringaf" { >= "0.5.0" } diff --git a/opam/tezos-layer2-store.opam b/opam/tezos-layer2-store.opam index 3769f0770fc7..8574c1b46dc2 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/tezos-layer2-store.opam @@ -12,8 +12,8 @@ depends: [ "ocaml" { >= "4.14" } "index" { >= "1.6.0" & < "1.7.0" } "tezos-base" - "irmin-pack" { >= "3.6.1" & < "3.7.0" } - "irmin" { >= "3.6.1" & < "3.7.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } + "irmin" { >= "3.7.2" & < "3.8.0" } "aches-lwt" { >= "1.0.0" } "tezos-stdlib-unix" "tezos-context" diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index 6700c45aae6c..25116ba6387d 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -19,7 +19,7 @@ depends: [ "tezos-validation" "tezos-version" "index" { >= "1.6.0" & < "1.7.0" } - "irmin-pack" { >= "3.6.1" & < "3.7.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } "tezos-protocol-environment" "tezos-context" "tezos-context-ops" diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 396ac2b18e65..311091d53572 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -43,8 +43,8 @@ depends: [ "integers" "integers_stubs_js" "ipaddr" { >= "5.0.0" & < "6.0.0" } - "irmin" { >= "3.6.1" & < "3.7.0" } - "irmin-pack" { >= "3.6.1" & < "3.7.0" } + "irmin" { >= "3.7.2" & < "3.8.0" } + "irmin-pack" { >= "3.7.2" & < "3.8.0" } "json-data-encoding" { >= "0.12" & < "0.13" } "ledgerwallet-tezos" { >= "0.3.0" } "logs" -- GitLab From 193cd1c86c67b0b02cc31f9690864841cb6acc9a Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Mon, 13 Mar 2023 15:20:16 +0100 Subject: [PATCH 2/3] Node: conform to irmin.3.7 api --- src/bin_node/node_storage_command.ml | 2 ++ src/lib_store/unix/snapshots.ml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/bin_node/node_storage_command.ml b/src/bin_node/node_storage_command.ml index 4c6fa73cb0f3..ae41146c70f2 100644 --- a/src/bin_node/node_storage_command.ml +++ b/src/bin_node/node_storage_command.ml @@ -125,10 +125,12 @@ module Term = struct let* root = root config_file data_dir in let*! () = Tezos_context.Context.Checks.Pack.Integrity_check.run + ~ppf:Format.std_formatter ~root ~auto_repair ~always:false ~heads:None + () in return_unit) diff --git a/src/lib_store/unix/snapshots.ml b/src/lib_store/unix/snapshots.ml index dcf3ba89e8c5..318ac9f7429e 100644 --- a/src/lib_store/unix/snapshots.ml +++ b/src/lib_store/unix/snapshots.ml @@ -4172,10 +4172,12 @@ module Make_snapshot_importer (Importer : IMPORTER) : Snapshot_importer = struct ~msg:"Checking context integrity" @@ fun () -> Context.Checks.Pack.Integrity_check.run + ?ppf:None ~root:dst_context_dir ~auto_repair:false ~always:false ~heads:(Some [Context_hash.to_b58check imported_context_hash]) + () else Lwt.return_unit in let* block_validation_result = -- GitLab From 8ba67ce28f9be8b27af2fe34bcd990a4943a923f Mon Sep 17 00:00:00 2001 From: Victor Allombert Date: Fri, 16 Jun 2023 16:00:57 +0200 Subject: [PATCH 3/3] Build: update dependencies --- .gitlab-ci.yml | 2 +- scripts/version.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3fc13b23f61e..cb02c35df017 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,7 +36,7 @@ variables: # /!\ CI_REGISTRY is overriden to use a private Docker registry mirror in AWS ECR # in GitLab namespaces `nomadic-labs` and `tezos` ## This value MUST be the same as `opam_repository_tag` in `scripts/version.sh` - build_deps_image_version: 6e167662a09cc0f9d295af63f704bdd0c1603684 + build_deps_image_version: 21b28468b394f9bdaf0383a89ebf0cc96b3b8d02 build_deps_image_name: "${CI_REGISTRY}/tezos/opam-repository" GIT_STRATEGY: fetch GIT_DEPTH: "1" diff --git a/scripts/version.sh b/scripts/version.sh index c0df56a87095..60c56b262c2e 100755 --- a/scripts/version.sh +++ b/scripts/version.sh @@ -20,12 +20,12 @@ export recommended_node_version=16.18.1 ## full_opam_repository is a commit hash of the public OPAM repository, i.e. ## https://github.com/ocaml/opam-repository -export full_opam_repository_tag=8f3e687679802b20b0ddcca7e9031108751f8e08 +export full_opam_repository_tag=01f6a0905760e389a567ee124839f7b2e4c3864e ## opam_repository is an additional, tezos-specific opam repository. ## This value MUST be the same as `build_deps_image_version` in `.gitlab-ci.yml` export opam_repository_url=https://gitlab.com/tezos/opam-repository -export opam_repository_tag="${OPAM_REPOSITORY_TAG:-6e167662a09cc0f9d295af63f704bdd0c1603684}" +export opam_repository_tag="${OPAM_REPOSITORY_TAG:-21b28468b394f9bdaf0383a89ebf0cc96b3b8d02}" export opam_repository_git="$opam_repository_url.git" export opam_repository="$opam_repository_git"\#"$opam_repository_tag" -- GitLab