From 8e141f73f79dfe9b50f6fffc5da3b6b71ec7804b Mon Sep 17 00:00:00 2001
From: zhiqiangxu <652732310@qq.com>
Date: Thu, 25 Jan 2024 09:57:25 +0800
Subject: [PATCH 1/2] merge master

---
 src/wallet/inscribe/batch_file.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wallet/inscribe/batch_file.rs b/src/wallet/inscribe/batch_file.rs
index 1f08dafc5c..b1d74e616d 100644
--- a/src/wallet/inscribe/batch_file.rs
+++ b/src/wallet/inscribe/batch_file.rs
@@ -35,10 +35,10 @@ impl Batchfile {
       .inscriptions
       .iter()
       .any(|entry| entry.destination.is_some())
-      && self.mode == Mode::SharedOutput
+      && (self.mode == Mode::SharedOutput || self.mode == Mode::SameSat)
     {
       return Err(anyhow!(
-        "individual inscription destinations cannot be set in shared-output mode"
+        "individual inscription destinations cannot be set in shared-output or same-sat mode"
       ));
     }
 

From be4d32bd764ce402b727e58c3c34764e2e51a6d2 Mon Sep 17 00:00:00 2001
From: raphjaph <raphjaph@protonmail.com>
Date: Thu, 25 Jan 2024 05:41:22 -0800
Subject: [PATCH 2/2] Fix test

---
 tests/wallet/inscribe.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/wallet/inscribe.rs b/tests/wallet/inscribe.rs
index 31c85daa40..4bc58f3820 100644
--- a/tests/wallet/inscribe.rs
+++ b/tests/wallet/inscribe.rs
@@ -1517,7 +1517,7 @@ fn batch_inscribe_fails_with_shared_output_and_destination_set() {
     .bitcoin_rpc_server(&bitcoin_rpc_server)
     .ord_rpc_server(&ord_rpc_server)
     .expected_exit_code(1)
-    .stderr_regex("error: individual inscription destinations cannot be set in shared-output mode\n")
+    .stderr_regex("error: individual inscription destinations cannot be set in shared-output or same-sat mode\n")
     .run_and_extract_stdout();
 }