Skip to content

Commit

Permalink
Merge branch 'fund9-release' into catalyst-fund9
Browse files Browse the repository at this point in the history
  • Loading branch information
@cameron1024
cameron1024 committed Jun 6, 2022
2 parents eda3ddf + 14dcc12 commit 6da11eb
Show file tree
Hide file tree
Showing 11 changed files with 80 additions and 80 deletions.
20 changes: 10 additions & 10 deletions explorer/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ http-zipkin = "0.3.0"

jormungandr-lib = {path = "../jormungandr-lib"}

cardano-legacy-address = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-addr = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-core = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-crypto = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-impl-mockchain = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-time = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-vote = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-ser = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-network = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
imhamt = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
cardano-legacy-address = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9"}
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-crypto = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9"}
chain-impl-mockchain = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9"}
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"}
chain-ser = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9"}
chain-network = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9"}
imhamt = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9"}

[features]
default = []
Expand Down
16 changes: 8 additions & 8 deletions jcli/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ bech32 = "0.8"
hex = "0.4.2"
rayon = "1.5"
base64 = "0.13.0"
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", optional = true }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
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" }
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" }
chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", optional = true }
jormungandr-lib = { path = "../jormungandr-lib" }
gtmpl = "0.6.0"
ed25519-bip32 = "0.4.1"
Expand All @@ -53,7 +53,7 @@ predicates = "2.0"
quickcheck = "0.9"
# FIXME required to work with quickcheck 0.9. Remove after migrating another crate or newer quickcheck
rand07 = { package = "rand", version = "0.7" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }

[build-dependencies]
versionisator = "1.0.2"
Expand Down
22 changes: 11 additions & 11 deletions jormungandr-lib/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ description = "Data structures and formats used by Jormungandr node API and conf
[dependencies]
serde = { version = "1.0", features = ["derive"] }
serde_with = { version = "1.12", features = ["macros"] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
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-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
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" }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
rand = "0.8"
rand_core = "0.6"
rand_chacha = "0.3"
Expand All @@ -35,9 +35,9 @@ quickcheck = "0.9"
quickcheck_macros = "0.9"
# FIXME required to work with quickcheck 0.9. Remove after migrating another crate or newer quickcheck
rand07 = { package = "rand", version = "0.7" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
ed25519-bip32 = "0.4.1"
serde_yaml = "0.8"
serde_json = "1.0"
Expand Down
28 changes: 14 additions & 14 deletions jormungandr/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ Midgard Serpent
edition = "2021"

[dependencies]
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-network = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", optional = true }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
imhamt = { git = "https://github.com/input-output-hk/chain-libs.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-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-network = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
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" }
chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", optional = true }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
imhamt = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }

arc-swap = "^1.5.0"
async-trait = "0.1.51"
Expand Down Expand Up @@ -69,9 +69,9 @@ reqwest = { version = "0.11", default-features = false, features = ["rustls-tls
tokio = { version = "^1.15", features = ["full"] }
quickcheck = "0.9"
quickcheck_macros = "0.9"
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
criterion = { version = "0.3", features = ["html_reports", "async_tokio"] }

[[bench]]
Expand Down
4 changes: 2 additions & 2 deletions modules/blockchain/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ authors = ["Nicolas Di Prima <nicolas.diprima@iohk.io>"]
edition = "2021"

[dependencies]
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master"}
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9"}
thiserror = "1.0.30"
lru = "0.7"
8 changes: 4 additions & 4 deletions testing/hersir/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ edition = "2021"
assert_fs = "1.0"
custom_debug = "0.5"
ctrlc = "3.2.1"
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
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-addr = { 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" }
indicatif = "0.15"
jormungandr-automation = { path = "../jormungandr-automation" }
jormungandr-lib = { path = "../../jormungandr-lib" }
Expand Down
18 changes: 9 additions & 9 deletions testing/jormungandr-automation/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ bech32 = "0.8"
bytesize = "1.1.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = ["with-bench"] }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
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-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = ["with-bench"] }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
jormungandr-lib = { path = "../../jormungandr-lib" }
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
rand = "0.8"
Expand Down
12 changes: 6 additions & 6 deletions testing/jormungandr-integration-tests/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ tokio = { version = "1.15", features = ["macros", "time"] }
futures = "0.3.21"
base64 = "0.13"
hex = "0.4.2"
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.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-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
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" }
jormungandr-lib = { path = "../../jormungandr-lib" }
hersir = { path = "../hersir" }
loki = { path = "../loki" }
Expand Down
8 changes: 4 additions & 4 deletions testing/loki/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
jormungandr-automation = { path = "../jormungandr-automation" }
jormungandr-lib = { path = "../../jormungandr-lib" }
thor = {path = "../thor"}
Expand Down
14 changes: 7 additions & 7 deletions testing/mjolnir/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ thiserror = "1.0"
structopt = "^0.3"
assert_fs = "1.0"
indicatif = "0.15"
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = [ "property-test-api" ] }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master", features = ["with-bench"] }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "master" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = [ "property-test-api" ] }
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-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9", features = ["with-bench"] }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9" }
tokio = { version = "1.15", features = ["macros"] }
thor = { path = "../thor" }
loki = { path = "../loki" }
Expand Down
Loading

0 comments on commit 6da11eb

Please sign in to comment.