Skip to content

Commit

Permalink
change branch to backport catalyst-fund7
Browse files Browse the repository at this point in the history
  • Loading branch information
@dkijania
dkijania committed Nov 22, 2021
1 parent 58b8bca commit 7d21197
Show file tree
Hide file tree
Showing 10 changed files with 105 additions and 105 deletions.
88 changes: 44 additions & 44 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions jcli/Cargo.toml
View file
Expand Up @@ -24,12 +24,12 @@ 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 = "catalyst-fund7" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
jormungandr-lib = { path = "../jormungandr-lib" }
gtmpl = "0.6.0"
ed25519-bip32 = "0.4"
Expand Down
22 changes: 11 additions & 11 deletions jormungandr-lib/Cargo.toml
View file
Expand Up @@ -10,14 +10,14 @@ description = "Data structures and formats used by Jormungandr node API and conf
bincode = "1.3"
serde = { version = "1.0", features = ["derive"] }
serde_with = { version = "1.9", features = ["macros"] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7"}
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates"}
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
rand = "0.8"
rand_core = "0.6"
rand_chacha = "0.3"
Expand All @@ -36,9 +36,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 = "catalyst-fund7", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7", features = [ "property-test-api" ] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates", features = [ "property-test-api" ] }
ed25519-bip32 = "0.4"
serde_yaml = "0.8"
serde_json = "1.0"
26 changes: 13 additions & 13 deletions jormungandr/Cargo.toml
View file
Expand Up @@ -12,16 +12,16 @@ Midgard Serpent
edition = "2018"

[dependencies]
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-network = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
imhamt = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-network = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
imhamt = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }

arc-swap = "^1.1.0"
async-trait = "0.1.51"
Expand Down Expand Up @@ -72,9 +72,9 @@ features = ["rustls-tls"]
tokio = { version = "^1.4", features = ["full"] }
quickcheck = "0.9"
quickcheck_macros = "0.9"
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7", features = [ "property-test-api" ] }
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates", features = [ "property-test-api" ] }
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates", features = [ "property-test-api" ] }
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates", features = [ "property-test-api" ] }

[build-dependencies]
versionisator = "1.0.2"
Expand Down
4 changes: 2 additions & 2 deletions modules/blockchain/Cargo.toml
View file
Expand Up @@ -5,7 +5,7 @@ authors = ["Nicolas Di Prima <nicolas.diprima@iohk.io>"]
edition = "2018"

[dependencies]
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund7"}
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates" }
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "backport_proposal_updates"}
thiserror = "1.0.26"
lru = "0.6.6"

0 comments on commit 7d21197

Please sign in to comment.