Skip to content

Commit a5d748d

Browse files
committed
fix: workspace.
1 parent feeb4d8 commit a5d748d

File tree

4,404 files changed

+65631
-985
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,404 files changed

+65631
-985
lines changed

Cargo.lock

Lines changed: 4055 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 51 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22

33
resolver = "2"
44

5-
members = []
5+
members = [
6+
"protocol-units/mcr/client",
7+
"protocol-units/mcr/manager",
8+
"protocol-units/post-confirmations/*",
9+
"protocol-units/fast-confirmations/*",
10+
"protocol-units/ffs/*",
11+
]
612

713
[workspace.package]
814
version = "0.0.1"
@@ -12,10 +18,53 @@ authors = ["Movement Labs"]
1218
repository = "www.github.com/movementlabsxyz/ffs"
1319
homepage = "www.github.com/movementlabsxyz/ffs"
1420
publish = false
15-
rust-version = "1.79"
21+
rust-version = "1.81.0"
1622

1723
[workspace.dependencies]
24+
alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
25+
"node-bindings",
26+
"rpc-types-trace",
27+
"json-rpc",
28+
"json-abi",
29+
"rpc-client",
30+
"signers",
31+
"signer-yubihsm",
32+
"pubsub",
33+
"providers",
34+
] }
35+
alloy-rpc-types-eth = "0.1.3"
36+
alloy-eips = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
37+
alloy-contract = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
38+
alloy-network = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
39+
alloy-primitives = { version = "0.7.2", default-features = false }
40+
alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
41+
alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
42+
"ws",
43+
] }
44+
alloy-rlp = "0.3.5"
45+
alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
46+
alloy-sol-types = { version = "0.7.2", features = ["json"] }
47+
alloy-signer = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
48+
alloy-transport = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
49+
alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = ["reqwest-rustls-tls"] }
50+
alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
51+
anyhow = "1.0"
52+
async-stream = "0.3.0"
53+
async-trait = "0.1.71"
54+
futures = "0.3.17"
55+
serde = "1.0"
56+
serde_json = "1.0"
57+
serde_derive = "1.0"
58+
thiserror = "1.0.50"
59+
tracing = "0.1.40"
60+
tracing-appender = "0.2"
61+
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
62+
tracing-test = "0.2.5"
63+
tokio = { version = "1.35.1", features = ["full", "tracing"] }
64+
tokio-stream = "0.1.15"
1865

66+
# internal
67+
mcr-settlement-client = { path = "protocol-units/mcr/client" }
1968

2069
[workspace.lints.clippy]
2170
debug_assert_with_mut_call = "deny"

flake.lock

Lines changed: 163 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
inputs = {
3-
nixpkgs.url = "github:NixOS/nixpkgs/8dedccea6cea1e65bf74fc6c7f35e0aadf832a14";
4-
rust-overlay.url = "github:oxalica/rust-overlay/db12d0c6ef002f16998723b5dd619fa7b8997086";
3+
nixpkgs.url = "github:NixOS/nixpkgs/a7abebc31a8f60011277437e000eebcc01702b9f";
4+
rust-overlay.url = "github:oxalica/rust-overlay/75b2271c5c087d830684cd5462d4410219acc367";
55
flake-utils.url = "github:numtide/flake-utils";
66
foundry.url = "github:shazow/foundry.nix/f533e2c70e520adb695c9917be21d514c15b1c4d";
77
crane.url = "github:ipetkov/crane";
@@ -64,8 +64,6 @@
6464
just
6565
foundry-bin
6666
process-compose
67-
celestia-node
68-
celestia-app
6967
jq
7068
docker
7169
solc

protocol-units/mcr/client/Cargo.toml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ rust-version = { workspace = true }
1515

1616

1717
[dependencies]
18-
mcr-settlement-config = { workspace = true }
19-
movement-signer-loader = { workspace = true }
20-
movement-signer = { workspace = true }
21-
movement-signing-eth = { workspace = true }
22-
2318
alloy = { workspace = true, features = [
2419
"node-bindings",
2520
"rpc-types-trace",
@@ -43,16 +38,13 @@ anyhow = { workspace = true }
4338
async-stream = { workspace = true }
4439
async-trait = { workspace = true }
4540
serde_json = { workspace = true }
46-
movement-types = { workspace = true }
4741
thiserror = { workspace = true }
4842
tokio = { workspace = true }
4943
tokio-stream = { workspace = true }
5044
tracing = { workspace = true }
5145
serde = { workspace = true }
5246

53-
godfig = { workspace = true }
5447

55-
dot-movement = { workspace = true }
5648
alloy-rpc-types = { workspace = true }
5749
futures = { workspace = true }
5850
tracing-subscriber = { workspace = true }

protocol-units/mcr/config/Cargo.toml

Lines changed: 0 additions & 22 deletions
This file was deleted.

protocol-units/mcr/config/src/common/deploy.rs

Lines changed: 0 additions & 60 deletions
This file was deleted.

0 commit comments

Comments
 (0)