diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3fc13b23f61ebb3f92815d20e93283b1e6ddb03b..cb02c35df017a3cf3b493df364879cf2b1b1713d 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/manifest/main.ml b/manifest/main.ml index 2c0e23e89a6c82e1b169655a4d7231c547e6f8e9..a2d2b8a8ccc2145cbfc23b97b0ca59cc9f9afa69 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 0742cfccc97bc286997f65e5613f5f1230a7a030..07be7002c921d2a16a43b040a88d595040c4f056 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 09b6be7fd94fe74ea3f8f0a90bb48a4abdc14f85..cdd9beee0de0de33de85f078700789ef7e21be22 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 c5797475fba135f02f6bc94d0943e1b06f9fa734..177faba01d7de419d703d74540ab07675787cc0d 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 5b62360981903f95c574fe7291d07ab91da1681c..4a17b4d5e925faaa85a4daf7c6ca151747217a11 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 2faca42435c2c9d9c3a78e16c2a4b9d2de7ff370..8cda3456f7d26a1d46a7242801d4f217629fc932 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 3990e8438eb4307a1c17642fde468679cab0d1dc..65302d805546373dd47987551193e455a450d260 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 3769f0770fc79c444e1d5bef320a6f1f616a7b13..8574c1b46dc2a6fcc4f92aacad4cccfaf6a130e0 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 6700c45aae6c7792dd6617f37ce4707cecd5e2e9..25116ba6387de443c3a43970475ccc95279a4af5 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 396ac2b18e65a11322572c44e8de335fd47bfbf2..311091d53572ebb062babd7d0f3d0f0f5ff974f1 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" diff --git a/scripts/version.sh b/scripts/version.sh index c0df56a8709567d534c8d832d37ce84f30dc0085..60c56b262c2efd9555489b3d54dd44cce2261537 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" diff --git a/src/bin_node/node_storage_command.ml b/src/bin_node/node_storage_command.ml index 4c6fa73cb0f32fd27f3b47e524f432ef495c538e..ae41146c70f211ed94e8917a4c07704169026ec8 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 dcf3ba89e8c51e5d17915691d884a1716b386bd4..318ac9f7429ed5d9a0478fa7fc9ababf6dbe1a43 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 =