diff --git a/tee-worker/Cargo.lock b/tee-worker/Cargo.lock index db04271794..4b81c022b2 100644 --- a/tee-worker/Cargo.lock +++ b/tee-worker/Cargo.lock @@ -480,7 +480,7 @@ dependencies = [ "sgx_tstd", "tungstenite 0.14.0", "tungstenite 0.15.0", - "url 2.5.0 (git+https://github.com/domenukk/rust-url?branch=no_std)", + "url 2.5.0 (git+https://github.com/domenukk/rust-url?rev=316c868)", "webpki 0.21.4 (registry+https://github.com/rust-lang/crates.io-index)", "webpki 0.21.4 (git+https://github.com/mesalock-linux/webpki?branch=mesalock_sgx)", ] @@ -2399,9 +2399,9 @@ dependencies = [ [[package]] name = "form_urlencoded" version = "1.2.1" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ - "percent-encoding 2.3.1 (git+https://github.com/domenukk/rust-url?branch=no_std)", + "percent-encoding 2.3.1 (git+https://github.com/domenukk/rust-url?rev=316c868)", ] [[package]] @@ -3433,7 +3433,7 @@ dependencies = [ "sgx_tstd", "tungstenite 0.14.0", "tungstenite 0.15.0", - "url 2.5.0 (git+https://github.com/domenukk/rust-url?branch=no_std)", + "url 2.5.0 (git+https://github.com/domenukk/rust-url?rev=316c868)", "webpki 0.21.4 (registry+https://github.com/rust-lang/crates.io-index)", "webpki 0.21.4 (git+https://github.com/mesalock-linux/webpki?branch=mesalock_sgx)", ] @@ -3705,7 +3705,7 @@ dependencies = [ [[package]] name = "idna" version = "0.5.0" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ "unicode-bidi 0.3.13", "unicode-normalization 0.1.22", @@ -3928,7 +3928,7 @@ dependencies = [ "sgx_tstd", "thiserror 1.0.44", "thiserror 1.0.9", - "url 2.5.0 (git+https://github.com/domenukk/rust-url?branch=no_std)", + "url 2.5.0 (git+https://github.com/domenukk/rust-url?rev=316c868)", ] [[package]] @@ -5142,7 +5142,7 @@ dependencies = [ "sgx_tstd", "thiserror 1.0.44", "thiserror 1.0.9", - "url 2.5.0 (git+https://github.com/domenukk/rust-url?branch=no_std)", + "url 2.5.0 (git+https://github.com/domenukk/rust-url?rev=316c868)", ] [[package]] @@ -5236,7 +5236,7 @@ dependencies = [ "sgx_tstd", "sp-core", "thiserror 1.0.9", - "url 2.5.0 (git+https://github.com/domenukk/rust-url?branch=no_std)", + "url 2.5.0 (git+https://github.com/domenukk/rust-url?rev=316c868)", ] [[package]] @@ -6991,7 +6991,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "percent-encoding" version = "2.3.1" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" [[package]] name = "pest" @@ -10138,12 +10138,12 @@ dependencies = [ [[package]] name = "url" version = "2.5.0" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ - "form_urlencoded 1.2.1 (git+https://github.com/domenukk/rust-url?branch=no_std)", - "idna 0.5.0 (git+https://github.com/domenukk/rust-url?branch=no_std)", + "form_urlencoded 1.2.1 (git+https://github.com/domenukk/rust-url?rev=316c868)", + "idna 0.5.0 (git+https://github.com/domenukk/rust-url?rev=316c868)", "no-std-net", - "percent-encoding 2.3.1 (git+https://github.com/domenukk/rust-url?branch=no_std)", + "percent-encoding 2.3.1 (git+https://github.com/domenukk/rust-url?rev=316c868)", ] [[package]] diff --git a/tee-worker/Cargo.toml b/tee-worker/Cargo.toml index 07f58471b0..9d0ce9666b 100644 --- a/tee-worker/Cargo.toml +++ b/tee-worker/Cargo.toml @@ -150,7 +150,7 @@ musig2 = { git = "https://github.com/kziemianek/musig2", branch = "master", feat rlp = { version = "0.5", default-features = false } sha3 = { version = "0.10", default-features = false } -url = { git = "https://github.com/domenukk/rust-url", branch = "no_std", default-features = false, features = ["alloc", "no_std_net"] } +url = { git = "https://github.com/domenukk/rust-url", rev = "316c868", default-features = false, features = ["alloc", "no_std_net"] } substrate-api-client = { git = "https://github.com/scs/substrate-api-client", branch = "polkadot-v0.9.42-tag-v0.14.0", default-features = false, features = ["sync-api"] } substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.42-tag-v0.14.0" } diff --git a/tee-worker/bitacross/enclave-runtime/Cargo.lock b/tee-worker/bitacross/enclave-runtime/Cargo.lock index 0062a3972d..13f5be90f5 100644 --- a/tee-worker/bitacross/enclave-runtime/Cargo.lock +++ b/tee-worker/bitacross/enclave-runtime/Cargo.lock @@ -1100,11 +1100,6 @@ version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" -[[package]] -name = "data-url" -version = "0.2.0" -source = "git+https://github.com/integritee-network/rust-url?branch=sgx-no-std#947f64c7b03d6817dd725dfb7c436c27e316e35d" - [[package]] name = "der" version = "0.6.1" @@ -1325,7 +1320,7 @@ dependencies = [ "sgx_types", "sp-core", "sp-runtime", - "url 2.3.1", + "url 2.5.0", "webpki", ] @@ -1528,18 +1523,10 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" -[[package]] -name = "form_urlencoded" -version = "1.1.0" -source = "git+https://github.com/integritee-network/rust-url?branch=sgx-no-std#947f64c7b03d6817dd725dfb7c436c27e316e35d" -dependencies = [ - "percent-encoding 2.2.0", -] - [[package]] name = "form_urlencoded" version = "1.2.1" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ "percent-encoding 2.3.1", ] @@ -2060,19 +2047,10 @@ dependencies = [ "unicode-normalization 0.1.12", ] -[[package]] -name = "idna" -version = "0.3.0" -source = "git+https://github.com/integritee-network/rust-url?branch=sgx-no-std#947f64c7b03d6817dd725dfb7c436c27e316e35d" -dependencies = [ - "unicode-bidi 0.3.15", - "unicode-normalization 0.1.23", -] - [[package]] name = "idna" version = "0.5.0" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ "unicode-bidi 0.3.15", "unicode-normalization 0.1.23", @@ -3294,15 +3272,10 @@ name = "percent-encoding" version = "2.1.0" source = "git+https://github.com/mesalock-linux/rust-url-sgx?tag=sgx_1.1.3#23832f3191456c2d4a0faab10952e1747be58ca8" -[[package]] -name = "percent-encoding" -version = "2.2.0" -source = "git+https://github.com/integritee-network/rust-url?branch=sgx-no-std#947f64c7b03d6817dd725dfb7c436c27e316e35d" - [[package]] name = "percent-encoding" version = "2.3.1" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" [[package]] name = "pin-project-lite" @@ -5152,24 +5125,12 @@ dependencies = [ "sgx_tstd", ] -[[package]] -name = "url" -version = "2.3.1" -source = "git+https://github.com/integritee-network/rust-url?branch=sgx-no-std#947f64c7b03d6817dd725dfb7c436c27e316e35d" -dependencies = [ - "data-url", - "form_urlencoded 1.1.0", - "idna 0.3.0", - "no-std-net", - "percent-encoding 2.2.0", -] - [[package]] name = "url" version = "2.5.0" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ - "form_urlencoded 1.2.1", + "form_urlencoded", "idna 0.5.0", "no-std-net", "percent-encoding 2.3.1", diff --git a/tee-worker/bitacross/enclave-runtime/Cargo.toml b/tee-worker/bitacross/enclave-runtime/Cargo.toml index 064b3b8181..46c845c23d 100644 --- a/tee-worker/bitacross/enclave-runtime/Cargo.toml +++ b/tee-worker/bitacross/enclave-runtime/Cargo.toml @@ -66,7 +66,7 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] } ipfs-unixfs = { default-features = false, git = "https://github.com/whalelephant/rust-ipfs", branch = "w-nstd" } lazy_static = { version = "1.1.0", features = ["spin_no_std"] } primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "serde_no_std"] } -url = { git = "https://github.com/integritee-network/rust-url", branch = "sgx-no-std", default-features = false, features = ["alloc"] } +url = { git = "https://github.com/domenukk/rust-url", rev = "316c868", default-features = false, features = ["alloc", "no_std_net"] } # scs / integritee jsonrpc-core = { default-features = false, git = "https://github.com/scs/jsonrpc", branch = "no_std_v18" } diff --git a/tee-worker/common/core/tls-websocket-server/Cargo.toml b/tee-worker/common/core/tls-websocket-server/Cargo.toml index 09f648f951..fe0120c2d8 100644 --- a/tee-worker/common/core/tls-websocket-server/Cargo.toml +++ b/tee-worker/common/core/tls-websocket-server/Cargo.toml @@ -32,7 +32,7 @@ sp-core = { workspace = true, features = ["full_crypto"] } [dev-dependencies] env_logger = { workspace = true } rustls = { workspace = true, features = ["dangerous_configuration"] } -url = { version = "2.0.0" } # no workspace dep +url = { version = "2.0.0" } [features] default = ["std"] diff --git a/tee-worker/identity/enclave-runtime/Cargo.lock b/tee-worker/identity/enclave-runtime/Cargo.lock index de7a5089bf..f58e8b3d13 100644 --- a/tee-worker/identity/enclave-runtime/Cargo.lock +++ b/tee-worker/identity/enclave-runtime/Cargo.lock @@ -1311,7 +1311,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" version = "1.2.1" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ "percent-encoding 2.3.1", ] @@ -2165,7 +2165,7 @@ dependencies = [ [[package]] name = "idna" version = "0.5.0" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ "unicode-bidi 0.3.15", "unicode-normalization 0.1.23", @@ -3997,7 +3997,7 @@ source = "git+https://github.com/mesalock-linux/rust-url-sgx?tag=sgx_1.1.3#23832 [[package]] name = "percent-encoding" version = "2.3.1" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" [[package]] name = "pin-project-lite" @@ -5912,7 +5912,7 @@ dependencies = [ [[package]] name = "url" version = "2.5.0" -source = "git+https://github.com/domenukk/rust-url?branch=no_std#316c8683206f3cb741163779bb30963fa05b3612" +source = "git+https://github.com/domenukk/rust-url?rev=316c868#316c8683206f3cb741163779bb30963fa05b3612" dependencies = [ "form_urlencoded", "idna 0.5.0", diff --git a/tee-worker/identity/enclave-runtime/Cargo.toml b/tee-worker/identity/enclave-runtime/Cargo.toml index 283d1fcedf..16edb0f9ac 100644 --- a/tee-worker/identity/enclave-runtime/Cargo.toml +++ b/tee-worker/identity/enclave-runtime/Cargo.toml @@ -78,7 +78,7 @@ hex = { version = "0.4.3", default-features = false, features = ["alloc"] } ipfs-unixfs = { default-features = false, git = "https://github.com/whalelephant/rust-ipfs", branch = "w-nstd" } lazy_static = { version = "1.1.0", features = ["spin_no_std"] } primitive-types = { version = "0.12.1", default-features = false, features = ["codec", "serde_no_std"] } -url = { git = "https://github.com/domenukk/rust-url", branch = "no_std", default-features = false, features = ["alloc", "no_std_net"] } +url = { git = "https://github.com/domenukk/rust-url", rev = "316c868", default-features = false, features = ["alloc", "no_std_net"] } # scs / integritee jsonrpc-core = { default-features = false, git = "https://github.com/scs/jsonrpc", branch = "no_std_v18" } diff --git a/tee-worker/identity/sidechain/consensus/common/src/peer_block_sync.rs b/tee-worker/identity/sidechain/consensus/common/src/peer_block_sync.rs index 481714a878..866888e38c 100644 --- a/tee-worker/identity/sidechain/consensus/common/src/peer_block_sync.rs +++ b/tee-worker/identity/sidechain/consensus/common/src/peer_block_sync.rs @@ -55,6 +55,7 @@ where } /// Sidechain peer block sync implementation. +#[allow(dead_code)] pub struct PeerBlockSync< ParentchainBlock, SignedSidechainBlock, @@ -218,9 +219,14 @@ where // We confirm the successful block import. Only in this case, not when we're in // on-boarding and importing blocks that were fetched from a peer. - if let Err(e) = self.import_confirmation_handler.confirm_import(sidechain_block.block().header(), &shard_identifier) { - error!("Failed to confirm sidechain block import: {:?}", e); - } + // + // Litentry: disable it for now, see P-1091 + // the parachain storage is not updated upon shard migration, so submitting this extrinsic with new shard will fail. + // Additionally, confirmation of sidechain block import doesn't bring anything right now + // + // if let Err(e) = self.import_confirmation_handler.confirm_import(sidechain_block.block().header(), &shard_identifier) { + // error!("Failed to confirm sidechain block import: {:?}", e); + // } Ok(latest_parentchain_header) },