From 05bbd6f455edf74265fd4f89fa5f91dde1e73b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Wed, 18 Jan 2023 17:10:32 +0100 Subject: [PATCH 1/3] Manifest: fix mtime version constraints --- manifest/main.ml | 2 +- opam/tezos-stdlib-unix.opam | 2 +- opam/virtual/octez-deps.opam | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index 650a76d44c9b..e3bdb3731e71 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -219,7 +219,7 @@ let lwt_unix = external_sublib lwt "lwt.unix" let lwt_watcher = external_lib "lwt-watcher" V.(exactly "0.2") -let mtime = external_lib ~js_compatible:true "mtime" V.(at_least "1.2.0") +let mtime = external_lib ~js_compatible:true "mtime" V.(at_least "1.4.0") let mtime_clock_os = external_sublib mtime "mtime.clock.os" diff --git a/opam/tezos-stdlib-unix.opam b/opam/tezos-stdlib-unix.opam index c2f9c765a055..a4165a096328 100644 --- a/opam/tezos-stdlib-unix.opam +++ b/opam/tezos-stdlib-unix.opam @@ -20,7 +20,7 @@ depends: [ "re" { >= "1.9.0" } "ezjsonm" { >= "1.1.0" } "ptime" { >= "1.0.0" } - "mtime" { >= "1.2.0" } + "mtime" { >= "1.4.0" } "lwt_log" "conf-libev" "uri" { >= "3.1.0" } diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 885a3990a346..4c7f004375f0 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -53,7 +53,7 @@ depends: [ "lwt-exit" "lwt-watcher" { = "0.2" } "lwt_log" - "mtime" { >= "1.2.0" } + "mtime" { >= "1.4.0" } "num" "ocaml-migrate-parsetree" "ocamlformat" { = "0.21.0" } -- GitLab From 39b0b9b51f66d60382f400e9bafcd2abe8a42411 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Thu, 19 Jan 2023 07:49:21 +0100 Subject: [PATCH 2/3] Manifest: fix upper-bound for mtime version constraint --- manifest/main.ml | 6 +++++- opam/tezos-stdlib-unix.opam | 2 +- opam/virtual/octez-deps.opam | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index e3bdb3731e71..e58013ffc529 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -219,7 +219,11 @@ let lwt_unix = external_sublib lwt "lwt.unix" let lwt_watcher = external_lib "lwt-watcher" V.(exactly "0.2") -let mtime = external_lib ~js_compatible:true "mtime" V.(at_least "1.4.0") +let mtime = + external_lib + ~js_compatible:true + "mtime" + V.(at_least "1.4.0" && less_than "2.0.0") let mtime_clock_os = external_sublib mtime "mtime.clock.os" diff --git a/opam/tezos-stdlib-unix.opam b/opam/tezos-stdlib-unix.opam index a4165a096328..8931f45ba764 100644 --- a/opam/tezos-stdlib-unix.opam +++ b/opam/tezos-stdlib-unix.opam @@ -20,7 +20,7 @@ depends: [ "re" { >= "1.9.0" } "ezjsonm" { >= "1.1.0" } "ptime" { >= "1.0.0" } - "mtime" { >= "1.4.0" } + "mtime" { >= "1.4.0" & < "2.0.0" } "lwt_log" "conf-libev" "uri" { >= "3.1.0" } diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 4c7f004375f0..3e3e8ccf4c4b 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -53,7 +53,7 @@ depends: [ "lwt-exit" "lwt-watcher" { = "0.2" } "lwt_log" - "mtime" { >= "1.4.0" } + "mtime" { >= "1.4.0" & < "2.0.0" } "num" "ocaml-migrate-parsetree" "ocamlformat" { = "0.21.0" } -- GitLab From 572ddbe48edbd3598ab0d168c33740ea7960a756 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Proust?= Date: Thu, 19 Jan 2023 12:09:09 +0100 Subject: [PATCH 3/3] Manifest: fix lower-bound version constraint for secp-internal --- manifest/main.ml | 2 +- opam/tezos-crypto.opam | 2 +- opam/virtual/octez-deps.opam | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/manifest/main.ml b/manifest/main.ml index e58013ffc529..6c972e7c037b 100644 --- a/manifest/main.ml +++ b/manifest/main.ml @@ -314,7 +314,7 @@ let aches = external_lib ~js_compatible:true "aches" V.(at_least "1.0.0") let aches_lwt = external_lib "aches-lwt" V.(at_least "1.0.0") let secp256k1_internal = - let version = V.(at_least "0.3.0") in + let version = V.(at_least "0.4.0") in external_lib ~npm_deps:[Npm.make "@nomadic-labs/secp256k1-wasm" version] ~js_compatible:true diff --git a/opam/tezos-crypto.opam b/opam/tezos-crypto.opam index 4fb869d895cd..371299374881 100644 --- a/opam/tezos-crypto.opam +++ b/opam/tezos-crypto.opam @@ -14,7 +14,7 @@ depends: [ "tezos-lwt-result-stdlib" "lwt" { >= "5.6.0" } "tezos-hacl" - "secp256k1-internal" { >= "0.3.0" } + "secp256k1-internal" { >= "0.4.0" } "tezos-error-monad" "tezos-rpc" "aches" { >= "1.0.0" } diff --git a/opam/virtual/octez-deps.opam b/opam/virtual/octez-deps.opam index 3e3e8ccf4c4b..ac0b322593ec 100644 --- a/opam/virtual/octez-deps.opam +++ b/opam/virtual/octez-deps.opam @@ -85,7 +85,7 @@ depends: [ "resto-cohttp-server" { >= "1.0" } "resto-directory" { >= "1.0" } "ringo" { >= "1.0.0" } - "secp256k1-internal" { >= "0.3.0" } + "secp256k1-internal" { >= "0.4.0" } "tar" "tar-unix" { >= "2.0.1" & < "3.0.0" } "tezos-bls12-381-polynomial" { >= "1.0.1" & < "2.0.0" } diff --git a/package-lock.json b/package-lock.json index 6cfbea46f2a7..a65b5a849809 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,7 +7,7 @@ "license": "n/a", "dependencies": { "@dannywillems/ocaml-bls12-381": ">=5.0.0 <5.1.0", - "@nomadic-labs/secp256k1-wasm": ">=0.3.0", + "@nomadic-labs/secp256k1-wasm": ">=0.4.0", "hacl-wasm": ">=1.2.0 <1.3.0" } }, @@ -17,9 +17,9 @@ "integrity": "sha1-CfFSlhsC5Foa3Kl3zve71YmCli4=" }, "node_modules/@nomadic-labs/secp256k1-wasm": { - "version": "0.3.0", - "resolved": "https://gitlab.com/api/v4/projects/17524462/packages/npm/@nomadic-labs/secp256k1-wasm/-/@nomadic-labs/secp256k1-wasm-0.3.0.tgz", - "integrity": "sha1-e/1LR2wtYFrfa9Ye3LWu1b/fjZc=" + "version": "0.4.0", + "resolved": "https://gitlab.com/api/v4/projects/17524462/packages/npm/@nomadic-labs/secp256k1-wasm/-/@nomadic-labs/secp256k1-wasm-0.4.0.tgz", + "integrity": "sha1-Ll5cmCToW/dc1T/gVseEMHR1reY=" }, "node_modules/hacl-wasm": { "version": "1.2.0", @@ -34,9 +34,9 @@ "integrity": "sha1-CfFSlhsC5Foa3Kl3zve71YmCli4=" }, "@nomadic-labs/secp256k1-wasm": { - "version": "0.3.0", - "resolved": "https://gitlab.com/api/v4/projects/17524462/packages/npm/@nomadic-labs/secp256k1-wasm/-/@nomadic-labs/secp256k1-wasm-0.3.0.tgz", - "integrity": "sha1-e/1LR2wtYFrfa9Ye3LWu1b/fjZc=" + "version": "0.4.0", + "resolved": "https://gitlab.com/api/v4/projects/17524462/packages/npm/@nomadic-labs/secp256k1-wasm/-/@nomadic-labs/secp256k1-wasm-0.4.0.tgz", + "integrity": "sha1-Ll5cmCToW/dc1T/gVseEMHR1reY=" }, "hacl-wasm": { "version": "1.2.0", diff --git a/package.json b/package.json index f18b5c672197..5bcb0679ab6e 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "license": "n/a", "dependencies": { "@dannywillems/ocaml-bls12-381": ">=5.0.0 <5.1.0", - "@nomadic-labs/secp256k1-wasm": ">=0.3.0", + "@nomadic-labs/secp256k1-wasm": ">=0.4.0", "hacl-wasm": ">=1.2.0 <1.3.0" } } -- GitLab