From 140dc6dc04d4bbebd047d4f76571eec41ce8cd4d Mon Sep 17 00:00:00 2001
From: Ian McKenzie <13459320+ikmckenz@users.noreply.github.com>
Date: Sat, 3 Feb 2024 22:43:59 -0800
Subject: [PATCH] Upgrade to vergen 8.3, move to git describe --dirty --tags
 for semver (#1543)

* Upgrade to vergen 8.3, move to git describe --dirty --tags for semver

* Add newline to build.rs
---
 Cargo.lock              | 66 +++++++++++++----------------------------
 swap/Cargo.toml         |  2 +-
 swap/build.rs           | 10 +++----
 swap/src/asb/command.rs |  2 +-
 swap/src/cli/command.rs |  2 +-
 5 files changed, 29 insertions(+), 53 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c4fd45c1..5724a107 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -703,7 +703,7 @@ dependencies = [
  "nom",
  "pathdiff",
  "serde",
- "toml 0.8.8",
+ "toml 0.8.9",
 ]
 
 [[package]]
@@ -1180,26 +1180,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "enum-iterator"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91a4ec26efacf4aeff80887a175a419493cb6f8b5480d26387eb0bd038976187"
-dependencies = [
- "enum-iterator-derive",
-]
-
-[[package]]
-name = "enum-iterator-derive"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "828de45d0ca18782232dfb8f3ea9cc428e8ced380eb26a520baaacfc70de39ce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -1480,18 +1460,6 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "getset"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e45727250e75cc04ff2846a66397da8ef2b3db8e40e0cef4df67950a07621eb9"
-dependencies = [
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "ghash"
 version = "0.4.1"
@@ -1510,11 +1478,11 @@ checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
 
 [[package]]
 name = "git2"
-version = "0.16.1"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf7f68c2995f392c49fffb4f95ae2c873297830eb25c6bc4c114ce8f4562acc"
+checksum = "fbf97ba92db08df386e10c8ede66a2a0369bd277090afd8710e19e38de9ec0cd"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.4.0",
  "libc",
  "libgit2-sys",
  "log",
@@ -1984,9 +1952,9 @@ checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
 
 [[package]]
 name = "libgit2-sys"
-version = "0.14.2+1.5.1"
+version = "0.16.1+1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f3d95f6b51075fe9810a7ae22c7095f12b98005ab364d8544797a825ce946a4"
+checksum = "f2a2bb3680b094add03bb3732ec520ece34da31a8cd2d633d1389d0f0fb60d0c"
 dependencies = [
  "cc",
  "libc",
@@ -2740,6 +2708,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "object"
 version = "0.32.1"
@@ -3646,9 +3623,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.11"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
 
 [[package]]
 name = "rusty-fork"
@@ -4589,7 +4566,9 @@ checksum = "fe80ced77cbfb4cb91a94bf72b378b4b6791a0d9b7f09d0be747d1bdff4e68bd"
 dependencies = [
  "deranged",
  "itoa 1.0.1",
+ "libc",
  "num-conv",
+ "num_threads",
  "powerfmt",
  "serde",
  "time-core",
@@ -5191,17 +5170,14 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
 
 [[package]]
 name = "vergen"
-version = "7.5.1"
+version = "8.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21b881cd6636ece9735721cf03c1fe1e774fe258683d084bb2812ab67435749"
+checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525"
 dependencies = [
  "anyhow",
  "cfg-if 1.0.0",
- "enum-iterator",
- "getset",
  "git2",
  "rustversion",
- "thiserror",
  "time 0.3.32",
 ]
 
diff --git a/swap/Cargo.toml b/swap/Cargo.toml
index f850085b..2be46da8 100644
--- a/swap/Cargo.toml
+++ b/swap/Cargo.toml
@@ -89,4 +89,4 @@ testcontainers = "0.12"
 
 [build-dependencies]
 anyhow = "1"
-vergen = { version = "7.5", default-features = false, features = [ "git", "build" ] }
+vergen = { version = "8.3", default-features = false, features = [ "build", "git", "git2" ] }
diff --git a/swap/build.rs b/swap/build.rs
index 10b11e3c..57bbce40 100644
--- a/swap/build.rs
+++ b/swap/build.rs
@@ -1,9 +1,9 @@
 use anyhow::Result;
-use vergen::{vergen, Config, SemverKind};
+use vergen::EmitBuilder;
 
 fn main() -> Result<()> {
-    let mut config = Config::default();
-    *config.git_mut().semver_kind_mut() = SemverKind::Lightweight;
-
-    vergen(config)
+    EmitBuilder::builder()
+        .git_describe(true, true, None)
+        .emit()?;
+    Ok(())
 }
diff --git a/swap/src/asb/command.rs b/swap/src/asb/command.rs
index 6831e595..f22e1500 100644
--- a/swap/src/asb/command.rs
+++ b/swap/src/asb/command.rs
@@ -226,7 +226,7 @@ pub enum Command {
     name = "asb",
     about = "Automated Swap Backend for swapping XMR for BTC",
     author,
-    version = env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT")
+    version = env!("VERGEN_GIT_DESCRIBE")
 )]
 pub struct RawArguments {
     #[structopt(long, help = "Swap on testnet")]
diff --git a/swap/src/cli/command.rs b/swap/src/cli/command.rs
index ee48428a..5c3b2827 100644
--- a/swap/src/cli/command.rs
+++ b/swap/src/cli/command.rs
@@ -298,7 +298,7 @@ pub enum Command {
     name = "swap",
     about = "CLI for swapping BTC for XMR",
     author,
-    version = env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT")
+    version = env!("VERGEN_GIT_DESCRIBE")
 )]
 struct RawArguments {
     // global is necessary to ensure that clap can match against testnet in subcommands