Merge pull request #243 from nomic-io/testnet-6.5

Testnet 6.5
nomic-io · Oct 26, 2023 · 198155a · 198155a
2 parents 36eb536 + cdbd061
commit 198155a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,13 +1,13 @@
 [package]
 name = "nomic"
-version = "6.4.2"
+version = "6.5.0"
 authors = ["The Nomic Team <[email protected]>"]
 edition = "2021"
 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"
@@ -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",

diff --git 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 = """
 {

diff --git a/rest/Cargo.lock b/rest/Cargo.lock
diff --git 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<()> {

diff --git 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 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -333,6 +333,7 @@ impl StartCmd { @@
                     false,
                     #[cfg(not(feature = "testnet"))]
                     true,
+                    true,
                 );
             }
             if cmd.skip_init_chain {
@@ Expand Down @@