transaction: fail creating tx if there is additional data present
This commit is contained in:
parent
27b3054df4
commit
5787d7775f
2 changed files with 24 additions and 0 deletions
|
@ -275,6 +275,10 @@ func NewTransactionFromBytes(network netmode.Magic, b []byte) (*Transaction, err
|
||||||
if r.Err != nil {
|
if r.Err != nil {
|
||||||
return nil, r.Err
|
return nil, r.Err
|
||||||
}
|
}
|
||||||
|
_ = r.ReadB()
|
||||||
|
if r.Err == nil {
|
||||||
|
return nil, errors.New("additional data after the transaction")
|
||||||
|
}
|
||||||
tx.feePerByte = tx.NetworkFee / int64(len(b))
|
tx.feePerByte = tx.NetworkFee / int64(len(b))
|
||||||
return tx, nil
|
return tx, nil
|
||||||
}
|
}
|
||||||
|
|
|
@ -71,6 +71,26 @@ func TestNew(t *testing.T) {
|
||||||
testserdes.EncodeDecodeBinary(t, tx, &Transaction{Network: netmode.UnitTestNet})
|
testserdes.EncodeDecodeBinary(t, tx, &Transaction{Network: netmode.UnitTestNet})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestNewTransactionFromBytes(t *testing.T) {
|
||||||
|
script := []byte{0x51}
|
||||||
|
tx := New(netmode.UnitTestNet, script, 1)
|
||||||
|
tx.NetworkFee = 123
|
||||||
|
data, err := testserdes.EncodeBinary(tx)
|
||||||
|
require.NoError(t, err)
|
||||||
|
|
||||||
|
// set cached fields
|
||||||
|
tx.Hash()
|
||||||
|
tx.FeePerByte()
|
||||||
|
|
||||||
|
tx1, err := NewTransactionFromBytes(netmode.UnitTestNet, data)
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, tx, tx1)
|
||||||
|
|
||||||
|
data = append(data, 42)
|
||||||
|
_, err = NewTransactionFromBytes(netmode.UnitTestNet, data)
|
||||||
|
require.Error(t, err)
|
||||||
|
}
|
||||||
|
|
||||||
func TestEncodingTXWithNoScript(t *testing.T) {
|
func TestEncodingTXWithNoScript(t *testing.T) {
|
||||||
_, err := testserdes.EncodeBinary(new(Transaction))
|
_, err := testserdes.EncodeBinary(new(Transaction))
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
|
|
Loading…
Reference in a new issue