Skip to content

Commit

Permalink
fix:update dependencies to jor v0.15.0 and vitss f10.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@kukkok3
kukkok3 committed Nov 27, 2023
1 parent 4d4df9c commit 60d50e9
Show file tree
Hide file tree
Showing 9 changed files with 1,796 additions and 1,127 deletions.
2,849 changes: 1,758 additions & 1,091 deletions Cargo.lock
View file

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions iapyx/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ rand_core = "0.6"
itertools = "0.10.3"
cryptoxide = "0.4.2"
ed25519-bip32 = "^0.3.1"
jcli = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
thor = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
hersir = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jcli = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
thor = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
hersir = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9", features=["test-api"]}
valgrind = { path = "../valgrind"}
Expand All @@ -52,7 +52,7 @@ image = "0.23.12"
eccoxide = { git = "https://github.com/eugene-babichenko/eccoxide.git", branch = "fast-u64-scalar-mul", features = ["fast-u64-scalar-mul"], optional = true }
rayon = "1"
bincode = "1.3.3"
cocoon = { git = "https://github.com/dkijania/cocoon.git", rev = "1dfd975c3f0720d51c56fb297e7c92467bc3448a" }
cocoon = { git = "https://github.com/dkijania/cocoon.git"}

[dependencies.reqwest]
version = "0.10.6"
Expand Down
20 changes: 10 additions & 10 deletions integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
jormungandr-lib = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-automation = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
thor = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
hersir = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jcli = { git ="https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "catalyst-fund9" }
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "catalyst-fund9" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
thor = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
hersir = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jcli = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" }
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" }
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch="master" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-ser = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
vitup = { path = "../vitup"}
iapyx = { path = "../iapyx"}
valgrind = { path = "../valgrind"}
vitup = { path = "../vitup"}
iapyx = { path = "../iapyx"}
valgrind = { path = "../valgrind"}
snapshot-trigger-service = { path = "../snapshot-trigger-service" }
registration-service = { path = "../registration-service" }
rand_chacha = "0.2"
Expand Down
4 changes: 2 additions & 2 deletions registration-service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ chrono = { version = "0.4", features = ["serde"] }
walkdir = "2.3.1"
structopt = "0.3"
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch= "master" }
jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }

futures = "0.3.8"
serde = { version = "1", features = ["derive"] }
Expand Down
6 changes: 3 additions & 3 deletions registration-verify-service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ chrono = { version = "0.4", features = ["serde"] }
walkdir = "2.3.1"
structopt = "0.3"
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch= "master" }
jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-integration-tests = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9", features=["test-api"]}
futures = "0.3.8"
snapshot-trigger-service = { path = "../snapshot-trigger-service" }
serde = { version = "1", features = ["derive"] }
warp = "0.3.1"
hex = "0.4"
iapyx = { path = "../iapyx"}
iapyx = { path = "../iapyx"}
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
thiserror = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion snapshot-trigger-service/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ chrono = { version = "0.4", features = ["serde"] }
walkdir = "2.3.1"
structopt = "0.3"
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch= "master" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
futures = "0.3.8"
assert_fs = "1.0"
Expand Down
7 changes: 5 additions & 2 deletions snapshot-trigger-service/src/config/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,11 @@ impl Configuration {
command.arg("--slot-no").arg(slot_no.to_string());
}

let log_command = format!("{:?}",command);
println!("Running command: {} ", log_command.replace(&self.voting_tools.db_pass,"***"));
let log_command = format!("{:?}", command);
println!(
"Running command: {} ",
log_command.replace(&self.voting_tools.db_pass, "***")
);

command.spawn().map_err(Into::into)
}
Expand Down
9 changes: 4 additions & 5 deletions valgrind/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
wallet = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "catalyst-fund9" }
wallet-core = { git = "https://github.com/input-output-hk/chain-wallet-libs.git", branch = "catalyst-fund9" }
hex = "0.4"
Expand All @@ -22,8 +22,8 @@ serde_json = "1.0"
warp-reverse-proxy = "0.3.2"
structopt = "0.3"
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "catalyst-fund9" }
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "catalyst-fund9" }
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" }
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
Expand All @@ -37,4 +37,3 @@ url = "2.2.2"
version = "0.10.10"
default-features = false
features = ["blocking", "rustls-tls", "json"]

14 changes: 7 additions & 7 deletions vitup/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,21 @@ chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.gi
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
proptest = { git = "https://github.com/input-output-hk/proptest.git" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
thor = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
hersir = { git = "https://github.com/input-output-hk/jormungandr.git", branch = "catalyst-fund9" }
jormungandr-lib = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jormungandr-automation = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
thor = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
hersir = { git = "https://github.com/input-output-hk/jormungandr.git", tag = "v0.15.0" }
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "catalyst-fund9" }
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", branch = "catalyst-fund9" }
vit-servicing-station-tests = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" }
vit-servicing-station-lib = { git = "https://github.com/input-output-hk/vit-servicing-station.git", tag = "f10.0.0" }
catalyst-toolbox = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9"}
voting-hir = { git = "https://github.com/input-output-hk/catalyst-toolbox.git", branch = "catalyst-fund9", features = ["serde"] }
valgrind = { path = "../valgrind" }
poldercast = { git = "https://github.com/primetype/poldercast.git", rev = "8305f1560392a9d26673ca996e7646c8834533ef" }
rand = "0.8"
path-slash = "0.2.0"
netstat2 = "0.9"
time = { version = "0.3.7", features=["serde","serde-well-known","parsing"]}
time = { version = "0.3.7", features=["serde","serde-well-known","parsing"]}
fake = { version = "2.2", features=['chrono','http']}
strum = "0.21.0"
strum_macros = "0.23.1"
Expand Down

0 comments on commit 60d50e9

Please sign in to comment.