diff --git a/Cargo.lock b/Cargo.lock index c06ef54b..ef73b30d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,11 +44,10 @@ checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" [[package]] name = "aqua-interpreter-interface" version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cf8c8116a5a3ba83aa9319895281b8ed602d473adaca9d58f84557a6c8942b5" +source = "git+https://github.com/fluencelabs/air?branch=bwu#693ead1e677a65af1b50f32d8d78061e98e51492" dependencies = [ "fluence 0.4.2", - "fluence-it-types 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "fluence-it-types", "serde", ] @@ -882,24 +881,14 @@ dependencies = [ [[package]] name = "fluence-it-types" version = "0.2.0" -source = "git+https://github.com/fluencelabs/interface-types?branch=optimizations#8de882c159eef7b53d8a7fc290a0c6aa011722a7" +source = "git+https://github.com/fluencelabs/interface-types?rev=9095389a5af6e5e334be898437cee5b13f5b4909#9095389a5af6e5e334be898437cee5b13f5b4909" dependencies = [ - "it-to-bytes 0.1.0 (git+https://github.com/fluencelabs/interface-types?branch=optimizations)", + "it-to-bytes", "nom", "serde", "wast", ] -[[package]] -name = "fluence-it-types" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c3c0b0dea71548d1781f2bb974ded7490ebc7de5837f7f5e2f3a9debc4ce4f" -dependencies = [ - "it-to-bytes 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde", -] - [[package]] name = "fluence-sdk-macro" version = "0.4.2" @@ -1359,9 +1348,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.6" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f006b8784cfb01fe7aa9c46f5f5cd4cf5c85a8c612a0653ec97642979062665" +checksum = "1e5f105c494081baa3bf9e200b279e27ec1623895cd504c7dbef8d0b080fcf54" dependencies = [ "bytes 1.0.1", "futures-channel", @@ -1401,7 +1390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.0.1", - "hyper 0.14.6", + "hyper 0.14.7", "native-tls", "tokio 1.5.0", "tokio-native-tls", @@ -1506,9 +1495,10 @@ checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" [[package]] name = "it-lilo-utils" version = "0.1.0" -source = "git+https://github.com/fluencelabs/interface-types?branch=optimizations#8de882c159eef7b53d8a7fc290a0c6aa011722a7" +source = "git+https://github.com/fluencelabs/interface-types?rev=9095389a5af6e5e334be898437cee5b13f5b4909#9095389a5af6e5e334be898437cee5b13f5b4909" dependencies = [ - "fluence-it-types 0.2.0 (git+https://github.com/fluencelabs/interface-types?branch=optimizations)", + "fluence-it-types", + "log", "paste", "thiserror", ] @@ -1516,13 +1506,7 @@ dependencies = [ [[package]] name = "it-to-bytes" version = "0.1.0" -source = "git+https://github.com/fluencelabs/interface-types?branch=optimizations#8de882c159eef7b53d8a7fc290a0c6aa011722a7" - -[[package]] -name = "it-to-bytes" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "729c74bb4236418898a219c6d96f14cba77456dd7c04a2e99e65e9c643709b56" +source = "git+https://github.com/fluencelabs/interface-types?rev=9095389a5af6e5e334be898437cee5b13f5b4909#9095389a5af6e5e334be898437cee5b13f5b4909" [[package]] name = "itertools" @@ -2264,9 +2248,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.4.5" +version = "1.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19" +checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759" dependencies = [ "aho-corasick", "memchr", @@ -2336,7 +2320,7 @@ dependencies = [ "futures-util", "http", "http-body 0.4.1", - "hyper 0.14.6", + "hyper 0.14.7", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -3302,11 +3286,11 @@ dependencies = [ [[package]] name = "wasmer-interface-types-fl" version = "0.20.0" -source = "git+https://github.com/fluencelabs/interface-types?branch=optimizations#8de882c159eef7b53d8a7fc290a0c6aa011722a7" +source = "git+https://github.com/fluencelabs/interface-types?rev=9095389a5af6e5e334be898437cee5b13f5b4909#9095389a5af6e5e334be898437cee5b13f5b4909" dependencies = [ - "fluence-it-types 0.2.0 (git+https://github.com/fluencelabs/interface-types?branch=optimizations)", + "fluence-it-types", "it-lilo-utils", - "it-to-bytes 0.1.0 (git+https://github.com/fluencelabs/interface-types?branch=optimizations)", + "it-to-bytes", "itertools 0.10.0", "log", "nom", diff --git a/Cargo.toml b/Cargo.toml index d099a14d..e677bee1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,3 +34,13 @@ lto = true debug-assertions = false overflow-checks = false panic = "abort" + +[patch.crates-io] +fluence-it-types = { git = "https://github.com/fluencelabs/interface-types", rev = "9095389a5af6e5e334be898437cee5b13f5b4909" } +wasmer-wit = { package = "wasmer-interface-types-fl", git = "https://github.com/fluencelabs/interface-types", rev = "9095389a5af6e5e334be898437cee5b13f5b4909" } +it-lilo-utils = { git = "https://github.com/fluencelabs/interface-types", rev = "9095389a5af6e5e334be898437cee5b13f5b4909" } +aqua-interpreter-interface = { git = "https://github.com/fluencelabs/air", branch = "bwu" } + +#[patch."https://github.com/fluencelabs/interface-types"] +#it-lilo-utils = { rev = "9095389a5af6e5e334be898437cee5b13f5b4909" } +#wasmer-interface-types-fl = { git = "https://github.com/fluencelabs/interface-types", rev = "9095389a5af6e5e334be898437cee5b13f5b4909" } diff --git a/crates/wit-generator/Cargo.toml b/crates/wit-generator/Cargo.toml index 18de7e79..c8650d37 100644 --- a/crates/wit-generator/Cargo.toml +++ b/crates/wit-generator/Cargo.toml @@ -14,8 +14,8 @@ path = "src/lib.rs" fce-wit-parser = { path = "../wit-parser", version = "0.4.0"} fluence-sdk-wit = { git = "https://github.com/fluencelabs/rust-sdk", branch = "optimizations" } -wasmer-wit = { package = "wasmer-interface-types-fl", git = "https://github.com/fluencelabs/interface-types", branch = "optimizations" } -it-lilo-utils = { git = "https://github.com/fluencelabs/interface-types", branch = "optimizations" } +wasmer-wit = { package = "wasmer-interface-types-fl" } +it-lilo-utils = { } thiserror = "1.0.24" walrus = "0.18.0" diff --git a/crates/wit-interfaces/Cargo.toml b/crates/wit-interfaces/Cargo.toml index 87b00b52..c2933656 100644 --- a/crates/wit-interfaces/Cargo.toml +++ b/crates/wit-interfaces/Cargo.toml @@ -11,5 +11,5 @@ name = "fce_wit_interfaces" path = "src/lib.rs" [dependencies] -wasmer-wit = { package = "wasmer-interface-types-fl", git = "https://github.com/fluencelabs/interface-types", branch = "optimizations" } +wasmer-wit = { package = "wasmer-interface-types-fl" } multimap = "0.8.1" diff --git a/crates/wit-parser/Cargo.toml b/crates/wit-parser/Cargo.toml index 6ad9ca5e..a519370e 100644 --- a/crates/wit-parser/Cargo.toml +++ b/crates/wit-parser/Cargo.toml @@ -16,7 +16,7 @@ fce-wit-interfaces = { path = "../wit-interfaces", version = "0.2.0" } anyhow = "1.0.31" walrus = "0.18.0" wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0"} -wasmer-wit = { package = "wasmer-interface-types-fl", git = "https://github.com/fluencelabs/interface-types", branch = "optimizations" } +wasmer-wit = { package = "wasmer-interface-types-fl" } nom = "5.1" semver = "0.11.0" diff --git a/engine/Cargo.toml b/engine/Cargo.toml index be12032d..4cf5c7d3 100644 --- a/engine/Cargo.toml +++ b/engine/Cargo.toml @@ -20,8 +20,8 @@ fce-utils = { path = "../crates/utils", version = "0.1.29" } wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" } # dynamicfunc-fat-closures allows using state inside DynamicFunc wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["dynamicfunc-fat-closures"] } -wasmer-wit = { package = "wasmer-interface-types-fl", git = "https://github.com/fluencelabs/interface-types", branch = "optimizations" } -it-lilo-utils = { git = "https://github.com/fluencelabs/interface-types", branch = "optimizations" } +wasmer-wit = { package = "wasmer-interface-types-fl" } +it-lilo-utils = { } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } multimap = "0.8.1" diff --git a/fluence-faas/Cargo.toml b/fluence-faas/Cargo.toml index 4a6787ab..1f9b70ee 100644 --- a/fluence-faas/Cargo.toml +++ b/fluence-faas/Cargo.toml @@ -16,7 +16,7 @@ wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" } # dynamicfunc-fat-closures allows using state inside DynamicFunc wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["dynamicfunc-fat-closures"] } wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" } -wasmer-wit = { package = "wasmer-interface-types-fl", git = "https://github.com/fluencelabs/interface-types", branch = "optimizations" } +wasmer-wit = { package = "wasmer-interface-types-fl" } toml = "0.5.6" serde = { version = "=1.0.118", features = ["derive"] }