Move postage into batch file (#2705)

ordinals · Nov 20, 2023 · 1b0bde9 · 1b0bde9
1 parent a2943f5
commit 1b0bde9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/batch.yaml b/batch.yaml
@@ -8,6 +8,9 @@ mode: separate-outputs
 # parent inscription:
 parent: 6ac5cacb768794f4fd7a78bf00f2074891fce68bd65c4ff36e77177237aacacai0
 
+# postage for each inscription:
+postage: 12345
+
 # inscriptions to inscribe
 #
 # each inscription has the following fields:

diff --git a/src/subcommand/wallet/inscribe.rs b/src/subcommand/wallet/inscribe.rs
@@ -55,7 +55,7 @@ pub(crate) struct Inscribe {
     long,
     help = "Inscribe a multiple inscriptions defines in a yaml <BATCH_FILE>.",
     conflicts_with_all = &[
-      "file", "destination", "cbor_metadata", "json_metadata", "satpoint", "reinscribe", "metaprotocol", "parent"
+      "cbor_metadata", "destination", "file", "json_metadata", "metaprotocol", "parent", "postage", "reinscribe", "satpoint"
     ]
   )]
   pub(crate) batch: Option<PathBuf>,
@@ -123,8 +123,7 @@ impl Inscribe {
 
     let chain = options.chain();
 
-    let postage = self.postage.unwrap_or(TransactionBuilder::TARGET_POSTAGE);
-
+    let postage;
     let destinations;
     let inscriptions;
     let mode;
@@ -133,6 +132,9 @@ impl Inscribe {
     match (self.file, self.batch) {
       (Some(file), None) => {
         parent_info = Inscribe::get_parent_info(self.parent, &index, &utxos, &client, chain)?;
+
+        postage = self.postage.unwrap_or(TransactionBuilder::TARGET_POSTAGE);
+
         inscriptions = vec![Inscription::from_file(
           chain,
           file,
@@ -142,7 +144,9 @@ impl Inscribe {
           metadata,
           self.compress,
         )?];
+
         mode = Mode::SeparateOutputs;
+
         destinations = vec![match self.destination.clone() {
           Some(destination) => destination.require_network(chain.network())?,
           None => get_change_address(&client, chain)?,
@@ -153,6 +157,11 @@ impl Inscribe {
 
         parent_info = Inscribe::get_parent_info(batchfile.parent, &index, &utxos, &client, chain)?;
 
+        postage = batchfile
+          .postage
+          .map(Amount::from_sat)
+          .unwrap_or(TransactionBuilder::TARGET_POSTAGE);
+
         inscriptions = batchfile.inscriptions(
           chain,
           parent_info.as_ref().map(|info| info.tx_out.value),
@@ -797,7 +806,7 @@ inscriptions:
           }
         ],
         parent: Some(parent),
-        mode: Mode::SeparateOutputs,
+        ..Default::default()
       }
     );
   }

diff --git a/src/subcommand/wallet/inscribe/batch.rs b/src/subcommand/wallet/inscribe/batch.rs
@@ -518,8 +518,9 @@ impl Batch {
   }
 }
 
-#[derive(PartialEq, Debug, Copy, Clone, Serialize, Deserialize)]
+#[derive(PartialEq, Debug, Copy, Clone, Serialize, Deserialize, Default)]
 pub(crate) enum Mode {
+  #[default]
   #[serde(rename = "separate-outputs")]
   SeparateOutputs,
   #[serde(rename = "shared-output")]
@@ -547,12 +548,13 @@ impl BatchEntry {
   }
 }
 
-#[derive(Deserialize, PartialEq, Debug, Clone)]
+#[derive(Deserialize, PartialEq, Debug, Clone, Default)]
 #[serde(deny_unknown_fields)]
 pub(crate) struct Batchfile {
   pub(crate) inscriptions: Vec<BatchEntry>,
   pub(crate) mode: Mode,
   pub(crate) parent: Option<InscriptionId>,
+  pub(crate) postage: Option<u64>,
 }
 
 impl Batchfile {

diff --git a/tests/wallet/inscribe.rs b/tests/wallet/inscribe.rs
@@ -1014,13 +1014,13 @@ fn batch_in_same_output_with_non_default_postage() {
 
   create_wallet(&rpc_server);
 
-  let output = CommandBuilder::new("wallet inscribe --fee-rate 1 --batch batch.yaml --postage 777sat")
+  let output = CommandBuilder::new("wallet inscribe --fee-rate 1 --batch batch.yaml")
     .write("inscription.txt", "Hello World")
     .write("tulip.png", [0; 555])
     .write("meow.wav", [0; 2048])
     .write(
       "batch.yaml",
-      "mode: shared-output\ninscriptions:\n- file: inscription.txt\n- file: tulip.png\n- file: meow.wav\n"
+      "mode: shared-output\npostage: 777\ninscriptions:\n- file: inscription.txt\n- file: tulip.png\n- file: meow.wav\n"
     )
     .rpc_server(&rpc_server)
     .run_and_deserialize_output::<Inscribe>();
@@ -1168,13 +1168,13 @@ fn batch_in_separate_outputs_with_parent_and_non_default_postage() {
 
   let parent_id = parent_output.inscriptions[0].id;
 
-  let output = CommandBuilder::new("wallet inscribe --fee-rate 1 --batch batch.yaml --postage 777sat")
+  let output = CommandBuilder::new("wallet inscribe --fee-rate 1 --batch batch.yaml")
     .write("inscription.txt", "Hello World")
     .write("tulip.png", [0; 555])
     .write("meow.wav", [0; 2048])
     .write(
       "batch.yaml",
-      format!("parent: {parent_id}\nmode: separate-outputs\ninscriptions:\n- file: inscription.txt\n- file: tulip.png\n- file: meow.wav\n")
+      format!("parent: {parent_id}\nmode: separate-outputs\npostage: 777\ninscriptions:\n- file: inscription.txt\n- file: tulip.png\n- file: meow.wav\n")
     )
     .rpc_server(&rpc_server)
     .run_and_deserialize_output::<Inscribe>();