Merge branch 'grim' into ci

# Conflicts:
#	.github/workflows/publish-ghcr.yaml.yml

Author: ardocrat

.github/workflows/cd.yaml

@@ -29,7 +29,7 @@ jobs:
 
     macos-release-x86:
         name: macOS Release - x86_64
-        runs-on: macos-latest
+        runs-on: macos-15-intel
         steps:
           - name: Install Rust Target
             run: rustup target add x86_64-apple-darwin
@@ -38,17 +38,17 @@ jobs:
           - name: Build
             run: cargo build --release --target x86_64-apple-darwin
           - name: Archive
-            working-directory: target/release
+            working-directory: target/x86_64-apple-darwin/release
             run: tar -czvf grin-${{  github.ref_name }}-macos-x86_64.tar.gz grin
           - name: Create Checksum
-            working-directory: target/release
+            working-directory: target/x86_64-apple-darwin/release
             run: openssl sha256 grin-${{  github.ref_name }}-macos-x86_64.tar.gz > grin-${{  github.ref_name }}-macos-x86_64-sha256sum.txt
           - name: Release
             uses: softprops/action-gh-release@v1
             with:
                 files: |
-                    target/release/grin-${{  github.ref_name }}-macos-x86_64.tar.gz
-                    target/release/grin-${{  github.ref_name }}-macos-x86_64-sha256sum.txt
+                    target/x86_64-apple-darwin/release/grin-${{  github.ref_name }}-macos-x86_64.tar.gz
+                    target/x86_64-apple-darwin/release/grin-${{  github.ref_name }}-macos-x86_64-sha256sum.txt
 
     macos-release-arm64:
         name: macOS Release - arm64

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "grin"
-version = "5.4.0-alpha.0"
+version = "5.4.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
 license = "Apache-2.0"
@@ -34,15 +34,15 @@ serde_json = "1"
 log = "0.4"
 term = "0.6"
 
-grin_api = { path = "./api", version = "5.4.0-alpha.0" }
-grin_config = { path = "./config", version = "5.4.0-alpha.0" }
-grin_chain = { path = "./chain", version = "5.4.0-alpha.0" }
-grin_core = { path = "./core", version = "5.4.0-alpha.0" }
-grin_keychain = { path = "./keychain", version = "5.4.0-alpha.0" }
-grin_p2p = { path = "./p2p", version = "5.4.0-alpha.0" }
-grin_servers = { path = "./servers", version = "5.4.0-alpha.0" }
-grin_util = { path = "./util", version = "5.4.0-alpha.0" }
-grin_store = { path = "./store", version = "5.4.0-alpha.0" }
+grin_api = { path = "./api", version = "5.4.0" }
+grin_config = { path = "./config", version = "5.4.0" }
+grin_chain = { path = "./chain", version = "5.4.0" }
+grin_core = { path = "./core", version = "5.4.0" }
+grin_keychain = { path = "./keychain", version = "5.4.0" }
+grin_p2p = { path = "./p2p", version = "5.4.0" }
+grin_servers = { path = "./servers", version = "5.4.0" }
+grin_util = { path = "./util", version = "5.4.0" }
+grin_store = { path = "./store", version = "5.4.0" }
 
 [dependencies.cursive]
 version = "0.21"
@@ -53,5 +53,5 @@ features = ["pancurses-backend"]
 built = { version = "0.8.0", features = ["git2"]}
 
 [dev-dependencies]
-grin_chain = { path = "./chain", version = "5.4.0-alpha.0" }
-grin_store = { path = "./store", version = "5.4.0-alpha.0" }
+grin_chain = { path = "./chain", version = "5.4.0" }
+grin_store = { path = "./store", version = "5.4.0" }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_api"
-version = "5.4.0-alpha.0"
+version = "5.4.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "APIs for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
 license = "Apache-2.0"
@@ -32,9 +32,9 @@ async-stream = "0.3"
 url = "2.1"
 bytes = "1"
 
-grin_core = { path = "../core", version = "5.4.0-alpha.0" }
-grin_chain = { path = "../chain", version = "5.4.0-alpha.0" }
-grin_p2p = { path = "../p2p", version = "5.4.0-alpha.0" }
-grin_pool = { path = "../pool", version = "5.4.0-alpha.0" }
-grin_store = { path = "../store", version = "5.4.0-alpha.0" }
-grin_util = { path = "../util", version = "5.4.0-alpha.0" }
+grin_core = { path = "../core", version = "5.4.0" }
+grin_chain = { path = "../chain", version = "5.4.0" }
+grin_p2p = { path = "../p2p", version = "5.4.0" }
+grin_pool = { path = "../pool", version = "5.4.0" }
+grin_store = { path = "../store", version = "5.4.0" }
+grin_util = { path = "../util", version = "5.4.0" }

api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "grin_chain"
-version = "5.4.0-alpha.0"
+version = "5.4.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Chain implementation for grin, a simple, private and scalable cryptocurrency implementation based on the Mimblewimble chain format."
 license = "Apache-2.0"
@@ -23,10 +23,10 @@ chrono = "0.4.11"
 lru-cache = "0.1"
 lazy_static = "1"
 
-grin_core = { path = "../core", version = "5.4.0-alpha.0" }
-grin_keychain = { path = "../keychain", version = "5.4.0-alpha.0" }
-grin_store = { path = "../store", version = "5.4.0-alpha.0" }
-grin_util = { path = "../util", version = "5.4.0-alpha.0" }
+grin_core = { path = "../core", version = "5.4.0" }
+grin_keychain = { path = "../keychain", version = "5.4.0" }
+grin_store = { path = "../store", version = "5.4.0" }
+grin_util = { path = "../util", version = "5.4.0" }
 
 [dev-dependencies]
 env_logger = "0.7"

chain/Cargo.toml

@@ -43,6 +43,9 @@ pub const SEGMENT_REQUEST_TIMEOUT_SECS: i64 = 20;
 /// will always be requested first)
 pub const SEGMENT_REQUEST_COUNT: usize = 15;
 
+/// How many blocks behind the tip a PIBD peer may be and still be considered usable.
+pub const PIBD_PEER_HEIGHT_SLACK_BLOCKS: u64 = 2;
+
 /// If the syncer hasn't seen a max work peer that supports PIBD in this number of seconds
 /// give up and revert back to the txhashset.zip download method
 pub const TXHASHSET_ZIP_FALLBACK_TIME_SECS: i64 = 60;