diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 325c275b221353ffb7123191b1a84b9b19c0fc62..955dd0cac282b3a8c4eaea5c5a12632dd4ce0f0a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -293,7 +293,7 @@ g1_data: - rm g1-dump.tgz - mv tmp/backup-g1-duniter-1.8.7 duniter_default # py-g1-migrator conversion - - git clone https://git.duniter.org/tools/py-g1-migrator.git --depth 1 --branch hugo/docker /py-g1-migrator + - git clone https://git.duniter.org/tools/py-g1-migrator.git --depth 1 /py-g1-migrator - cd /py-g1-migrator # Export genesis file - ./main.py # ./output/genesis.json @@ -303,7 +303,7 @@ g1_data: - ./squid-tx.py # ./output/tx_hist.json # Make the exported file available for next jobs - mkdir -p $CI_PROJECT_DIR/release/ - - cp output/genesis.json $RELEASE_FILE_G1_DATA + - cp output/genesis.json $CI_PROJECT_DIR/$RELEASE_FILE_G1_DATA - cp output/block_hist.json $CI_PROJECT_DIR/release/ - cp output/cert_hist.json $CI_PROJECT_DIR/release/ - cp output/tx_hist.json $CI_PROJECT_DIR/release/ diff --git a/Cargo.lock b/Cargo.lock index 297d0cc531f6e0cc47f02f46dfbd1714254e6adf..402c36e0921273e5f27d32ac3e5e1e586090769f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4214,6 +4214,23 @@ dependencies = [ "tokio-rustls 0.24.1", ] +[[package]] +name = "hyper-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0bea761b46ae2b24eb4aef630d8d1c398157b6fc29e6350ecf090a0b70c952c" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.3.1", + "hyper-util", + "rustls 0.22.4", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.25.0", + "tower-service", +] + [[package]] name = "hyper-util" version = "0.1.3" @@ -4637,7 +4654,7 @@ checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" dependencies = [ "async-trait", "hyper 0.14.28", - "hyper-rustls", + "hyper-rustls 0.24.2", "jsonrpsee-core", "jsonrpsee-types", "serde", @@ -5185,7 +5202,7 @@ dependencies = [ "rw-stream-sink", "soketto", "url", - "webpki-roots", + "webpki-roots 0.22.6", ] [[package]] @@ -8026,6 +8043,7 @@ dependencies = [ "http-body 1.0.0", "http-body-util", "hyper 1.3.1", + "hyper-rustls 0.26.0", "hyper-util", "ipnet", "js-sys", @@ -8034,16 +8052,21 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite 0.2.14", + "rustls 0.22.4", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper", "tokio", + "tokio-rustls 0.25.0", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots 0.26.3", "winreg 0.52.0", ] @@ -9102,7 +9125,7 @@ dependencies = [ "futures 0.3.30", "futures-timer", "hyper 0.14.28", - "hyper-rustls", + "hyper-rustls 0.24.2", "libp2p", "log", "num_cpus", @@ -12884,6 +12907,15 @@ dependencies = [ "webpki", ] +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "weight-analyzer" version = "1.0.0" diff --git a/Cargo.toml b/Cargo.toml index 3f19f2f604cf5972860963725ce9a830f226cdea..d4bf56c2b7074b610b4f142e672acdbe6589231b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -65,7 +65,7 @@ placeholder = { version = "1.1.4", default-features = false } getrandom = { version = "0.2.12", default-features = false } clap = { version = "4.5.3" } clap_complete = { version = "4.5.1" } -reqwest = { version = "0.12.0", default-features = false } +reqwest = { version = "0.12.0", default-features = false, features = ["rustls-tls"] } glob = { version = "0.3.1", default-features = false } convert_case = { version = "0.6.0", default-features = false } subweight-core = { version = "3.3.1", default-features = false }