Skip to content

Commit 5b48fa6

Browse files
committed
fix: use Git-based freenet-stdlib for tokio-tungstenite 0.27.0 compatibility
- Update all crates to use workspace version of freenet-stdlib - Use Git version from main branch with tokio-tungstenite 0.27.0 support - Resolves version conflicts across the workspace [AI-assisted debugging and comment]
1 parent 5c9ed9d commit 5b48fa6

File tree

14 files changed

+19
-50
lines changed

14 files changed

+19
-50
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tracing-subscriber = "0.3"
3333
wasmer = "5.0.4"
3434
wasmer-compiler-singlepass = "5.0.4"
3535

36-
freenet-stdlib = { version = "0.1.13" }
36+
freenet-stdlib = { git = "https://github.com/freenet/freenet-stdlib.git", branch = "main" }
3737

3838
[profile.dev.package."*"]
3939
opt-level = 3

apps/freenet-email-app/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ rsa = { version = "0.9.2", default-features = false, features = ["serde", "pem",
1919
serde = "1"
2020
serde_json = "1"
2121

22-
# freenet-stdlib = { version = "0.0.7" }
23-
freenet-stdlib = { version = "0.1.6" }
22+
# freenet-stdlib = { workspace = true }
23+
freenet-stdlib = { workspace = true }
2424
freenet-aft-interface = { path = "../../modules/antiflood-tokens/interfaces" }

apps/freenet-microblogging/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ panic = 'abort'
1414
strip = true
1515

1616
[workspace.dependencies]
17-
freenet-stdlib = { version = "0.1.6", default-features = false, features = ["contract"] }
17+
freenet-stdlib = { workspace = true, default-features = false, features = ["contract"] }
1818

1919
#[target.wasm32-unknown-unknown]
2020
#rustflags = ["-C", "link-arg=--import-memory"]

apps/freenet-ping/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ members = ["contracts/ping", "app", "types"]
44

55
[workspace.dependencies]
66
# freenet-stdlib = { path = "./../../stdlib/rust", features = ["contract"] }
7-
freenet-stdlib = { version = "0.1.11" }
7+
freenet-stdlib = { workspace = true }
88
freenet-ping-types = { path = "types", default-features = false }
99
chrono = { version = "0.4", default-features = false }
1010
testresult = "0.4"

apps/freenet-ping/app/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ testing = ["freenet-stdlib/testing", "freenet/testing"]
1010
anyhow = "1.0"
1111
chrono = { workspace = true, features = ["default"] }
1212
clap = { version = "4.5", features = ["derive"] }
13-
freenet-stdlib = { version = "0.1.13", features = ["net"] }
13+
freenet-stdlib = { workspace = true, features = ["net"] }
1414
freenet-ping-types = { path = "../types", features = ["std", "clap"] }
1515
futures = "0.3.31"
1616
rand = "0.8.5"

modules/antiflood-tokens/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ resolver = "2"
66
bincode = { version = "1" }
77
bs58 = "0.5"
88
chrono = { version = "0.4", default-features = false }
9-
freenet-stdlib = { version = "0.1.6" }
9+
freenet-stdlib = { workspace = true }
1010
rsa = { version = "0.9", default-features = false, features = ["serde", "pem"] }
1111
serde = { version = "1" }
1212
serde_json = { version = "1" }

modules/identity-management/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ edition = "2021"
88
[dependencies]
99
anyhow = "1"
1010
p384 = { version = "0.13", default-features = false, features = ["serde", "pem", "pkcs8", "arithmetic"] }
11-
freenet-stdlib = { version = "0.1.6" }
11+
freenet-stdlib = { workspace = true }
1212
serde = "1"
1313
serde_json = "1"
1414

tests/test-app-1/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ panic = 'abort'
1414
strip = true
1515

1616
[workspace.dependencies]
17-
freenet-stdlib = { version = "0.1.6", default-features = false }
17+
freenet-stdlib = { workspace = true, default-features = false }

tests/test-contract-1/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ edition = "2021"
99
crate-type = ["cdylib"]
1010

1111
[dependencies]
12-
freenet-stdlib = { version = "0.1.6", features = ["contract"] }
12+
freenet-stdlib = { workspace = true, features = ["contract"] }
1313

1414
[features]
1515
default = ["freenet-main-contract"]

0 commit comments

Comments
 (0)