mirrors/btcd
1
0
Fork 0
mirror of https://github.com/btcsuite/btcd.git synced 2025-03-10 09:19:28 +01:00
Code Issues Projects Releases Wiki Activity

psbt: use pointer slice for global unknowns

Browse source 
To unify the way the unknown fields are handled, we change the global
ones to a slice of pointers as well. This makes it easier to add
generic handler code for unknown fields, if they are uniform across the
levels (global, input, output).
This commit is contained in:
Oliver Gugger 2023-01-27 15:30:45 +01:00
parent 5ebbb1bb91
commit 6c81c664bb
No known key found for this signature in database
GPG key ID: 8E4256593F177720
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
btcutil/psbt/psbt.go
View file

@ -113,7 +113,7 @@ type Unknown struct {
Value []byte Value []byte
} }
// Packet is the actual psbt repreesntation. It is a is a set of 1 + N + M // Packet is the actual psbt representation. It is a set of 1 + N + M
// key-value pair lists, 1 global, defining the unsigned transaction structure // key-value pair lists, 1 global, defining the unsigned transaction structure
// with N inputs and M outputs. These key-value pairs can contain scripts, // with N inputs and M outputs. These key-value pairs can contain scripts,
// signatures, key derivations and other transaction-defining data. // signatures, key derivations and other transaction-defining data.
@ -130,7 +130,7 @@ type Packet struct {
Outputs []POutput Outputs []POutput
// Unknowns are the set of custom types (global only) within this PSBT. // Unknowns are the set of custom types (global only) within this PSBT.
Unknowns []Unknown Unknowns []*Unknown
} }
// validateUnsignedTx returns true if the transaction is unsigned. Note that // validateUnsignedTx returns true if the transaction is unsigned. Note that
@ -155,7 +155,7 @@ func NewFromUnsignedTx(tx *wire.MsgTx) (*Packet, error) {
inSlice := make([]PInput, len(tx.TxIn)) inSlice := make([]PInput, len(tx.TxIn))
outSlice := make([]POutput, len(tx.TxOut)) outSlice := make([]POutput, len(tx.TxOut))
unknownSlice := make([]Unknown, 0) unknownSlice := make([]*Unknown, 0)
return &Packet{ return &Packet{
UnsignedTx: tx, UnsignedTx: tx,
@ -224,7 +224,7 @@ func NewFromRawBytes(r io.Reader, b64 bool) (*Packet, error) {
// Next we parse any unknowns that may be present, making sure that we // Next we parse any unknowns that may be present, making sure that we
// break at the separator. // break at the separator.
var unknownSlice []Unknown var unknownSlice []*Unknown
for { for {
keyint, keydata, err := getKey(r) keyint, keydata, err := getKey(r)
if err != nil { if err != nil {
@ -244,7 +244,7 @@ func NewFromRawBytes(r io.Reader, b64 bool) (*Packet, error) {
keyintanddata := []byte{byte(keyint)} keyintanddata := []byte{byte(keyint)}
keyintanddata = append(keyintanddata, keydata...) keyintanddata = append(keyintanddata, keydata...)
newUnknown := Unknown{ newUnknown := &Unknown{
Key: keyintanddata, Key: keyintanddata,
Value: value, Value: value,
} }