feat/split build and sign for commit tx (#17)

bitfinity-network · Apr 3, 2024 · 4917d94 · 4917d94
1 parent 54371f5
commit 4917d94
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 100 deletions.
diff --git a/examples/deploy.rs b/examples/deploy.rs
@@ -4,7 +4,9 @@ use argh::FromArgs;
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::{Address, Network, PrivateKey};
 use log::{debug, info};
-use ord_rs::wallet::{CreateCommitTransactionArgsV2, RevealTransactionArgs};
+use ord_rs::wallet::{
+    CreateCommitTransactionArgsV2, RevealTransactionArgs, SignCommitTransactionArgs,
+};
 use ord_rs::{Brc20, OrdTransactionBuilder};
 use utils::rpc_client;
 
@@ -83,26 +85,37 @@ async fn main() -> anyhow::Result<()> {
         _ => panic!("invalid script type"),
     };
 
-    let commit_tx = builder
-        .build_commit_transaction_with_fixed_fees(
-            network,
-            CreateCommitTransactionArgsV2 {
+    let commit_tx = builder.build_commit_transaction_with_fixed_fees(
+        network,
+        CreateCommitTransactionArgsV2 {
+            inputs: inputs.clone(),
+            inscription: Brc20::deploy(ticker, amount, Some(limit), None),
+            txin_script_pubkey: sender_address.script_pubkey(),
+            leftovers_recipient: sender_address.clone(),
+            commit_fee,
+            reveal_fee,
+        },
+    )?;
+    let signed_commit_tx = builder
+        .sign_commit_transaction(
+            commit_tx.unsigned_tx,
+            SignCommitTransactionArgs {
                 inputs,
-                inscription: Brc20::deploy(ticker, amount, Some(limit), None),
                 txin_script_pubkey: sender_address.script_pubkey(),
-                leftovers_recipient: sender_address.clone(),
-                commit_fee,
-                reveal_fee,
             },
         )
         .await?;
-    debug!("commit transaction: {commit_tx:?}");
+
+    debug!("commit transaction: {signed_commit_tx:?}");
 
     let commit_txid = if args.dry_run {
-        commit_tx.tx.txid()
+        signed_commit_tx.txid()
     } else {
-        info!("broadcasting Commit transaction: {}", commit_tx.tx.txid());
-        rpc_client::broadcast_transaction(&commit_tx.tx, network).await?
+        info!(
+            "broadcasting Commit transaction: {}",
+            signed_commit_tx.txid()
+        );
+        rpc_client::broadcast_transaction(&signed_commit_tx, network).await?
     };
     info!("Commit transaction broadcasted: {}", commit_txid);
 

diff --git a/examples/mint.rs b/examples/mint.rs
@@ -4,7 +4,9 @@ use argh::FromArgs;
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::{Address, Network, PrivateKey};
 use log::{debug, info};
-use ord_rs::wallet::{CreateCommitTransactionArgsV2, RevealTransactionArgs};
+use ord_rs::wallet::{
+    CreateCommitTransactionArgsV2, RevealTransactionArgs, SignCommitTransactionArgs,
+};
 use ord_rs::{Brc20, OrdTransactionBuilder};
 
 use self::utils::rpc_client;
@@ -78,26 +80,37 @@ async fn main() -> anyhow::Result<()> {
         _ => panic!("invalid script type"),
     };
 
-    let commit_tx = builder
-        .build_commit_transaction_with_fixed_fees(
-            network,
-            CreateCommitTransactionArgsV2 {
+    let commit_tx = builder.build_commit_transaction_with_fixed_fees(
+        network,
+        CreateCommitTransactionArgsV2 {
+            inputs: inputs.clone(),
+            inscription: Brc20::mint(ticker, amount),
+            txin_script_pubkey: sender_address.script_pubkey(),
+            leftovers_recipient: sender_address.clone(),
+            commit_fee,
+            reveal_fee,
+        },
+    )?;
+
+    let signed_commit_tx = builder
+        .sign_commit_transaction(
+            commit_tx.unsigned_tx,
+            SignCommitTransactionArgs {
                 inputs,
-                inscription: Brc20::mint(ticker, amount),
                 txin_script_pubkey: sender_address.script_pubkey(),
-                leftovers_recipient: sender_address.clone(),
-                commit_fee,
-                reveal_fee,
             },
         )
         .await?;
-    debug!("commit transaction: {commit_tx:?}");
+    debug!("commit transaction: {signed_commit_tx:?}");
 
     let commit_txid = if args.dry_run {
-        commit_tx.tx.txid()
+        signed_commit_tx.txid()
     } else {
-        info!("broadcasting Commit transaction: {}", commit_tx.tx.txid());
-        rpc_client::broadcast_transaction(&commit_tx.tx, network).await?
+        info!(
+            "broadcasting Commit transaction: {}",
+            signed_commit_tx.txid()
+        );
+        rpc_client::broadcast_transaction(&signed_commit_tx, network).await?
     };
     info!("Commit transaction broadcasted: {}", commit_txid);
 

diff --git a/examples/transfer.rs b/examples/transfer.rs
@@ -4,7 +4,9 @@ use argh::FromArgs;
 use bitcoin::secp256k1::Secp256k1;
 use bitcoin::{Address, Network, PrivateKey};
 use log::{debug, info};
-use ord_rs::wallet::{CreateCommitTransactionArgsV2, RevealTransactionArgs};
+use ord_rs::wallet::{
+    CreateCommitTransactionArgsV2, RevealTransactionArgs, SignCommitTransactionArgs,
+};
 use ord_rs::{Brc20, OrdTransactionBuilder};
 
 use self::utils::rpc_client;
@@ -77,26 +79,37 @@ async fn main() -> anyhow::Result<()> {
         _ => panic!("invalid script type"),
     };
 
-    let commit_tx = builder
-        .build_commit_transaction_with_fixed_fees(
-            network,
-            CreateCommitTransactionArgsV2 {
+    let commit_tx = builder.build_commit_transaction_with_fixed_fees(
+        network,
+        CreateCommitTransactionArgsV2 {
+            inputs: inputs.clone(),
+            inscription: Brc20::transfer(ticker, amount),
+            txin_script_pubkey: sender_address.script_pubkey(),
+            leftovers_recipient: sender_address.clone(),
+            commit_fee,
+            reveal_fee,
+        },
+    )?;
+    debug!("commit transaction: {commit_tx:?}");
+
+    let signed_commit_tx = builder
+        .sign_commit_transaction(
+            commit_tx.unsigned_tx,
+            SignCommitTransactionArgs {
                 inputs,
-                inscription: Brc20::transfer(ticker, amount),
                 txin_script_pubkey: sender_address.script_pubkey(),
-                leftovers_recipient: sender_address.clone(),
-                commit_fee,
-                reveal_fee,
             },
         )
         .await?;
-    debug!("commit transaction: {commit_tx:?}");
 
     let commit_txid = if args.dry_run {
-        commit_tx.tx.txid()
+        signed_commit_tx.txid()
     } else {
-        info!("broadcasting Commit transaction: {}", commit_tx.tx.txid());
-        rpc_client::broadcast_transaction(&commit_tx.tx, network).await?
+        info!(
+            "broadcasting Commit transaction: {}",
+            signed_commit_tx.txid()
+        );
+        rpc_client::broadcast_transaction(&signed_commit_tx, network).await?
     };
     info!("Commit transaction broadcasted: {}", commit_txid);
 

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
diff --git a/src/lib.rs b/src/lib.rs
@@ -31,8 +31,10 @@ pub use inscription::brc20::Brc20;
 pub use inscription::nft::Nft;
 pub use inscription::Inscription;
 pub use result::OrdResult;
+pub use utils::constants;
 pub use utils::fees::{self, MultisigConfig};
 pub use wallet::{
     CreateCommitTransaction, CreateCommitTransactionArgs, ExternalSigner, OrdParser,
-    OrdTransactionBuilder, RevealTransactionArgs, Utxo, Wallet, WalletType,
+    OrdTransactionBuilder, RevealTransactionArgs, SignCommitTransactionArgs, Utxo, Wallet,
+    WalletType,
 };
diff --git a/src/wallet.rs b/src/wallet.rs
@@ -4,6 +4,7 @@ mod parser;
 pub use builder::signer::{ExternalSigner, Wallet, WalletType};
 pub use builder::{
     CreateCommitTransaction, CreateCommitTransactionArgs, CreateCommitTransactionArgsV2,
-    OrdTransactionBuilder, RedeemScriptPubkey, RevealTransactionArgs, ScriptType, Utxo,
+    OrdTransactionBuilder, RedeemScriptPubkey, RevealTransactionArgs, ScriptType,
+    SignCommitTransactionArgs, Utxo,
 };
 pub use parser::OrdParser;