diff --git a/Cargo.lock b/Cargo.lock index 26d6635f9..f77c8e301 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2363,7 +2363,7 @@ dependencies = [ "actix-web", "actix-web-lab", "anyhow", - "base64 0.13.1", + "base64 0.21.7", "bincode", "clap 4.4.18", "dirs 3.0.2", diff --git a/Cargo.toml b/Cargo.toml index 1afd9a20f..4cdae3287 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,21 +1,20 @@ [workspace] resolver = "2" members = [ - "crates/jstz_core", - "crates/jstz_api", - "crates/jstz_proto", - "crates/jstz_crypto", - "crates/jstz_kernel", - "crates/jstz_cli", - "crates/jstz_node", - "crates/jstz_wpt", - "crates/octez", - "crates/jstz_rollup", - "crates/jstz_sdk", - "crates/jstz_mock" + "crates/jstz_api", + "crates/jstz_cli", + "crates/jstz_core", + "crates/jstz_crypto", + "crates/jstz_kernel", + "crates/jstz_mock", + "crates/jstz_node", + "crates/jstz_proto", + "crates/jstz_rollup", + "crates/jstz_sdk", + "crates/jstz_wpt", + "crates/octez" ] - [workspace.package] edition = "2021" version = "0.1.0-alpha.0" @@ -28,18 +27,76 @@ license-file = "LICENSE" description = "JavaScript server runtime for Tezos Smart Rollups" [workspace.dependencies] -jstz_core = { version = "0.1.0-alpha.0", path = "crates/jstz_core" } -jstz_api = { version = "0.1.0-alpha.0", path = "crates/jstz_api" } -jstz_kernel = { version = "0.1.0-alpha.0", path = "crates/jstz_kernel" } -jstz_proto = { version = "0.1.0-alpha.0", path = "crates/jstz_proto" } -jstz_crypto = { version = "0.1.0-alpha.0", path = "crates/jstz_crypto" } -jstz_node = { version = "0.1.0-alpha.0", path = "crates/jstz_node" } -jstz_cli = { version = "0.1.0-alpha.0", path = "crates/jstz_cli" } -jstz_wpt = { version = "0.1.0-alpha.0", path = "crates/jstz_wpt" } -octez = { version = "0.1.0-alpha.0", path = "crates/octez" } -jstz_rollup = { version = "0.1.0-alpha.0", path = "crates/jstz_rollup" } -jstz_sdk = { version = "0.1.0-alpha.0", path = "crates/jstz_sdk" } -jstz_mock = { version = "0.1.0-alpha.0", path = "crates/jstz_mock" } +actix-cors = "0.6.5" +actix-web = "4.5.1" +actix-web-lab = "0.20.0" +ansi_term = "0.12.1" +anyhow = "1.0.82" +base64 = "0.21.7" +bincode = "1.3.3" +boa_engine = { version = "0.17.0", features = ["fuzz"] } +boa_gc = "0.17.0" +bs58 = "0.5" +bytes = "1.4.0" +chrono = { version = "0.4.34", default-features = false, features = ["std"] } +clap = { version = "^4.4", features = ["derive"] } +clap_complete = "4.4.10" +console = "0.15.8" +crossterm = "0.27" +ctrlc = "3.4.2" +daemonize = "0.5.0" +derive_more = "0.99.17" +dialoguer = "0.11.0" +dirs = "3.0" +either = "1.9.0" +encoding_rs = "0.8.33" +env_logger = "0.11.1" +erased-serde = "0.4.2" +expect-test = "1.4.1" +fastrand = "2.0.1" +figment = { version = "0.10.12", features = ["json", "env"] } +form_urlencoded = "1.2.0" +fs_extra = "1.2" +futures = "0.3" +futures-util = "0.3.30" +getrandom = { version = "0.2.12", features = ["custom"] } +hex = "0.4.3" +http = "1.0.0" +http-serde = "2.0.0" +in-container = "^1" +indicatif = "0.17.0" +log = "0.4.20" +nix = { version = "^0.27.1", features = ["process", "signal"] } +num-traits = "0.2.16" +parking_lot = "0.12.1" +prettytable = "0.10.0" +proptest = "1.1" +rand = "0.8" +regex = "1" +reqwest = { version = "0.11.24", features = ["json"] } +reqwest-eventsource = "0.5.0" +rustyline = "14.0.0" +serde = { version = "1.0.196", features = ["derive"] } +serde-wasm-bindgen = "0.6.5" +serde_json = "1.0.107" +serde_with = { version = "3.6.1", features = ["macros"] } +serde_yaml = "0.9" +sha2 = "0.10" +signal-hook = "0.3.17" +simplelog = "0.11" +spinners = "4.1.1" +syntect = "5.2.0" +tempfile = "3.10.0" +tezos_data_encoding = "0.6.0" +thiserror = "1.0.56" +tiny-bip39 = "1.0.0" +tl = "0.7.7" +tokio = { version = "1.36.0", features = ["full"] } +tokio-stream = "0.1.14" +tokio-util = "0.7.10" +url = "2.4.1" +urlpattern = "0.2.0" +wasm-bindgen = "0.2.92" [workspace.dependencies.tezos-smart-rollup] version = "0.2.2" diff --git a/crates/jstz_api/Cargo.toml b/crates/jstz_api/Cargo.toml index aa7584c15..612e20838 100644 --- a/crates/jstz_api/Cargo.toml +++ b/crates/jstz_api/Cargo.toml @@ -11,27 +11,27 @@ license-file.workspace = true description.workspace = true [dependencies] -base64 = "0.21.7" -boa_engine = "0.17.0" -boa_gc = "0.17.0" -bytes = "1.4.0" -derive_more = "0.99.17" -form_urlencoded = "1.2.0" -http = "1.0.0" -jstz_core.workspace = true -jstz_crypto.workspace = true -serde = "1.0.196" -serde_json = "1.0.107" +base64.workspace = true +boa_engine.workspace = true +boa_gc.workspace = true +bytes.workspace = true +clap.workspace = true +derive_more.workspace = true +encoding_rs.workspace = true +fastrand.workspace = true +form_urlencoded.workspace = true +http.workspace = true +jstz_core = { path = "../jstz_core" } +jstz_crypto = { path = "../jstz_crypto" } +serde.workspace = true +serde_json.workspace = true tezos-smart-rollup.workspace = true -url = "2.4.1" -urlpattern = "0.2.0" -encoding_rs = "0.8.33" -fastrand = "2.0.1" -clap = { version = "^4.4", features = ["derive"] } +url.workspace = true +urlpattern.workspace = true [dev-dependencies] -anyhow = "1.0.82" -expect-test = "1.4.1" -jstz_wpt.workspace = true -tokio = { version = "1.36.0", features = ["full"] } -tezos-smart-rollup-mock = "0.2.2" +anyhow.workspace = true +expect-test.workspace = true +jstz_wpt = { path = "../jstz_wpt" } +tezos-smart-rollup-mock.workspace = true +tokio.workspace = true diff --git a/crates/jstz_cli/Cargo.toml b/crates/jstz_cli/Cargo.toml index d8afe9d24..603de4cea 100644 --- a/crates/jstz_cli/Cargo.toml +++ b/crates/jstz_cli/Cargo.toml @@ -15,60 +15,60 @@ default-run = "jstz" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -jstz_kernel.workspace = true -jstz_crypto.workspace = true -jstz_proto.workspace = true -jstz_core.workspace = true -jstz_api.workspace = true -jstz_rollup.workspace = true -jstz_node.workspace = true -octez.workspace = true -clap = { version = "^4.4", features = ["derive"] } -serde = { version = "1.0", features = ["derive"] } -serde_json = "1.0" -bs58 = "0.5" -hex = "0.4" -dirs = "3.0" -nix = { version = "^0.27.1", features = ["process", "signal"] } -http = "1.0.0" -fs_extra = "1.2" -anyhow = "1.0.82" -daemonize = "0.5.0" -tempfile = "3.10.0" -signal-hook = "0.3.17" -boa_engine = { version = "0.17.0", features = ["fuzz"] } -rustyline = "14.0.0" -tezos-smart-rollup.workspace = true +ansi_term.workspace = true +anyhow.workspace = true +boa_engine.workspace = true +boa_gc.workspace = true +bs58.workspace = true +clap.workspace = true +clap_complete.workspace = true +console.workspace = true +crossterm.workspace = true +daemonize.workspace = true +derive_more.workspace = true +dialoguer.workspace = true +dirs.workspace = true +env_logger.workspace = true +fs_extra.workspace = true +futures-util.workspace = true +futures.workspace = true +hex.workspace = true +http.workspace = true +in-container.workspace = true +indicatif.workspace = true +jstz_api = { path = "../jstz_api" } +jstz_core = { path = "../jstz_core" } +jstz_crypto = { path = "../jstz_crypto" } +jstz_kernel = { path = "../jstz_kernel" } +jstz_node = { path = "../jstz_node" } +jstz_proto = { path = "../jstz_proto" } +jstz_rollup = { path = "../jstz_rollup" } +log.workspace = true +nix.workspace = true +octez = { path = "../octez" } +prettytable.workspace = true +rand.workspace = true +regex.workspace = true +reqwest-eventsource.workspace = true +reqwest.workspace = true +rustyline.workspace = true +serde.workspace = true +serde_json.workspace = true +serde_with.workspace = true +serde_yaml.workspace = true +sha2.workspace = true +signal-hook.workspace = true +simplelog.workspace = true +spinners.workspace = true +syntect.workspace = true +tempfile.workspace = true tezos-smart-rollup-mock.workspace = true -serde_yaml = "0.9" +tezos-smart-rollup.workspace = true tezos_crypto_rs.workspace = true -sha2 = "0.10" -rand = "0.8" -tiny-bip39 = "1.0.0" -reqwest = { version = "0.11.24", features = ["json"] } -tokio = { version = "1.36.0", features = ["full"] } -derive_more = "0.99.17" -url = "2.2.2" -boa_gc = "0.17.0" -reqwest-eventsource = "0.5.0" -futures-util = "0.3.30" -syntect = "5.2.0" -crossterm = "0.27" -ansi_term = "0.12.1" -console = "0.15.8" -futures = "0.3" -env_logger = "0.11.1" -log = "0.4.20" -dialoguer = "0.11.0" -prettytable = "0.10.0" -serde_with = { version = "3.6.1", features = ["macros"] } -clap_complete = "4.4.10" -spinners = "4.1.1" -regex = "1" -indicatif = "0.17.0" -simplelog = "0.11" -tokio-util = "0.7.10" -in-container = "^1" +tiny-bip39.workspace = true +tokio-util.workspace = true +tokio.workspace = true +url.workspace = true [[bin]] name = "jstz" diff --git a/crates/jstz_core/Cargo.toml b/crates/jstz_core/Cargo.toml index 828f8bdc7..908286d91 100644 --- a/crates/jstz_core/Cargo.toml +++ b/crates/jstz_core/Cargo.toml @@ -11,22 +11,22 @@ license-file.workspace = true description.workspace = true [dependencies] -boa_engine = { version = "0.17.0", features = ["fuzz"] } -boa_gc = "0.17.0" +bincode.workspace = true +boa_engine.workspace = true +boa_gc.workspace = true +chrono.workspace = true +derive_more.workspace = true +erased-serde.workspace = true +getrandom.workspace = true +jstz_crypto = { path = "../jstz_crypto" } +serde.workspace = true tezos-smart-rollup-host.workspace = true tezos-smart-rollup.workspace = true -getrandom = { version = "0.2.12", features = ["custom"] } -derive_more = "0.99.17" -bincode = "1.3.3" -erased-serde = "0.4.2" -serde = { version = "1.0.196", features = ["derive"] } -jstz_crypto.workspace = true -chrono = { version = "0.4.34", default-features = false, features = ["std"] } [dev-dependencies] -anyhow = "1.0.82" -expect-test = "1.4.1" -tokio = { version = "1.36.0", features = ["full"] } -jstz_proto.workspace = true -jstz_crypto.workspace = true +anyhow.workspace = true +expect-test.workspace = true +jstz_crypto = { path = "../jstz_crypto" } +jstz_proto = { path = "../jstz_proto" } tezos-smart-rollup-mock.workspace = true +tokio.workspace = true diff --git a/crates/jstz_crypto/Cargo.toml b/crates/jstz_crypto/Cargo.toml index 2982c8c8d..0209b5b58 100644 --- a/crates/jstz_crypto/Cargo.toml +++ b/crates/jstz_crypto/Cargo.toml @@ -11,13 +11,13 @@ license-file.workspace = true description.workspace = true [dependencies] +anyhow.workspace = true +boa_gc.workspace = true +derive_more.workspace = true +hex.workspace = true +serde.workspace = true +serde_json.workspace = true tezos_crypto_rs.workspace = true -derive_more = "0.99.17" -serde = "1.0.196" -anyhow = "1.0.82" -hex = "0.4.3" -boa_gc = "0.17.0" -serde_json = "1.0.107" [dev-dependencies] -proptest = "1.1" +proptest.workspace = true \ No newline at end of file diff --git a/crates/jstz_kernel/Cargo.toml b/crates/jstz_kernel/Cargo.toml index 0f83d97e9..e6849ed34 100644 --- a/crates/jstz_kernel/Cargo.toml +++ b/crates/jstz_kernel/Cargo.toml @@ -14,19 +14,18 @@ description.workspace = true crate-type = ["cdylib", "lib"] [dependencies] -jstz_core.workspace = true -jstz_proto.workspace = true -jstz_crypto.workspace = true -jstz_api.workspace = true +bincode.workspace = true +boa_engine.workspace = true +http-serde.workspace = true +http.workspace = true +jstz_api = { path = "../jstz_api" } +jstz_core = { path = "../jstz_core" } +jstz_crypto = { path = "../jstz_crypto" } +jstz_proto = { path = "../jstz_proto" } +num-traits.workspace = true +serde.workspace = true tezos-smart-rollup.workspace = true tezos_crypto_rs.workspace = true -serde = "1.0.196" -num-traits = "0.2.16" -boa_engine = { version = "0.17.0", features = ["fuzz"] } -http = "1.0.0" -http-serde = "2.0.0" -bincode = "1.3.3" - [dev-dependencies] -jstz_mock.workspace = true +jstz_mock = { path = "../jstz_mock" } diff --git a/crates/jstz_mock/Cargo.toml b/crates/jstz_mock/Cargo.toml index 14eba963a..9bd9e59ea 100644 --- a/crates/jstz_mock/Cargo.toml +++ b/crates/jstz_mock/Cargo.toml @@ -6,8 +6,8 @@ edition.workspace = true repository.workspace = true [dependencies] -tezos-smart-rollup.workspace = true +jstz_core = { path = "../jstz_core" } +jstz_crypto = { path = "../jstz_crypto" } tezos-smart-rollup-mock.workspace = true +tezos-smart-rollup.workspace = true tezos_crypto_rs.workspace = true -jstz_core.workspace = true -jstz_crypto.workspace = true diff --git a/crates/jstz_node/Cargo.toml b/crates/jstz_node/Cargo.toml index 8e3af8ed7..ccfaa3d99 100644 --- a/crates/jstz_node/Cargo.toml +++ b/crates/jstz_node/Cargo.toml @@ -13,37 +13,37 @@ description.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -actix-web = "4.5.1" -actix-web-lab = "0.20.0" -anyhow = "1.0.82" -bincode = "1.3.3" -clap = { version = "^4.4", features = ["derive"] } -env_logger = "0.11.1" -futures-util = "0.3.30" -hex = "0.4.3" -jstz_proto.workspace = true -jstz_crypto.workspace = true -jstz_api.workspace = true -octez.workspace = true -parking_lot = "0.12.1" -reqwest = { version = "0.11.24", features = ["json"] } -serde = { version = "1.0.196", features = ["derive"] } -thiserror = "1.0.56" -tokio = { version = "1.36.0", features = ["fs", "rt-multi-thread"] } -tokio-stream = "0.1.14" -tokio-util = "0.7.10" -serde_json = "1.0.105" -dirs = "3.0" -log = "0.4.20" -r2d2 = {version = "0.8", optional = true} -r2d2_sqlite = {version = "0.22", optional = true} -rusqlite = {version = "0.29", optional = true} -actix-cors = "0.6.5" -base64 = "0.13.1" -tezos-smart-rollup.workspace = true +actix-cors.workspace = true +actix-web-lab.workspace = true +actix-web.workspace = true +anyhow.workspace = true +base64.workspace = true +bincode.workspace = true +clap.workspace = true +dirs.workspace = true +env_logger.workspace = true +futures-util.workspace = true +hex.workspace = true +jstz_api = { path = "../jstz_api" } +jstz_crypto = { path = "../jstz_crypto" } +jstz_proto = { path = "../jstz_proto" } +log.workspace = true +octez = { path = "../octez" } +parking_lot.workspace = true +r2d2 = { version = "0.8", optional = true } +r2d2_sqlite = { version = "0.22", optional = true } +reqwest.workspace = true +rusqlite = { version = "0.29", optional = true } +serde.workspace = true +serde_json.workspace = true tezos-smart-rollup-encoding.workspace = true -tezos_data_encoding = "0.6.0" +tezos-smart-rollup.workspace = true tezos_crypto_rs.workspace = true +tezos_data_encoding.workspace = true +thiserror.workspace = true +tokio-stream.workspace = true +tokio-util.workspace = true +tokio.workspace = true [[bin]] name = "jstz-node" diff --git a/crates/jstz_proto/Cargo.toml b/crates/jstz_proto/Cargo.toml index 82b7259ec..6396eb0d8 100644 --- a/crates/jstz_proto/Cargo.toml +++ b/crates/jstz_proto/Cargo.toml @@ -11,20 +11,20 @@ license-file.workspace = true description.workspace = true [dependencies] -derive_more = "0.99.17" -erased-serde = "0.4.2" -serde = "1.0.196" -jstz_core.workspace = true -jstz_crypto.workspace = true -serde_json = "1.0.105" -boa_engine = { version = "0.17.0", features = ["fuzz"] } -boa_gc = "0.17.0" -tezos-smart-rollup = { workspace = true, default-features = false} -jstz_api.workspace = true -http = "1.0.0" -http-serde = "2.0.0" -either = "1.9.0" +boa_engine.workspace = true +boa_gc.workspace = true +derive_more.workspace = true +either.workspace = true +erased-serde.workspace = true +http-serde.workspace = true +http.workspace = true +jstz_api = { path = "../jstz_api" } +jstz_core = { path = "../jstz_core" } +jstz_crypto = { path = "../jstz_crypto" } +serde.workspace = true +serde_json.workspace = true +tezos-smart-rollup.workspace = true [dev-dependencies] +jstz_mock = { path = "../jstz_mock" } tezos-smart-rollup-mock.workspace = true -jstz_mock.workspace = true diff --git a/crates/jstz_rollup/Cargo.toml b/crates/jstz_rollup/Cargo.toml index eef885b53..d0a47844e 100644 --- a/crates/jstz_rollup/Cargo.toml +++ b/crates/jstz_rollup/Cargo.toml @@ -13,23 +13,21 @@ description.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.82" -derive_more = "0.99.17" -octez.workspace = true -tezos-smart-rollup-installer-config = { version = "0.2.2", features = [ - "alloc", -] } -tezos-smart-rollup-installer.workspace = true +anyhow.workspace = true +bincode.workspace = true +clap.workspace = true +derive_more.workspace = true +dirs.workspace = true +figment.workspace = true +fs_extra.workspace = true +hex.workspace = true +octez = { path = "../octez" } +serde.workspace = true +serde_json.workspace = true tezos-smart-rollup-host.workspace = true -hex = "0.4.3" +tezos-smart-rollup-installer-config.workspace = true +tezos-smart-rollup-installer.workspace = true tezos_crypto_rs.workspace = true -bincode = "1.3.3" -fs_extra = "1.3.0" -figment = { version = "0.10.12", features = ["json", "env"] } -clap = { version = "4.4.18", features = ["derive"] } -serde = { version = "1.0.196", features = ["derive"] } -serde_json = "1.0.108" -dirs = "3.0" [[bin]] name = "jstz-rollup" diff --git a/crates/jstz_sdk/Cargo.toml b/crates/jstz_sdk/Cargo.toml index 489bf971f..041f54d03 100644 --- a/crates/jstz_sdk/Cargo.toml +++ b/crates/jstz_sdk/Cargo.toml @@ -9,7 +9,7 @@ repository.workspace = true crate-type = ["cdylib"] [dependencies] -jstz_crypto.workspace = true -jstz_proto.workspace = true -serde-wasm-bindgen = "0.6.5" -wasm-bindgen = "0.2.92" +jstz_crypto = { path = "../jstz_crypto" } +jstz_proto = { path = "../jstz_proto" } +serde-wasm-bindgen.workspace = true +wasm-bindgen.workspace = true diff --git a/crates/jstz_wpt/Cargo.toml b/crates/jstz_wpt/Cargo.toml index 8b40eb9ed..1dd91ad16 100644 --- a/crates/jstz_wpt/Cargo.toml +++ b/crates/jstz_wpt/Cargo.toml @@ -14,17 +14,17 @@ include = ["config.json", "hosts", "manifest.json", "src"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.82" -clap = { version = "^4.4", features = ["derive"] } -ctrlc = "3.4.2" -nix = { version = "0.27.1", features = ["signal"] } -regex = "1.10.3" -reqwest = { version = "0.11.24", features = ["blocking"] } -serde = { version = "1.0.196", features = ["derive"] } -serde_json = "1.0.108" -tl = "0.7.7" -tokio = { version = "1.36.0", features = ["full"] } -url = "2.4.1" +anyhow.workspace = true +clap.workspace = true +ctrlc.workspace = true +nix.workspace = true +regex.workspace = true +reqwest.workspace = true +serde.workspace = true +serde_json.workspace = true +tl.workspace = true +tokio.workspace = true +url.workspace = true [[bin]] name = "jstz-wpt" diff --git a/crates/octez/Cargo.toml b/crates/octez/Cargo.toml index 9d6511f1b..f63f78dde 100644 --- a/crates/octez/Cargo.toml +++ b/crates/octez/Cargo.toml @@ -13,11 +13,11 @@ description = "Bindings to Octez (Tezos) binaries" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -anyhow = "1.0.82" -hex = "0.4.3" -regex = "1.10.3" -reqwest = { version = "0.11.24", features = ["json"] } -serde = { version = "1.0.196", features = ["derive"] } -serde_json = "1.0.108" -signal-hook = "0.3.17" +anyhow.workspace = true +hex.workspace = true +regex.workspace = true +reqwest.workspace = true +serde.workspace = true +serde_json.workspace = true +signal-hook.workspace = true tezos-smart-rollup-encoding.workspace = true \ No newline at end of file diff --git a/flake.nix b/flake.nix index 82f6797cc..32ce5e762 100644 --- a/flake.nix +++ b/flake.nix @@ -103,6 +103,7 @@ }) rust-analyzer wabt + cargo-sort nodejs prefetch-npm-deps