bitcoin 0.32

processor/src/networks/bitcoin.rs

@@ -20,12 +20,12 @@ use bitcoin_serai::{
     key::{Parity, XOnlyPublicKey},
     consensus::{Encodable, Decodable},
     script::Instruction,
-    address::{NetworkChecked, Address as BAddress},
+    address::Address as BAddress,
     Transaction, Block, Network as BNetwork, ScriptBuf,
     opcodes::all::{OP_SHA256, OP_EQUALVERIFY},
   },
   wallet::{
-    tweak_keys, address_payload, ReceivedOutput, Scanner, TransactionError,
+    tweak_keys, p2tr_script_buf, ReceivedOutput, Scanner, TransactionError,
     SignableTransaction as BSignableTransaction, TransactionMachine,
   },
   rpc::{RpcError, Rpc},
@@ -175,7 +175,7 @@ pub struct Fee(u64);
 impl TransactionTrait<Bitcoin> for Transaction {
   type Id = [u8; 32];
   fn id(&self) -> Self::Id {
-    let mut hash = *self.txid().as_raw_hash().as_byte_array();
+    let mut hash = *self.compute_txid().as_raw_hash().as_byte_array();
     hash.reverse();
     hash
   }
@@ -243,7 +243,8 @@ impl EventualityTrait for Eventuality {
     buf
   }
   fn read_completion<R: io::Read>(reader: &mut R) -> io::Result<Transaction> {
-    Transaction::consensus_decode(reader).map_err(|e| io::Error::other(format!("{e}")))
+    Transaction::consensus_decode(&mut io::BufReader::new(reader))
+      .map_err(|e| io::Error::other(format!("{e}")))
   }
 }
 
@@ -535,11 +536,11 @@ impl Bitcoin {
     private_key: &PrivateKey,
   ) -> ScriptBuf {
     let public_key = PublicKey::from_private_key(SECP256K1, private_key);
-    let main_addr = BAddress::p2pkh(&public_key, BNetwork::Regtest);
+    let main_addr = BAddress::p2pkh(public_key, BNetwork::Regtest);
 
     let mut der = SECP256K1
       .sign_ecdsa_low_r(
-        &Message::from(
+        &Message::from_digest_slice(
           SighashCache::new(tx)
             .legacy_signature_hash(
               input_index,
@@ -547,8 +548,10 @@ impl Bitcoin {
               EcdsaSighashType::All.to_u32(),
             )
             .unwrap()
-            .to_raw_hash(),
-        ),
+            .to_raw_hash()
+            .as_ref(),
+        )
+        .unwrap(),
         &private_key.inner,
       )
       .serialize_der()
@@ -577,8 +580,14 @@ const MAX_INPUTS: usize = 520;
 const MAX_OUTPUTS: usize = 520;
 
 fn address_from_key(key: ProjectivePoint) -> Address {
-  Address::new(BAddress::<NetworkChecked>::new(BNetwork::Bitcoin, address_payload(key).unwrap()))
-    .unwrap()
+  Address::new(
+    BAddress::from_script(
+      &p2tr_script_buf(key).expect("creating address from key which isn't properly tweaked"),
+      BNetwork::Bitcoin,
+    )
+    .expect("couldn't go from p2tr script buf to address"),
+  )
+  .expect("couldn't create Serai-representable address for bitcoin address")
 }
 
 #[async_trait]
@@ -858,7 +867,7 @@ impl Network for Bitcoin {
       Err(RpcError::ConnectionError) => Err(NetworkError::ConnectionError)?,
       // TODO: Distinguish already in pool vs double spend (other signing attempt succeeded) vs
       // invalid transaction
-      Err(e) => panic!("failed to publish TX {}: {e}", tx.txid()),
+      Err(e) => panic!("failed to publish TX {}: {e}", tx.compute_txid()),
     }
     Ok(())
   }
@@ -909,7 +918,7 @@ impl Network for Bitcoin {
     let secret_key = SecretKey::new(&mut rand_core::OsRng);
     let private_key = PrivateKey::new(secret_key, BNetwork::Regtest);
     let public_key = PublicKey::from_private_key(SECP256K1, &private_key);
-    let main_addr = BAddress::p2pkh(&public_key, BNetwork::Regtest);
+    let main_addr = BAddress::p2pkh(public_key, BNetwork::Regtest);
 
     let new_block = self.get_latest_block_number().await.unwrap() + 1;
     self
@@ -923,7 +932,7 @@ impl Network for Bitcoin {
       version: Version(2),
       lock_time: LockTime::ZERO,
       input: vec![TxIn {
-        previous_output: OutPoint { txid: tx.txid(), vout: 0 },
+        previous_output: OutPoint { txid: tx.compute_txid(), vout: 0 },
         script_sig: Script::new().into(),
         sequence: Sequence(u32::MAX),
         witness: Witness::default(),