|
14 | 14 |
|
15 | 15 | use prelude::*;
|
16 | 16 |
|
17 |
| -use io; |
| 17 | +use ::{EcdsaSig, io}; |
18 | 18 |
|
19 | 19 | use blockdata::script::Script;
|
20 | 20 | use blockdata::transaction::{EcdsaSigHashType, Transaction, TxOut};
|
@@ -87,9 +87,8 @@ pub struct Input {
|
87 | 87 | /// including P2SH embedded ones.
|
88 | 88 | pub witness_utxo: Option<TxOut>,
|
89 | 89 | /// A map from public keys to their corresponding signature as would be
|
90 |
| - /// pushed to the stack from a scriptSig or witness. |
91 |
| - #[cfg_attr(feature = "serde", serde(with = "::serde_utils::btreemap_byte_values"))] |
92 |
| - pub partial_sigs: BTreeMap<PublicKey, Vec<u8>>, |
| 90 | + /// pushed to the stack from a scriptSig or witness for a non-taproot inputs. |
| 91 | + pub partial_sigs: BTreeMap<PublicKey, EcdsaSig>, |
93 | 92 | /// The sighash type to be used for this input. Signatures for this input
|
94 | 93 | /// must use the sighash type.
|
95 | 94 | pub sighash_type: Option<EcdsaSigHashType>,
|
@@ -163,7 +162,7 @@ impl Map for Input {
|
163 | 162 | }
|
164 | 163 | PSBT_IN_PARTIAL_SIG => {
|
165 | 164 | impl_psbt_insert_pair! {
|
166 |
| - self.partial_sigs <= <raw_key: PublicKey>|<raw_value: Vec<u8>> |
| 165 | + self.partial_sigs <= <raw_key: PublicKey>|<raw_value: EcdsaSig> |
167 | 166 | }
|
168 | 167 | }
|
169 | 168 | PSBT_IN_SIGHASH_TYPE => {
|
@@ -267,7 +266,7 @@ impl Map for Input {
|
267 | 266 | }
|
268 | 267 |
|
269 | 268 | impl_psbt_get_pair! {
|
270 |
| - rv.push(self.partial_sigs as <PSBT_IN_PARTIAL_SIG, PublicKey>|<Vec<u8>>) |
| 269 | + rv.push(self.partial_sigs as <PSBT_IN_PARTIAL_SIG, PublicKey>|<EcdsaSig>) |
271 | 270 | }
|
272 | 271 |
|
273 | 272 | impl_psbt_get_pair! {
|
|
0 commit comments