feat(final version): including spending counter witness checks

must be included to satisfy legacy clients
input-output-hk · Jan 16, 2024 · a7781bd · a7781bd
1 parent 8ea8b12
commit a7781bd
Show file tree

Hide file tree

Showing 10 changed files with 171 additions and 171 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/explorer/Cargo.toml b/explorer/Cargo.toml
@@ -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 = "catalyst-fund9-gold-test"}
-chain-addr = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-chain-core = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-chain-crypto = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-chain-impl-mockchain = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-chain-time = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-chain-vote = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-chain-ser = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-chain-network = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-imhamt = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
+cardano-legacy-address = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-addr = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-core = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-crypto = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-impl-mockchain = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-time = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-vote = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-ser = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-network = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+imhamt = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
 
 [features]
 default = []

diff --git a/jcli/Cargo.toml b/jcli/Cargo.toml
@@ -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 = "catalyst-fund9-gold-test" }
-chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-time    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", optional = true }
+chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-time    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", optional = true }
 jormungandr-lib = { path = "../jormungandr-lib" }
 gtmpl = "0.6.0"
 ed25519-bip32 = "0.4.1"
@@ -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 = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
 
 [build-dependencies]
 versionisator = "1.0.2"

diff --git a/jormungandr-lib/Cargo.toml b/jormungandr-lib/Cargo.toml
@@ -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 = "catalyst-fund9-gold-test" }
-chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-time           = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
-chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-time           = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
+chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
 rand = "0.8"
 rand_core = "0.6"
 rand_chacha = "0.3"
@@ -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 = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
 ed25519-bip32 = "0.4.1"
 serde_yaml = "0.8"
 serde_json = "1.0"

diff --git a/jormungandr/Cargo.toml b/jormungandr/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "jormungandr"
-version = "0.15.90"
+version = "0.16.0"
 authors = [ "[email protected]" ]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/input-output-hk/jormungandr"
@@ -12,17 +12,17 @@ Midgard Serpent
 edition = "2021"
 
 [dependencies]
-chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-network = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-storage   = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-time      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", optional = true }
-cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-imhamt = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
+chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-network = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-storage   = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-time      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", optional = true }
+cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+imhamt = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
 
 arc-swap = "^1.5.0"
 async-trait = "0.1.51"
@@ -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 = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
 criterion = { version = "0.3", features = ["html_reports", "async_tokio"] }
 
 [[bench]]

diff --git a/modules/blockchain/Cargo.toml b/modules/blockchain/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Nicolas Di Prima <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-time           = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-time           = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
 thiserror = "1.0.30"
 lru       = "0.7"
diff --git a/testing/jormungandr-automation/Cargo.toml b/testing/jormungandr-automation/Cargo.toml
@@ -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 = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-time      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-storage   = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = ["with-bench"] }
-chain-vote      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-time      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-storage   = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = ["with-bench"] }
+chain-vote      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
 jormungandr-lib = { path = "../../jormungandr-lib" }
 jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
 rand = "0.8"

diff --git a/testing/jormungandr-integration-tests/Cargo.toml b/testing/jormungandr-integration-tests/Cargo.toml
@@ -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 = "catalyst-fund9-gold-test" }
-chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-time      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-vote      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
+chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-time      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-vote      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
 jormungandr-lib = { path = "../../jormungandr-lib" }
 hersir = { path = "../hersir" }
 loki = { path = "../loki" }

diff --git a/testing/loki/Cargo.toml b/testing/loki/Cargo.toml
@@ -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 = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
-chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
-chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
+chain-addr      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-crypto    = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
+chain-core      = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
+chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
 jormungandr-automation = { path = "../jormungandr-automation" }
 jormungandr-lib = { path = "../../jormungandr-lib" }
 thor = {path = "../thor"}