Prepare release (#212)

* update hardcoded values for release * bump version of subcrates * tests: use PKG_VERSION in server.info * dockerfile: remove unused run command
vinteumorg · Aug 13, 2024 · abf4bfc · abf4bfc
1 parent 5104281
commit abf4bfc
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Dockerfile b/Dockerfile
@@ -15,4 +15,4 @@ RUN chmod +x /usr/local/bin/florestad
 
 EXPOSE 50001
 
-CMD [ "florestad", "run"]
+CMD [ "florestad" ]
diff --git a/crates/floresta-chain/Cargo.toml b/crates/floresta-chain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "floresta-chain"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 authors = ["Davidson Souza <[email protected]>"]
 description = """

diff --git a/crates/floresta-chain/src/pruned_utreexo/chain_state.rs b/crates/floresta-chain/src/pruned_utreexo/chain_state.rs
@@ -527,15 +527,15 @@ impl<PersistedState: ChainStore> ChainState<PersistedState> {
             AssumeValidArg::UserInput(hash) => Some(hash),
             AssumeValidArg::Hardcoded => match network {
                 Network::Bitcoin => {
-                    get_hash("00000000000000000009c97098b5295f7e5f183ac811fb5d1534040adb93cabd")
+                    get_hash("00000000000000000000569f4d863c27e667cbee8acc8da195e7e5551658e6e9")
                         .into()
                 }
                 Network::Testnet => {
-                    get_hash("0000000000000004877fa2d36316398528de4f347df2f8a96f76613a298ce060")
+                    get_hash("000000000000001142ad197bff16a1393290fca09e4ca904dd89e7ae98a90fcd")
                         .into()
                 }
                 Network::Signet => {
-                    get_hash("0000004f401bac79fe6cb3a10ef367b071e0fb51a1c9f4b3e8484e4dd03e1863")
+                    get_hash("0000003ed17b9c93954daab00d73ccbd0092074c4ebfc751c7458d58b827dfea")
                         .into()
                 }
                 Network::Regtest => {

diff --git a/crates/floresta-chain/src/pruned_utreexo/chainparams.rs b/crates/floresta-chain/src/pruned_utreexo/chainparams.rs
@@ -101,26 +101,33 @@ impl ChainParams {
         match network {
             Network::Bitcoin => AssumeUtreexoValue {
                 block_hash: BlockHash::from_str(
-                    "00000000000000000002447c802760582b80022f937d754aece888ec9e96f212",
+                    "00000000000000000000569f4d863c27e667cbee8acc8da195e7e5551658e6e9",
                 )
                 .unwrap(),
-                height: 849070,
+                height: 855571,
                 roots: [
-                    "d9eb4f63c9c302154cfde1d7c36f20674877653883f7d857550351ed3558545c",
-                    "7519893244433168ef4dc3a21e3221b87fa5b3802f4a745be33baa9defa7ac6b",
-                    "59be29510b035212adcffc970f71a889e81db2298ab3bff4d0e3e1b56caa8976",
-                    "3e4833c382dbfa4fd5e496b37ac6769036bba655534249a9d7d5a2a221718a39",
-                    "4569761976542d95af3c765b6fc7e149b71659e5f89ad1cc13a7b00bbd7e9d8d",
-                    "33fbd5f96c50327d309722970378bea7474b171097ba40bc98b360871a1f38c2",
-                    "d2955774ac37daa1e16a2fd9d419906acf6bdf6ffd6f171a9cf72935175cec6f",
-                    "ccac02fac6922f5082e893b83c0898636be24f47dd6c00f502425c9dedab2c25",
-                    "e418ad2e3b516c54a873cd89aec3bbf88513e16192f817b150f168a939f3ad3c",
-                    "1931c7dbc568c4fe92cceab72e870da307df88c8f6e7a01bf6dbfdac4dd88073",
+                    "4dcc014cc23611dda2dcf0f34a3e62e7d302146df4b0b01ac701d440358c19d6",
+                    "988e0a883e4ad0c5559432f4747395115112755ec1138dcdd62e2f5741c31c2c",
+                    "49ecba683e12823d44f2ad190120d3028386d8bb7860a3eea62a250a1f293c60",
+                    "7c02e55ae35f12501134f0b81a351abb6c5e7a2529641d0c537a7534a560c770",
+                    "59cb07c73d71164ce1a4f953cfd01ef0e3269080e29d34022d4251523cb1e8ac",
+                    "ff96c9983b6765092403f8089fe5d0cdd6a94c58e4dcd14e77570c8b10c17628",
+                    "47ed934529b2ea03a7382febcf0c05e0bfc5884cc1235c2ad42624a56234b9a6",
+                    "d5c9373ed35de281d426888bd656f04a36623197a33706932ab82014d67f26ae",
+                    "05de50991df991f0b78d9166d06ce3c61cb29e07dc7c53ba75d75df6455e6967",
+                    "ebfdaf53b7240e9cd25d7c63b35d462763253f9282cc97d8d0c92ea9ade6aa02",
+                    "c349b6850f75346224cf7cf1e0a69e194306c59489017cd4f4a045c001f1fefc",
+                    "7edfd925905e88fd14c47edaaf09606cf0ae19f3b898239a2feb607d175d9a90",
+                    "442dadd38fd16949d2ef03d799aa6b61ad8c0b7c611aaa5e218bc6360c4f41ce",
+                    "2a57b73e540c7a72cb44fdc4ab7fcc3f0f148be7885667f07fce345430f08a15",
+                    "66dc66000a8baaacacef280783a0245b4d33bd7eba5f1f14b939bd3a54e135cb",
+                    "67ba89afe6bce9bafbf0b88013e4446c861e6c746e291c3921e0b65c93671ba3",
+                    "972ea2c7472c22e4eab49e9c2db5757a048b271b6251883ce89ccfeaa38b47ab",
                 ]
                 .into_iter()
                 .map(|x| NodeHash::from_str(x).unwrap())
                 .collect(),
-                leaves: 2554606658,
+                leaves: 2587882501,
             },
             Network::Testnet => AssumeUtreexoValue {
                 block_hash: genesis_block(network.into()).block_hash(),

diff --git a/crates/floresta-cli/Cargo.toml b/crates/floresta-cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "floresta-cli"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 authors = ["Davidson Souza <[email protected]>"]
 license = "MIT"

diff --git a/crates/floresta-common/Cargo.toml b/crates/floresta-common/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "floresta-common"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 description = "Common types and functions for Floresta"
 authors = ["Davidson Souza <[email protected]>"]

diff --git a/crates/floresta-compact-filters/Cargo.toml b/crates/floresta-compact-filters/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "floresta-compact-filters"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Davidson Sousa <[email protected]>"]
 edition = "2018"
 homepage = "https://github.com/davidson-souza/floresta"

diff --git a/crates/floresta-electrum/Cargo.toml b/crates/floresta-electrum/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "floresta-electrum"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 authors = ["Davidson Souza <[email protected]>"]
 description = """

diff --git a/crates/floresta-watch-only/Cargo.toml b/crates/floresta-watch-only/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "floresta-watch-only"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 description = "A simple, lightweight and Electrum-First, watch-only wallet"
 authors = ["Davidson Souza <[email protected]>"]

diff --git a/crates/floresta-watch-only/src/kv_database.rs b/crates/floresta-watch-only/src/kv_database.rs
@@ -180,8 +180,8 @@ mod test {
 
     fn get_test_db() -> KvDatabase {
         let test_id = rand::random::<u32>();
-        let kv_database = KvDatabase::new(format!("./data/{test_id}.floresta/")).unwrap();
-        kv_database
+
+        KvDatabase::new(format!("./data/{test_id}.floresta/")).unwrap()
     }
     fn get_test_address() -> (Address<NetworkUnchecked>, sha256::Hash) {
         let address = Address::from_str("tb1q9d4zjf92nvd3zhg6cvyckzaqumk4zre26x02q9").unwrap();

diff --git a/crates/floresta-watch-only/src/lib.rs b/crates/floresta-watch-only/src/lib.rs
@@ -544,7 +544,7 @@ impl<D: AddressCacheDatabase> AddressCache<D> {
             .expect("Database not working");
 
         if let Entry::Vacant(e) = self.address_map.entry(hash) {
-            let script = transaction.output[index as usize].script_pubkey.clone();
+            let script = transaction.output[index].script_pubkey.clone();
             // This means `cache_transaction` have been called with an address we don't
             // follow. This may be useful for caching new addresses without re-scanning.
             // We can track this address from now onwards, but the past history is only
@@ -750,7 +750,7 @@ mod test {
 
         // [is_cached], [push_descriptor]
         let desc = "wsh(sortedmulti(1,[54ff5a12/48h/1h/0h/2h]tpubDDw6pwZA3hYxcSN32q7a5ynsKmWr4BbkBNHydHPKkM4BZwUfiK7tQ26h7USm8kA1E2FvCy7f7Er7QXKF8RNptATywydARtzgrxuPDwyYv4x/<0;1>/*,[bcf969c0/48h/1h/0h/2h]tpubDEFdgZdCPgQBTNtGj4h6AehK79Jm4LH54JrYBJjAtHMLEAth7LuY87awx9ZMiCURFzFWhxToRJK6xp39aqeJWrG5nuW3eBnXeMJcvDeDxfp/<0;1>/*))#fuw35j0q";
-        cache.push_descriptor(&desc.to_string()).unwrap();
+        cache.push_descriptor(desc).unwrap();
         assert!(cache.is_cached(&desc.to_string()).unwrap());
 
         // [derive_addresses]

diff --git a/crates/floresta-wire/Cargo.toml b/crates/floresta-wire/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "floresta-wire"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 authors = ["Davidson Souza <[email protected]>"]
 description = """

diff --git a/crates/floresta/Cargo.toml b/crates/floresta/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "floresta"
-version = "0.1.0"
+version = "0.2.0"
 authors = ["Davidson Souza <[email protected]>"]
 edition = "2021"
 description = """
@@ -23,13 +23,13 @@ keywords = ["bitcoin", "utreexo", "node", "blockchain", "rust"]
 categories = ["bitcoin", "blockchain", "node"]
 
 [dependencies]
-floresta-common = { path = "../floresta-common", version = "0.1.0" }
-floresta-chain = { path = "../floresta-chain", version = "0.1.0" }
-floresta-wire = { path = "../floresta-wire", version = "0.1.0" }
+floresta-common = { path = "../floresta-common", version = "0.2.0" }
+floresta-chain = { path = "../floresta-chain", version = "0.2.0" }
+floresta-wire = { path = "../floresta-wire", version = "0.2.0" }
 floresta-watch-only = { path = "../floresta-watch-only", features = [
     "memory-database",
-], optional = true, version = "0.1.0" }
-floresta-electrum = { path = "../floresta-electrum", optional = true, version = "0.1.0" }
+], optional = true, version = "0.2.0" }
+floresta-electrum = { path = "../floresta-electrum", optional = true, version = "0.2.0" }
 
 [dev-dependencies]
 rustreexo = "0.3.0"
@@ -40,12 +40,13 @@ bitcoin = { version = "0.31", features = [
     "bitcoinconsensus",
 ], default-features=false }
 
-floresta = { version = "0.1.0", path = "../floresta", features = [
+floresta = { version = "0.2.0", path = "../floresta", features = [
     "bitcoinconsensus",
     "memory-database",
     "electrum-server",
     "watch-only-wallet",
 ] }
+
 futures = "0.3.30"
 
 [features]

diff --git a/florestad/Cargo.toml b/florestad/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "florestad"
-version = "0.5.1"
+version = "0.6.0"
 edition = "2021"
 
 [dependencies]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,4 @@ RUN chmod +x /usr/local/bin/florestad

		EXPOSE 50001

		CMD [ "florestad", "run"]
		CMD [ "florestad" ]