Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions packages/wasm-utxo/cli/test/fixtures/psbt_bitcoin_fullsigned.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,37 @@ psbt: None
├─ tx: None
│ ├─ version: 2i32
│ ├─ lock_time: 0u32
│ ├─ txid: a74380ecd12e5c6e66f608c790daa4be6870f499581b3951cd65b4dcdfae7316 (32 bytes)
│ ├─ ntxid: a74380ecd12e5c6e66f608c790daa4be6870f499581b3951cd65b4dcdfae7316 (32 bytes)
│ ├─ wtxid: a74380ecd12e5c6e66f608c790daa4be6870f499581b3951cd65b4dcdfae7316 (32 bytes)
│ ├─ txid: 1673aedfdcb465cd51391b5899f47068bea4da90c708f6666e5c2ed1ec8043a7
│ ├─ ntxid: 1673aedfdcb465cd51391b5899f47068bea4da90c708f6666e5c2ed1ec8043a7
│ ├─ wtxid: 1673aedfdcb465cd51391b5899f47068bea4da90c708f6666e5c2ed1ec8043a7
│ ├─ inputs: 6u64
│ │ ├─ input_0: None
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ │ ├─ prev_vout: 0u32
│ │ │ ├─ sequence: 4294967294u32
│ │ │ └─ script_sig: (0 bytes)
│ │ ├─ input_1: None
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ │ ├─ prev_vout: 1u32
│ │ │ ├─ sequence: 4294967294u32
│ │ │ └─ script_sig: (0 bytes)
│ │ ├─ input_2: None
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ │ ├─ prev_vout: 2u32
│ │ │ ├─ sequence: 4294967294u32
│ │ │ └─ script_sig: (0 bytes)
│ │ ├─ input_3: None
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ │ ├─ prev_vout: 3u32
│ │ │ ├─ sequence: 4294967294u32
│ │ │ └─ script_sig: (0 bytes)
│ │ ├─ input_4: None
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ │ ├─ prev_vout: 4u32
│ │ │ ├─ sequence: 4294967294u32
│ │ │ └─ script_sig: (0 bytes)
│ │ └─ input_5: None
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ ├─ prev_vout: 5u32
│ │ ├─ sequence: 4294967294u32
│ │ └─ script_sig: (0 bytes)
Expand Down Expand Up @@ -84,7 +84,7 @@ psbt: None
├─ version: 0u32
├─ inputs: 6u64
│ ├─ input_0: None
│ │ ├─ non_witness_utxo: 4d1eb5dbcc8a214b5b448ce4497225c44a2963445fc5b1f5bd4526a36749677d (32 bytes)
│ │ ├─ non_witness_utxo: 7d674967a32645bdf5b1c55f4463294ac4257249e48c445b4b218accdbb51e4d
│ │ ├─ redeem_script: 210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095ac (35 bytes)
│ │ │ └─ asm: OP_PUSHBYTES_33 0336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095 OP_CHECKSIG
│ │ ├─ signatures: 1u64
Expand All @@ -94,7 +94,7 @@ psbt: None
│ │ ├─ sighash_type: 1u32
│ │ └─ sighash_type: SIGHASH_ALL
│ ├─ input_1: None
│ │ ├─ non_witness_utxo: 15d5aba694f147bb8c4f12bbf60d331b183576c20bc2b779f44f35d2e3468906 (32 bytes)
│ │ ├─ non_witness_utxo: 068946e3d2354ff479b7c20bc27635181b330df6bb124f8cbb47f194a6abd515
│ │ ├─ redeem_script: 522102dd86907236b77a3bb7b64ce668cae4a25d48253f32e6ee0c3a34eaf89becfe142103f7b6baf47cbc61cda968fe73d78cb3bce0c88e7a9bc9abba5dac739d25b2046721033c34f9b46ff91498c3a56b8b2a8b752ecd0079337028bdd4e48045f8c6560e0253ae (105 bytes)
│ │ │ └─ asm: OP_PUSHNUM_2 OP_PUSHBYTES_33 02dd86907236b77a3bb7b64ce668cae4a25d48253f32e6ee0c3a34eaf89becfe14 OP_PUSHBYTES_33 03f7b6baf47cbc61cda968fe73d78cb3bce0c88e7a9bc9abba5dac739d25b20467 OP_PUSHBYTES_33 033c34f9b46ff91498c3a56b8b2a8b752ecd0079337028bdd4e48045f8c6560e02 OP_PUSHNUM_3 OP_CHECKMULTISIG
│ │ ├─ signatures: 2u64
Expand Down
18 changes: 9 additions & 9 deletions packages/wasm-utxo/cli/test/fixtures/tx_bitcoin_fullsigned.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
tx: None
├─ version: 2i32
├─ lock_time: 0u32
├─ txid: a4552cc9ccc8db06c214f1ae814e23f729c7697ff0a79e0de3aab9ec14eebfe4 (32 bytes)
├─ ntxid: a74380ecd12e5c6e66f608c790daa4be6870f499581b3951cd65b4dcdfae7316 (32 bytes)
├─ wtxid: a079ce928e643ded05e589af154aec4d821911a252e95a9c0eb1ae276722787a (32 bytes)
├─ txid: e4bfee14ecb9aae30d9ea7f07f69c729f7234e81aef114c206dbc8ccc92c55a4
├─ ntxid: 1673aedfdcb465cd51391b5899f47068bea4da90c708f6666e5c2ed1ec8043a7
├─ wtxid: 7a78226727aeb10e9c5ae952a21119824dec4a15af89e505ed3d648e92ce79a0
├─ inputs: 6u64
│ ├─ input_0: None
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ ├─ prev_vout: 0u32
│ │ ├─ sequence: 4294967294u32
│ │ └─ script_sig: 47304402203780ddb8eaddcbf7f2328996f9a827eab7fcca9e7e8e30e07a922f64f0d7af5a0220203ce27c1194638fbb2155f2e635293966e636a586362cfadbdaadcbdb7bac610123210336ef228ffe9b8efffba052c32d334660dd1f8366cf8fe44ae5aa672b6b629095ac (108 bytes)
│ ├─ input_1: None
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ ├─ prev_vout: 1u32
│ │ ├─ sequence: 4294967294u32
│ │ └─ script_sig: 0047304402206f0db45dc265718b44e1c0a5f5f986bd55c304fee8470d47baaa58b5905cb92d0220587758f798d87db5df57ea0424740e818f796be3381ee3dd25e18fa58f6d311901473044022056d4c049b474025c7c1d34125b02b2f3806b1007d42fba3cdb030383e2807b43022043246ddaad87b30e48d9c8a47341d292ff8a9890d595d7aa02773eb64ac33e77014c69522102dd86907236b77a3bb7b64ce668cae4a25d48253f32e6ee0c3a34eaf89becfe142103f7b6baf47cbc61cda968fe73d78cb3bce0c88e7a9bc9abba5dac739d25b2046721033c34f9b46ff91498c3a56b8b2a8b752ecd0079337028bdd4e48045f8c6560e0253ae (252 bytes)
│ ├─ input_2: None
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ ├─ prev_vout: 2u32
│ │ ├─ sequence: 4294967294u32
│ │ ├─ script_sig: 2200208224f2e5de25d91de7ae08f8744f98ac30a7c86e9c0fcf169279e520c2b8313a (35 bytes)
Expand All @@ -26,7 +26,7 @@ tx: None
│ │ ├─ item_2: 304402206a7419475c4d18dfdb2fce7a0dfaefc8b1aad1af41d38431aa935d29bb7d91e0022077252e9ef649298616e7086006fa838578047c88257c31defe01a934d8edba1801 (71 bytes)
│ │ └─ item_3: 522102d5878a4d1c23ea735d7146ef2e1094f08d118bf0e20ea09366077c6b086c49d62102804dae97fd1acbb46d2816f530f83119dccdcaf3f5dd4c4dabb8edccd04bc65c21022ddee7d0b3f7f894fca44650a72137908eb843432e6874cb873cc0f2d27a54d653ae (105 bytes)
│ ├─ input_3: None
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ ├─ prev_vout: 3u32
│ │ ├─ sequence: 4294967294u32
│ │ ├─ script_sig: (0 bytes)
Expand All @@ -36,7 +36,7 @@ tx: None
│ │ ├─ item_2: 3044022066ab38e9f4ad3becba92a8a755acd761d469aaa96b689e86317bcab8f826a99302205f8a78d0cd2674fdf0fbcf709f2898f4543c0907a8670afbb743502d15aa15ca01 (71 bytes)
│ │ └─ item_3: 522102e91c97d46914b51550679e3d2fa32f4faa3de76663d1fcc2d86ead788e852d642102ab00aad496ca72ffac27a32820636eaa4f8fe59cdc09500097a6d221bd00c20e2102794b2cbc176d694d8160b3c42d640b125aee2ce92d8c1f3055ab90b8ec4f800053ae (105 bytes)
│ ├─ input_4: None
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ │ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ │ ├─ prev_vout: 4u32
│ │ ├─ sequence: 4294967294u32
│ │ ├─ script_sig: (0 bytes)
Expand All @@ -46,7 +46,7 @@ tx: None
│ │ ├─ item_2: 20bce391a0851301fad14c722167c15d78d55819f21f7ad246eacfd29840ff75c3ad207ea42acbb09754f509aeca81e87c37060b74d1146ef57ada9fcb78f1078f5467ac (68 bytes)
│ │ └─ item_3: c1c8dcc9df48aeb7699370d871dbd787da545aeb249b4f46be8f6dceb26e411899aa0761196e48e5e008fa70fa593639a09acf1cb8a1761af965c2f78ad0d8e68c (65 bytes)
│ └─ input_5: None
│ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000 (32 bytes)
│ ├─ prev_txid: 0000000000000000000000000000000000000000000000000000000000000000
│ ├─ prev_vout: 5u32
│ ├─ sequence: 4294967294u32
│ ├─ script_sig: (0 bytes)
Expand Down
17 changes: 8 additions & 9 deletions packages/wasm-utxo/src/inspect/psbt.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/// This contains low-level parsing of PSBT into a node structure suitable for display
use crate::address::from_output_script_with_network;
use crate::bitcoin::consensus::Decodable;
use crate::bitcoin::hashes::Hash;
use crate::bitcoin::psbt::Psbt;
use crate::bitcoin::{ScriptBuf, Transaction};
use crate::fixed_script_wallet::bitgo_psbt::{
Expand Down Expand Up @@ -250,7 +249,7 @@ fn tx_input_to_node(input: &crate::bitcoin::TxIn, index: usize) -> Node {

input_node.add_child(Node::new(
"prev_txid",
Primitive::Buffer(input.previous_output.txid.to_byte_array().to_vec()),
Primitive::String(input.previous_output.txid.to_string()),
));
input_node.add_child(Node::new(
"prev_vout",
Expand Down Expand Up @@ -325,7 +324,7 @@ fn psbt_input_to_node(input: &crate::bitcoin::psbt::Input, index: usize, network
if let Some(utxo) = &input.non_witness_utxo {
input_node.add_child(Node::new(
"non_witness_utxo",
Primitive::Buffer(utxo.compute_txid().to_byte_array().to_vec()),
Primitive::String(utxo.compute_txid().to_string()),
));
}

Expand Down Expand Up @@ -483,15 +482,15 @@ pub fn tx_to_node(tx: &Transaction, network: Network) -> Node {
));
tx_node.add_child(Node::new(
"txid",
Primitive::Buffer(tx.compute_txid().to_byte_array().to_vec()),
Primitive::String(tx.compute_txid().to_string()),
));
tx_node.add_child(Node::new(
"ntxid",
Primitive::Buffer(tx.compute_ntxid().to_byte_array().to_vec()),
Primitive::String(tx.compute_ntxid().to_string()),
));
tx_node.add_child(Node::new(
"wtxid",
Primitive::Buffer(tx.compute_wtxid().to_byte_array().to_vec()),
Primitive::String(tx.compute_wtxid().to_string()),
));
tx_node.add_child(tx_inputs_to_node(&tx.input));
tx_node.add_child(tx_outputs_to_node(&tx.output, network));
Expand Down Expand Up @@ -529,15 +528,15 @@ pub fn zcash_tx_to_node(parts: &ZcashTransactionParts, network: Network) -> Node
));
tx_node.add_child(Node::new(
"txid",
Primitive::Buffer(tx.compute_txid().to_byte_array().to_vec()),
Primitive::String(tx.compute_txid().to_string()),
));
tx_node.add_child(Node::new(
"ntxid",
Primitive::Buffer(tx.compute_ntxid().to_byte_array().to_vec()),
Primitive::String(tx.compute_ntxid().to_string()),
));
tx_node.add_child(Node::new(
"wtxid",
Primitive::Buffer(tx.compute_wtxid().to_byte_array().to_vec()),
Primitive::String(tx.compute_wtxid().to_string()),
));
tx_node.add_child(tx_inputs_to_node(&tx.input));
tx_node.add_child(tx_outputs_to_node(&tx.output, network));
Expand Down
Loading