Atlantis patch (#10)

raphjaph · Jan 31, 2024 · 16cc7c2 · 16cc7c2
1 parent 20167a4
commit 16cc7c2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/atlantis.just b/atlantis.just
@@ -0,0 +1,14 @@
+start-regtest:
+  bitcoind -regtest -txindex
+
+load wallet="ord":
+  bitcoin-cli -regtest -rpcwallet={{wallet}} loadwallet {{wallet}}
+
+mine blocks="1" wallet="ord":
+  #!/usr/bin/env bash
+  set -euxo pipefail
+  address="$(bitcoin-cli -regtest -rpcwallet={{wallet}} getrawchangeaddress "bech32m")"
+  bitcoin-cli -regtest generatetoaddress {{blocks}} $address
+
+dump wallet="ord":
+  RUST_LOG=info cargo run -- --regtest wallet dump
diff --git a/justfile b/justfile
@@ -1,3 +1,5 @@
+mod atlantis
+
 set positional-arguments
 
 watch +args='test':

diff --git a/src/subcommand/wallet/inscribe.rs b/src/subcommand/wallet/inscribe.rs
@@ -167,7 +167,7 @@ impl Inscribe {
       no_limit: self.no_limit,
       parent_info,
       postage,
-      reinscribe: self.reinscribe,
+      reinscribe: self.reinscribe || mode == Mode::SameSat,
       reveal_fee_rate: self.fee_rate,
       satpoint,
     }

diff --git a/src/wallet/inscribe/batch.rs b/src/wallet/inscribe/batch.rs
@@ -230,7 +230,7 @@ impl Batch {
         .ok_or_else(|| anyhow!("wallet contains no cardinal utxos"))?
     };
 
-    let mut reinscription = false;
+    let mut reinscription = false || self.mode == Mode::SameSat;
 
     for (inscribed_satpoint, inscription_id) in &wallet_inscriptions {
       if *inscribed_satpoint == satpoint {