Qortal/pirate-librustzcash
3
0
Fork 0
mirror of https://github.com/Qortal/pirate-librustzcash.git synced 2025-02-23 22:15:52 +00:00
Code Issues Projects Releases Wiki Activity

Added redeem_script parameter

Browse Source
This commit is contained in:
CalDescent 2022-05-15 12:38:53 +01:00
parent a2e12ea51e
commit 5a4fd01f35
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
zcash_primitives/src/transaction/builder.rs
View File

@ -142,6 +142,7 @@ struct TransparentInputInfo {
pubkey: [u8; secp256k1::constants::PUBLIC_KEY_SIZE], pubkey: [u8; secp256k1::constants::PUBLIC_KEY_SIZE],
coin: TxOut, coin: TxOut,
secret: Vec<u8>, secret: Vec<u8>,
redeem_script: Vec<u8>,
} }
#[cfg(feature = "transparent-inputs")] #[cfg(feature = "transparent-inputs")]
@ -173,6 +174,7 @@ impl TransparentInputs {
utxo: OutPoint, utxo: OutPoint,
coin: TxOut, coin: TxOut,
secret: Vec<u8>, secret: Vec<u8>,
redeem_script: Vec<u8>,
) -> Result<(), Error> { ) -> Result<(), Error> {
if coin.value.is_negative() { if coin.value.is_negative() {
return Err(Error::InvalidAmount); return Err(Error::InvalidAmount);
@ -192,7 +194,7 @@ impl TransparentInputs {
} }
mtx.vin.push(TxIn::new(utxo)); mtx.vin.push(TxIn::new(utxo));
self.inputs.push(TransparentInputInfo { sk, pubkey, coin, secret }); self.inputs.push(TransparentInputInfo { sk, pubkey, coin, secret, redeem_script });
Ok(()) Ok(())
} }
@ -234,9 +236,9 @@ impl TransparentInputs {
let mut sig_bytes: Vec<u8> = sig.serialize_der()[..].to_vec(); let mut sig_bytes: Vec<u8> = sig.serialize_der()[..].to_vec();
sig_bytes.extend(&[SIGHASH_ALL as u8]); sig_bytes.extend(&[SIGHASH_ALL as u8]);
if (&info.secret.len() > 0) { if (!&info.secret.is_empty()) {
// Include secret and redeem script // Include secret and redeem script
mtx.vin[i].script_sig = Script::default() << &info.secret[..] << &sig_bytes[..] << &info.pubkey[..] << &info.coin.script_pubkey[..]; mtx.vin[i].script_sig = Script::default() << &info.secret[..] << &sig_bytes[..] << &info.pubkey[..] << &info.redeem_script[..];
} }
else { else {
// P2PKH scriptSig // P2PKH scriptSig
@ -406,7 +408,7 @@ impl<R: RngCore + CryptoRng> Builder<R> {
utxo: OutPoint, utxo: OutPoint,
coin: TxOut, coin: TxOut,
) -> Result<(), Error> { ) -> Result<(), Error> {
self.transparent_inputs.push(&mut self.mtx, sk, utxo, coin, Vec::new()) self.transparent_inputs.push(&mut self.mtx, sk, utxo, coin, Vec::new(), Vec::new())
} }
/// Adds a transparent coin to be spent in this transaction, with HTLC secret. /// Adds a transparent coin to be spent in this transaction, with HTLC secret.
@ -417,8 +419,9 @@ impl<R: RngCore + CryptoRng> Builder<R> {
utxo: OutPoint, utxo: OutPoint,
coin: TxOut, coin: TxOut,
secret: Vec<u8>, secret: Vec<u8>,
redeem_script: Vec<u8>,
) -> Result<(), Error> { ) -> Result<(), Error> {
self.transparent_inputs.push(&mut self.mtx, sk, utxo, coin, secret) self.transparent_inputs.push(&mut self.mtx, sk, utxo, coin, secret, redeem_script)
} }
/// Adds a transparent address to send funds to. /// Adds a transparent address to send funds to.