Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update dependency, remove submodule #23

Merged
merged 4 commits into from
Sep 13, 2024
Merged

feat: update dependency, remove submodule #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
438f6c7
feat: update dependency, remove submodule
MiniFrenchBread Sep 13, 2024
e4a35fd
test: framework
MiniFrenchBread Sep 13, 2024
fdc4d7a
fix: lint
MiniFrenchBread Sep 13, 2024
7f17473
fix: gitignore
MiniFrenchBread Sep 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ run/db
run/kv.DB
run/config.toml
run/run.sh
dummy*
/dummy*
tags*
test.py
test.txt
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
[submodule "0g-storage-node"]
path = 0g-storage-node
url = https://github.com/0glabs/0g-storage-node.git
1 change: 0 additions & 1 deletion 0g-storage-node
Open in desktop
Submodule 0g-storage-node deleted from a79f7b
100 changes: 51 additions & 49 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ enr = { path = "version-meld/enr" }
discv5 = { path = "version-meld/discv5" }

[workspace.dependencies]
append_merkle = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "a79f7bbf126df3748d072076dccdc7e0c34bd971" }
merkle_light = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "a79f7bbf126df3748d072076dccdc7e0c34bd971" }
merkle_tree = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "a79f7bbf126df3748d072076dccdc7e0c34bd971" }
shared_types = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "a79f7bbf126df3748d072076dccdc7e0c34bd971" }
task_executor = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "a79f7bbf126df3748d072076dccdc7e0c34bd971" }
storage = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "a79f7bbf126df3748d072076dccdc7e0c34bd971" }
contract-interface = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "a79f7bbf126df3748d072076dccdc7e0c34bd971" }
append_merkle = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "59d24b073d93c1146666295e48609825f761abea" }
merkle_light = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "59d24b073d93c1146666295e48609825f761abea" }
merkle_tree = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "59d24b073d93c1146666295e48609825f761abea" }
shared_types = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "59d24b073d93c1146666295e48609825f761abea" }
task_executor = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "59d24b073d93c1146666295e48609825f761abea" }
storage = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "59d24b073d93c1146666295e48609825f761abea" }
contract-interface = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "59d24b073d93c1146666295e48609825f761abea" }
14 changes: 1 addition & 13 deletions node/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1 @@
use std::process::Command;

fn main() {
println!("cargo:rerun-if-changed=../0g-storage-node");

let status = Command::new("cargo")
.current_dir("../0g-storage-node")
.args(vec!["build", "--release"])
.status()
.unwrap();

println!("build 0g-storage-node with status {}", status);
}
fn main() {}
2 changes: 1 addition & 1 deletion node/log_entry_sync/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ shared_types = { workspace = true }
task_executor = { workspace = true }
tokio = "1.19.2"
ethers = { version = "^2", features = ["ws"] }
serde_json = "1.0.82"
serde_json = "1.0.127"
storage = { workspace = true }
storage_with_stream = { path = "../storage_with_stream" }
contract-interface = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion node/rpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ storage_with_stream = { path = "../storage_with_stream" }
kv_types = { path = "../kv_types" }

[dev-dependencies]
serde_json = "1.0.82"
serde_json = "1.0.127"
2 changes: 1 addition & 1 deletion node/stream/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ kv_types = { path = "../kv_types" }
task_executor = { workspace = true }
tokio = "1.19.2"
ethers = { version = "^2", features = ["ws"] }
serde_json = "1.0.82"
serde_json = "1.0.127"
storage_with_stream = { path = "../storage_with_stream" }
rpc = {path = "../rpc"}
zgs_rpc = { git = "https://github.com/0glabs/0g-storage-node.git", branch = "main", package = "rpc" }
Expand Down
1 change: 1 addition & 0 deletions tests/storage-contracts-abis/0g-storage-contracts-rev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dbeff538b949599c203e43be6ecc05e9e997d09d
Loading
Loading