From d9658f4d5bf1b104f089be33f94078ed3d0c6568 Mon Sep 17 00:00:00 2001 From: Serban Iorga Date: Thu, 31 Aug 2023 15:20:51 +0300 Subject: [PATCH] Fix equivocation detection containers startup (#2516) (#2517) * Fix equivocation detection containers startup * Fix cargo deny --- Cargo.lock | 18 +++++++++--------- .../bridges/rialto-millau/docker-compose.yml | 14 +++++++------- .../rialto-parachain-millau/docker-compose.yml | 16 ++++++++-------- .../bridges/westend-millau/docker-compose.yml | 10 +++++----- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 645159d5d47b..8d06c8a56e92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3999,7 +3999,7 @@ checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", "rustls 0.20.8", - "webpki 0.22.0", + "webpki 0.22.1", ] [[package]] @@ -5653,7 +5653,7 @@ dependencies = [ "ring", "rustls 0.20.8", "thiserror", - "webpki 0.22.0", + "webpki 0.22.1", "x509-parser 0.14.0", "yasna", ] @@ -9870,7 +9870,7 @@ dependencies = [ "thiserror", "tinyvec", "tracing", - "webpki 0.22.0", + "webpki 0.22.1", ] [[package]] @@ -10992,7 +10992,7 @@ dependencies = [ "log", "ring", "sct 0.7.0", - "webpki 0.22.0", + "webpki 0.22.1", ] [[package]] @@ -14727,7 +14727,7 @@ checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ "rustls 0.20.8", "tokio", - "webpki 0.22.0", + "webpki 0.22.1", ] [[package]] @@ -15103,7 +15103,7 @@ version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ - "cfg-if 1.0.0", + "cfg-if 0.1.10", "digest 0.10.7", "rand 0.8.5", "static_assertions", @@ -15728,9 +15728,9 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" dependencies = [ "ring", "untrusted", @@ -15742,7 +15742,7 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.0", + "webpki 0.22.1", ] [[package]] diff --git a/deployments/bridges/rialto-millau/docker-compose.yml b/deployments/bridges/rialto-millau/docker-compose.yml index 9b80dfcf47a8..17225f60db24 100644 --- a/deployments/bridges/rialto-millau/docker-compose.yml +++ b/deployments/bridges/rialto-millau/docker-compose.yml @@ -1,4 +1,4 @@ -# Exposed ports: 10016, 10116, 10216, 10316, 10416, 10516, 10716 +# Exposed ports: 10000-10005 version: '3.5' services: @@ -28,7 +28,7 @@ services: RUST_LOG: rpc=trace,bridge=trace GLOBAL_DEPLOYMENTS: $GLOBAL_DEPLOYMENTS ports: - - "10016:9616" + - "10000:9616" depends_on: &all-nodes - millau-node-alice - millau-node-bob @@ -48,7 +48,7 @@ services: RUST_LOG: bridge=trace entrypoint: /entrypoints/relay-messages-to-rialto-generator-entrypoint.sh ports: - - "10216:9616" + - "10001:9616" depends_on: - relay-millau-rialto @@ -58,7 +58,7 @@ services: RUST_LOG: bridge=trace entrypoint: /entrypoints/relay-messages-to-rialto-resubmitter-entrypoint.sh ports: - - "10316:9616" + - "10002:9616" depends_on: - relay-messages-millau-to-rialto-generator @@ -68,7 +68,7 @@ services: RUST_LOG: bridge=trace entrypoint: /entrypoints/relay-messages-to-millau-generator-entrypoint.sh ports: - - "10516:9616" + - "10003:9616" depends_on: - relay-millau-rialto @@ -78,7 +78,7 @@ services: RUST_LOG: bridge=trace entrypoint: /entrypoints/detect-millau-to-rialto-equivocations-entrypoint.sh ports: - - "10616:9616" + - "10004:9616" depends_on: - relay-millau-rialto @@ -88,7 +88,7 @@ services: RUST_LOG: bridge=trace entrypoint: /entrypoints/detect-rialto-to-millau-equivocations-entrypoint.sh ports: - - "10716:9616" + - "10005:9616" depends_on: - relay-millau-rialto diff --git a/deployments/bridges/rialto-parachain-millau/docker-compose.yml b/deployments/bridges/rialto-parachain-millau/docker-compose.yml index 9fc920bf5cc9..0efa05c2ab52 100644 --- a/deployments/bridges/rialto-parachain-millau/docker-compose.yml +++ b/deployments/bridges/rialto-parachain-millau/docker-compose.yml @@ -1,4 +1,4 @@ -# Exposed ports: 10816, 10916, 11016, 11017, 11018 +# Exposed ports: 10100-10106 version: '3.5' services: @@ -27,7 +27,7 @@ services: environment: RUST_LOG: rpc=trace,bridge=trace ports: - - "10816:9616" + - "10100:9616" depends_on: &all-nodes - millau-node-alice - millau-node-bob @@ -46,11 +46,11 @@ services: EXT_MILLAU_RELAY_ACCOUNT_HEADERS_OVERRIDE: //RialtoParachain.RialtoHeadersRelay2 EXT_RIALTO_PARACHAIN_RELAY_ACCOUNT: //Millau.HeadersAndMessagesRelay2 ports: - - "10916:9616" + - "10101:9616" relay-messages-millau-to-rialto-parachain-generator: <<: *sub-bridge-relay ports: - - "11016:9616" + - "10102:9616" entrypoint: /entrypoints/relay-messages-to-rialto-parachain-generator-entrypoint.sh depends_on: - relay-millau-rialto-parachain-1 @@ -59,7 +59,7 @@ services: <<: *sub-bridge-relay entrypoint: /entrypoints/relay-messages-to-millau-generator-entrypoint.sh ports: - - "11017:9616" + - "10103:9616" depends_on: - relay-millau-rialto-parachain-1 @@ -69,7 +69,7 @@ services: RUST_LOG: bridge=trace entrypoint: /entrypoints/relay-messages-to-rialto-parachain-resubmitter-entrypoint.sh ports: - - "11018:9616" + - "10104:9616" depends_on: - relay-messages-millau-to-rialto-parachain-generator @@ -79,7 +79,7 @@ services: RUST_LOG: bridge=trace entrypoint: /entrypoints/detect-millau-to-rialto-parachain-equivocations-entrypoint.sh ports: - - "11019:9616" + - "10105:9616" depends_on: - relay-millau-rialto-parachain-1 @@ -89,7 +89,7 @@ services: RUST_LOG: bridge=trace entrypoint: /entrypoints/detect-rialto-to-millau-equivocations-entrypoint.sh ports: - - "11020:9616" + - "10106:9616" depends_on: - relay-millau-rialto-parachain-1 diff --git a/deployments/bridges/westend-millau/docker-compose.yml b/deployments/bridges/westend-millau/docker-compose.yml index bddba4d42e01..f339c61f6946 100644 --- a/deployments/bridges/westend-millau/docker-compose.yml +++ b/deployments/bridges/westend-millau/docker-compose.yml @@ -1,4 +1,4 @@ -# Exposed ports: 10616, 10617, 10618, 10619 +# Exposed ports: 10200-10203 version: '3.5' services: @@ -10,7 +10,7 @@ services: environment: RUST_LOG: rpc=trace,bridge=trace ports: - - "10616:9616" + - "10200:9616" depends_on: - millau-node-alice @@ -23,7 +23,7 @@ services: RUST_LOG: rpc=trace,bridge=trace EXT_RELAY_ACCOUNT: //Westend.HeadersRelay2 ports: - - "10617:9616" + - "10201:9616" depends_on: - millau-node-alice @@ -35,7 +35,7 @@ services: environment: RUST_LOG: rpc=trace,bridge=trace ports: - - "10618:9616" + - "10202:9616" depends_on: - millau-node-alice @@ -48,7 +48,7 @@ services: RUST_LOG: rpc=trace,bridge=trace EXT_RELAY_ACCOUNT: //Westend.AssetHubWestendHeaders2 ports: - - "10619:9616" + - "10203:9616" depends_on: - millau-node-alice