From 366dee5f1b028910cfcbfa2d1281b38c4ccf33f9 Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Wed, 25 Oct 2023 19:17:47 -0500 Subject: [PATCH 1/5] Bump legacy_version --- networks/testnet.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/networks/testnet.toml b/networks/testnet.toml index 9c85ca29..4b2371e6 100644 --- a/networks/testnet.toml +++ b/networks/testnet.toml @@ -13,7 +13,7 @@ btc_relayer = [ "https://relayer.nomic-testnet.mappum.io:8443" ] -legacy_version = "=6.3" +legacy_version = "6.4" genesis = """ { From b700e2712b692ad393400ad8dfb36a06abf4365e Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Wed, 25 Oct 2023 19:38:02 -0500 Subject: [PATCH 2/5] Upgrade orga dependency --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- rest/Cargo.lock | 6 +++--- src/bin/nomic.rs | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 60e5e5da..ba349db2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2240,7 +2240,7 @@ checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "merk" version = "2.0.0" -source = "git+https://github.com/nomic-io/merk?rev=33beb3334e6a55d6f72a55e4bb06af73e8af8904#33beb3334e6a55d6f72a55e4bb06af73e8af8904" +source = "git+https://github.com/nomic-io/merk?rev=088e2bb7998cb3704fc00183c9c9fd577982ec61#088e2bb7998cb3704fc00183c9c9fd577982ec61" dependencies = [ "byteorder", "colored", @@ -2544,7 +2544,7 @@ dependencies = [ [[package]] name = "orga" version = "0.3.1" -source = "git+https://github.com/nomic-io/orga.git?rev=973b51d6bdf181096521050dfbdf32c80f9ceda3#973b51d6bdf181096521050dfbdf32c80f9ceda3" +source = "git+https://github.com/nomic-io/orga.git?rev=7c3b820d1a5dd9059f7b039e354fd5e76add81d0#7c3b820d1a5dd9059f7b039e354fd5e76add81d0" dependencies = [ "abci2", "async-trait", @@ -2605,7 +2605,7 @@ dependencies = [ [[package]] name = "orga-macros" version = "0.3.1" -source = "git+https://github.com/nomic-io/orga.git?rev=973b51d6bdf181096521050dfbdf32c80f9ceda3#973b51d6bdf181096521050dfbdf32c80f9ceda3" +source = "git+https://github.com/nomic-io/orga.git?rev=7c3b820d1a5dd9059f7b039e354fd5e76add81d0#7c3b820d1a5dd9059f7b039e354fd5e76add81d0" dependencies = [ "darling", "heck 0.3.3", diff --git a/Cargo.toml b/Cargo.toml index a028ba7c..ee5f68bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ default-run = "nomic" [dependencies] bitcoin = { version = "0.29.2", features = ["serde", "rand"] } -orga = { git = "https://github.com/nomic-io/orga.git", rev = "973b51d6bdf181096521050dfbdf32c80f9ceda3", features = [ +orga = { git = "https://github.com/nomic-io/orga.git", rev = "7c3b820d1a5dd9059f7b039e354fd5e76add81d0", features = [ "merk-verify", ] } thiserror = "1.0.30" diff --git a/rest/Cargo.lock b/rest/Cargo.lock index 82d4a197..b6e93dae 100644 --- a/rest/Cargo.lock +++ b/rest/Cargo.lock @@ -2200,7 +2200,7 @@ checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "merk" version = "2.0.0" -source = "git+https://github.com/nomic-io/merk?rev=33beb3334e6a55d6f72a55e4bb06af73e8af8904#33beb3334e6a55d6f72a55e4bb06af73e8af8904" +source = "git+https://github.com/nomic-io/merk?rev=088e2bb7998cb3704fc00183c9c9fd577982ec61#088e2bb7998cb3704fc00183c9c9fd577982ec61" dependencies = [ "byteorder", "colored", @@ -2515,7 +2515,7 @@ dependencies = [ [[package]] name = "orga" version = "0.3.1" -source = "git+https://github.com/nomic-io/orga.git?rev=973b51d6bdf181096521050dfbdf32c80f9ceda3#973b51d6bdf181096521050dfbdf32c80f9ceda3" +source = "git+https://github.com/nomic-io/orga.git?rev=7c3b820d1a5dd9059f7b039e354fd5e76add81d0#7c3b820d1a5dd9059f7b039e354fd5e76add81d0" dependencies = [ "abci2", "async-trait", @@ -2576,7 +2576,7 @@ dependencies = [ [[package]] name = "orga-macros" version = "0.3.1" -source = "git+https://github.com/nomic-io/orga.git?rev=973b51d6bdf181096521050dfbdf32c80f9ceda3#973b51d6bdf181096521050dfbdf32c80f9ceda3" +source = "git+https://github.com/nomic-io/orga.git?rev=7c3b820d1a5dd9059f7b039e354fd5e76add81d0#7c3b820d1a5dd9059f7b039e354fd5e76add81d0" dependencies = [ "darling", "heck 0.3.3", diff --git a/src/bin/nomic.rs b/src/bin/nomic.rs index 7fd4303c..38b506c0 100644 --- a/src/bin/nomic.rs +++ b/src/bin/nomic.rs @@ -333,6 +333,7 @@ impl StartCmd { false, #[cfg(not(feature = "testnet"))] true, + true, ); } if cmd.skip_init_chain { From b420e247621bfe32d037ab283c2e30f2ad370782 Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Wed, 25 Oct 2023 19:38:26 -0500 Subject: [PATCH 3/5] v6.5.0 --- Cargo.lock | 2 +- Cargo.toml | 2 +- rest/Cargo.lock | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ba349db2..ae86eec1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2365,7 +2365,7 @@ dependencies = [ [[package]] name = "nomic" -version = "6.4.2" +version = "6.5.0" dependencies = [ "base64 0.13.1", "bech32", diff --git a/Cargo.toml b/Cargo.toml index ee5f68bf..29bd9ecf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "nomic" -version = "6.4.2" +version = "6.5.0" authors = ["The Nomic Team "] edition = "2021" default-run = "nomic" diff --git a/rest/Cargo.lock b/rest/Cargo.lock index b6e93dae..5231e1f9 100644 --- a/rest/Cargo.lock +++ b/rest/Cargo.lock @@ -2308,7 +2308,7 @@ dependencies = [ [[package]] name = "nomic" -version = "6.4.2" +version = "6.5.0" dependencies = [ "base64 0.13.1", "bech32", From 1be17964bb833b4bba9be16a8bb1f1322657ce65 Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Wed, 25 Oct 2023 20:01:42 -0500 Subject: [PATCH 4/5] Bump CONSENSUS_VERSION to 9 --- src/app.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app.rs b/src/app.rs index 2c3f2e80..b36f8e8f 100644 --- a/src/app.rs +++ b/src/app.rs @@ -106,7 +106,7 @@ pub struct InnerApp { #[orga] impl InnerApp { - pub const CONSENSUS_VERSION: u8 = 8; + pub const CONSENSUS_VERSION: u8 = 9; #[cfg(feature = "full")] fn configure_faucets(&mut self) -> Result<()> { From a11511c1bd13846504452a446e2da47b480d2455 Mon Sep 17 00:00:00 2001 From: Matt Bell Date: Wed, 25 Oct 2023 20:02:50 -0500 Subject: [PATCH 5/5] Add legacy-bin to default features --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 29bd9ecf..0c5245a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,7 +66,7 @@ toml = { version = "0.7.2", features = ["parse"] } semver = "1.0.18" [features] -default = ["full", "feat-ibc", "testnet"] +default = ["full", "feat-ibc", "testnet", "legacy-bin"] full = [ "bitcoincore-rpc-async", "clap",