Skip to content

Commit a7781bd

Browse files
cong-orcong-or
committed
feat(final version): including spending counter witness checks
must be included to satisfy legacy clients
1 parent 8ea8b12 commit a7781bd

File tree

10 files changed

+171
-171
lines changed

10 files changed

+171
-171
lines changed

‎Cargo.lock

+99-99
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎explorer/Cargo.toml

+10-10
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ http-zipkin = "0.3.0"
4141

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

44-
cardano-legacy-address = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
45-
chain-addr = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
46-
chain-core = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
47-
chain-crypto = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
48-
chain-impl-mockchain = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
49-
chain-time = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
50-
chain-vote = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
51-
chain-ser = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
52-
chain-network = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
53-
imhamt = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
44+
cardano-legacy-address = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
45+
chain-addr = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
46+
chain-core = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
47+
chain-crypto = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
48+
chain-impl-mockchain = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
49+
chain-time = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
50+
chain-vote = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
51+
chain-ser = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
52+
chain-network = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
53+
imhamt = {git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
5454

5555
[features]
5656
default = []

‎jcli/Cargo.toml

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ bech32 = "0.8"
2424
hex = "0.4.2"
2525
rayon = "1.5"
2626
base64 = "0.13.0"
27-
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
28-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
29-
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
30-
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
31-
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
32-
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
33-
chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", optional = true }
27+
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
28+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
29+
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
30+
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
31+
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
32+
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
33+
chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", optional = true }
3434
jormungandr-lib = { path = "../jormungandr-lib" }
3535
gtmpl = "0.6.0"
3636
ed25519-bip32 = "0.4.1"
@@ -53,7 +53,7 @@ predicates = "2.0"
5353
quickcheck = "0.9"
5454
# FIXME required to work with quickcheck 0.9. Remove after migrating another crate or newer quickcheck
5555
rand07 = { package = "rand", version = "0.7" }
56-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
56+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
5757

5858
[build-dependencies]
5959
versionisator = "1.0.2"

‎jormungandr-lib/Cargo.toml

+11-11
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ description = "Data structures and formats used by Jormungandr node API and conf
99
[dependencies]
1010
serde = { version = "1.0", features = ["derive"] }
1111
serde_with = { version = "1.12", features = ["macros"] }
12-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
13-
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
14-
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
15-
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
16-
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
17-
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
18-
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
19-
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
12+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
13+
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
14+
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
15+
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
16+
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
17+
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
18+
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
19+
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
2020
rand = "0.8"
2121
rand_core = "0.6"
2222
rand_chacha = "0.3"
@@ -35,9 +35,9 @@ quickcheck = "0.9"
3535
quickcheck_macros = "0.9"
3636
# FIXME required to work with quickcheck 0.9. Remove after migrating another crate or newer quickcheck
3737
rand07 = { package = "rand", version = "0.7" }
38-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
39-
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
40-
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
38+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
39+
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
40+
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
4141
ed25519-bip32 = "0.4.1"
4242
serde_yaml = "0.8"
4343
serde_json = "1.0"

‎jormungandr/Cargo.toml

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "jormungandr"
3-
version = "0.15.90"
3+
version = "0.16.0"
44
authors = [ "[email protected]" ]
55
license = "MIT OR Apache-2.0"
66
repository = "https://github.com/input-output-hk/jormungandr"
@@ -12,17 +12,17 @@ Midgard Serpent
1212
edition = "2021"
1313

1414
[dependencies]
15-
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
16-
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
17-
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
18-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
19-
chain-network = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
20-
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
21-
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
22-
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
23-
chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", optional = true }
24-
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
25-
imhamt = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
15+
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
16+
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
17+
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
18+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
19+
chain-network = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
20+
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
21+
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
22+
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
23+
chain-evm = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", optional = true }
24+
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
25+
imhamt = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
2626

2727
arc-swap = "^1.5.0"
2828
async-trait = "0.1.51"
@@ -69,9 +69,9 @@ reqwest = { version = "0.11", default-features = false, features = ["rustls-tls
6969
tokio = { version = "^1.15", features = ["full"] }
7070
quickcheck = "0.9"
7171
quickcheck_macros = "0.9"
72-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
73-
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
74-
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
72+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
73+
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
74+
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
7575
criterion = { version = "0.3", features = ["html_reports", "async_tokio"] }
7676

7777
[[bench]]

‎modules/blockchain/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = ["Nicolas Di Prima <[email protected]>"]
55
edition = "2021"
66

77
[dependencies]
8-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
9-
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test"}
8+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
9+
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold"}
1010
thiserror = "1.0.30"
1111
lru = "0.7"

‎testing/jormungandr-automation/Cargo.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@ bech32 = "0.8"
1717
bytesize = "1.1.0"
1818
serde = { version = "1.0", features = ["derive"] }
1919
serde_json = "1.0"
20-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
21-
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
22-
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
23-
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
24-
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
25-
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = ["with-bench"] }
26-
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
27-
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
28-
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
20+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
21+
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
22+
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
23+
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
24+
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
25+
chain-storage = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = ["with-bench"] }
26+
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
27+
cardano-legacy-address = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
28+
typed-bytes = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
2929
jormungandr-lib = { path = "../../jormungandr-lib" }
3030
jortestkit = { git = "https://github.com/input-output-hk/jortestkit.git", branch = "master" }
3131
rand = "0.8"

‎testing/jormungandr-integration-tests/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ tokio = { version = "1.15", features = ["macros", "time"] }
1212
futures = "0.3.21"
1313
base64 = "0.13"
1414
hex = "0.4.2"
15-
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
16-
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
17-
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
18-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
19-
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
20-
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
15+
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
16+
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
17+
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
18+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
19+
chain-time = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
20+
chain-vote = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
2121
jormungandr-lib = { path = "../../jormungandr-lib" }
2222
hersir = { path = "../hersir" }
2323
loki = { path = "../loki" }

‎testing/loki/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ edition = "2021"
77
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
88

99
[dependencies]
10-
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
11-
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test", features = [ "property-test-api" ] }
12-
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
13-
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold-test" }
10+
chain-addr = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
11+
chain-crypto = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold", features = [ "property-test-api" ] }
12+
chain-core = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
13+
chain-impl-mockchain = { git = "https://github.com/input-output-hk/chain-libs.git", branch = "catalyst-fund9-gold" }
1414
jormungandr-automation = { path = "../jormungandr-automation" }
1515
jormungandr-lib = { path = "../../jormungandr-lib" }
1616
thor = {path = "../thor"}

0 commit comments

Comments
 (0)