diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6044ffd946efc06872d27aeb010f9d7c91c4b7a2..16a8e85987b737767257dc0199a2524d22edb73b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -33,7 +33,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: f75ae248f97f82ed70c683c567b5cb958eca8795 + build_deps_image_version: b95158f1d22c9aaf9cbf5450299dfbdc18b294be build_deps_image_name: "${CI_REGISTRY}/tezos/opam-repository" GIT_STRATEGY: fetch GIT_DEPTH: "1" diff --git a/CHANGES.rst b/CHANGES.rst index fa1af89360c61faaccde7f4efaa18dd966613756..d96447245493ea4b72dae3e2c4527ec0861c0e63 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -152,6 +152,9 @@ Node - Replaced some "precheck" occurrences with "validate" in event and error identifiers and messages. (MR :gl: `!7513`) +- Fixed a issue that may trigger unknown keys errors while reading the + context on a read-only instance. + Client ------ diff --git a/manifest/main.ml b/manifest/main.ml index becbaebba2d37aec05e0e5d53d52e703cd9e6c40..42b9bbea24439d0cd2579f4f71358e39b4713509 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -182,10 +182,10 @@ let ipaddr = let ipaddr_unix = external_sublib ipaddr "ipaddr.unix" -let irmin = external_lib "irmin" V.(at_least "3.5.1" && less_than "3.6.0") +let irmin = external_lib "irmin" V.(at_least "3.5.2" && less_than "3.6.0") let irmin_pack = - external_lib "irmin-pack" V.(at_least "3.5.1" && less_than "3.6.0") + external_lib "irmin-pack" V.(at_least "3.5.2" && less_than "3.6.0") let irmin_pack_unix = external_sublib irmin_pack "irmin-pack.unix" diff --git a/opam/octez-dal-node.opam b/opam/octez-dal-node.opam index d7c2bc8366355f7869b68486ead97b8c3295edbe..459297624905677b7ab491e4ce26e38993867e74 100644 --- a/opam/octez-dal-node.opam +++ b/opam/octez-dal-node.opam @@ -24,8 +24,8 @@ depends: [ "tezos-dal-node-services" "tezos-layer2-store" "tezos-crypto-dal" - "irmin-pack" { >= "3.5.1" & < "3.6.0" } - "irmin" { >= "3.5.1" & < "3.6.0" } + "irmin-pack" { >= "3.5.2" & < "3.6.0" } + "irmin" { >= "3.5.2" & < "3.6.0" } "tezos-dal-016-PtMumbai" ] depopts: [ diff --git a/opam/octez-smart-rollup-node-PtMumbai.opam b/opam/octez-smart-rollup-node-PtMumbai.opam index f6bcf772f77eb8926dea70ab1aa1e0c10a946dc7..de784f2f96c5952c5209b4cee58570a5907e9351 100644 --- a/opam/octez-smart-rollup-node-PtMumbai.opam +++ b/opam/octez-smart-rollup-node-PtMumbai.opam @@ -30,8 +30,8 @@ depends: [ "tezos-layer2-utils-016-PtMumbai" "tezos-layer2-store" "data-encoding" { >= "0.7.1" & < "1.0.0" } - "irmin-pack" { >= "3.5.1" & < "3.6.0" } - "irmin" { >= "3.5.1" & < "3.6.0" } + "irmin-pack" { >= "3.5.2" & < "3.6.0" } + "irmin" { >= "3.5.2" & < "3.6.0" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "tezos-injector-016-PtMumbai" diff --git a/opam/octez-smart-rollup-node-alpha.opam b/opam/octez-smart-rollup-node-alpha.opam index 1dfd5665940ac3c1aad0f35d8812a9e4188aaf49..5073cbd05c5fd345d1c847a910da7e3338d310a4 100644 --- a/opam/octez-smart-rollup-node-alpha.opam +++ b/opam/octez-smart-rollup-node-alpha.opam @@ -30,8 +30,8 @@ depends: [ "tezos-layer2-utils-alpha" "tezos-layer2-store" "data-encoding" { >= "0.7.1" & < "1.0.0" } - "irmin-pack" { >= "3.5.1" & < "3.6.0" } - "irmin" { >= "3.5.1" & < "3.6.0" } + "irmin-pack" { >= "3.5.2" & < "3.6.0" } + "irmin" { >= "3.5.2" & < "3.6.0" } "aches" { >= "1.0.0" } "aches-lwt" { >= "1.0.0" } "tezos-injector-alpha" diff --git a/opam/tezos-context.opam b/opam/tezos-context.opam index 74f30a52784aa6e0d1c14160313ba11c8f831fb2..46da4518462b3fe55f7b9b239b1965d3c90b624a 100644 --- a/opam/tezos-context.opam +++ b/opam/tezos-context.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "tezos-base" "tezos-stdlib" - "irmin" { >= "3.5.1" & < "3.6.0" } - "irmin-pack" { >= "3.5.1" & < "3.6.0" } + "irmin" { >= "3.5.2" & < "3.6.0" } + "irmin-pack" { >= "3.5.2" & < "3.6.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 870cd410cbe6cd3757b27a7cc5e15a02c0c1db48..afc8b11b33c5cc46269b62c6db85bfa5267efd28 100644 --- a/opam/tezos-layer2-store.opam +++ b/opam/tezos-layer2-store.opam @@ -11,8 +11,8 @@ depends: [ "dune" { >= "3.0" } "index" { >= "1.6.0" & < "1.7.0" } "tezos-base" - "irmin-pack" { >= "3.5.1" & < "3.6.0" } - "irmin" { >= "3.5.1" & < "3.6.0" } + "irmin-pack" { >= "3.5.2" & < "3.6.0" } + "irmin" { >= "3.5.2" & < "3.6.0" } "aches-lwt" { >= "1.0.0" } "tezos-stdlib-unix" "tezos-context" diff --git a/opam/tezos-store.opam b/opam/tezos-store.opam index f87be3ea7b2b4773852568a870a49445ffc3ae3d..ebeceaa9cc0d00c872d922a476a7a4243085e599 100644 --- a/opam/tezos-store.opam +++ b/opam/tezos-store.opam @@ -18,7 +18,7 @@ depends: [ "tezos-validation" "tezos-version" "index" { >= "1.6.0" & < "1.7.0" } - "irmin-pack" { >= "3.5.1" & < "3.6.0" } + "irmin-pack" { >= "3.5.2" & < "3.6.0" } "tezos-protocol-environment" "tezos-context" "tezos-context-ops" diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 165bb47c124970931429b361245e25bd7ba811cf..e87a7addbf99a371986c306ec082cda77f65e8ba 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.5.1" & < "3.6.0" } - "irmin-pack" { >= "3.5.1" & < "3.6.0" } + "irmin" { >= "3.5.2" & < "3.6.0" } + "irmin-pack" { >= "3.5.2" & < "3.6.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 8ddf05fe6b90be9e7ed643a5ac98638058b4527a..decdb79a075bb31ca1823a93c5231aec03e22abb 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=7f0579750a745ea92dc2fe3869d491902e2c29dd +export full_opam_repository_tag=83a6f7bc4a32e413840cf4a20afb1557fca38a5e ## opam_repository is an additional, tezos-specific opam repository. ## This value MUST be the same as `build_deps_image_version` in `.gitlab/ci/templates.yml export opam_repository_url=https://gitlab.com/tezos/opam-repository -export opam_repository_tag="${OPAM_REPOSITORY_TAG:-f75ae248f97f82ed70c683c567b5cb958eca8795}" +export opam_repository_tag="${OPAM_REPOSITORY_TAG:-b95158f1d22c9aaf9cbf5450299dfbdc18b294be}" export opam_repository_git="$opam_repository_url.git" export opam_repository="$opam_repository_git"\#"$opam_repository_tag"