Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-06-07 06:36:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix the Sequence field in transaction inputs always getting deserialized to MaxUint64. (#1258)

Browse Source
This commit is contained in:
stasatdaglabs 2020-12-22 16:29:38 +02:00 committed by GitHub
parent e7edfaceb7
commit c2cec2f170
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/appmessage/p2p_msgtx.go
View File

@ -9,8 +9,6 @@ import (
"github.com/kaspanet/kaspad/domain/consensus/utils/hashes" "github.com/kaspanet/kaspad/domain/consensus/utils/hashes"
"strconv" "strconv"
"github.com/kaspanet/kaspad/domain/consensus/utils/constants"
"github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing" "github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing"
"github.com/kaspanet/kaspad/domain/consensus/utils/subnetworks" "github.com/kaspanet/kaspad/domain/consensus/utils/subnetworks"
@ -98,11 +96,11 @@ type TxIn struct {
// NewTxIn returns a new kaspa transaction input with the provided // NewTxIn returns a new kaspa transaction input with the provided
// previous outpoint point and signature script with a default sequence of // previous outpoint point and signature script with a default sequence of
// MaxTxInSequenceNum. // MaxTxInSequenceNum.
func NewTxIn(prevOut *Outpoint, signatureScript []byte) *TxIn { func NewTxIn(prevOut *Outpoint, signatureScript []byte, sequence uint64) *TxIn {
return &TxIn{ return &TxIn{
PreviousOutpoint: *prevOut, PreviousOutpoint: *prevOut,
SignatureScript: signatureScript, SignatureScript: signatureScript,
Sequence: constants.MaxTxInSequenceNum, Sequence: sequence,
} }
} }

3
app/appmessage/p2p_msgtx_test.go
View File

@ -7,6 +7,7 @@ package appmessage
import ( import (
"bytes" "bytes"
"fmt" "fmt"
"github.com/kaspanet/kaspad/domain/consensus/utils/constants"
"math" "math"
"reflect" "reflect"
"testing" "testing"
@ -68,7 +69,7 @@ func TestTx(t *testing.T) {
// Ensure we get the same transaction input back out. // Ensure we get the same transaction input back out.
sigScript := []byte{0x04, 0x31, 0xdc, 0x00, 0x1b, 0x01, 0x62} sigScript := []byte{0x04, 0x31, 0xdc, 0x00, 0x1b, 0x01, 0x62}
txIn := NewTxIn(prevOut, sigScript) txIn := NewTxIn(prevOut, sigScript, constants.MaxTxInSequenceNum)
if !reflect.DeepEqual(&txIn.PreviousOutpoint, prevOut) { if !reflect.DeepEqual(&txIn.PreviousOutpoint, prevOut) {
t.Errorf("NewTxIn: wrong prev outpoint - got %v, want %v", t.Errorf("NewTxIn: wrong prev outpoint - got %v, want %v",
spew.Sprint(&txIn.PreviousOutpoint), spew.Sprint(&txIn.PreviousOutpoint),

2
infrastructure/network/netadapter/server/grpcserver/protowire/p2p_transaction.go
View File

@ -25,7 +25,7 @@ func (x *TransactionMessage) toAppMessage() (appmessage.Message, error) {
} }
outpoint := appmessage.NewOutpoint(prevTxID, protoInput.PreviousOutpoint.Index) outpoint := appmessage.NewOutpoint(prevTxID, protoInput.PreviousOutpoint.Index)
inputs[i] = appmessage.NewTxIn(outpoint, protoInput.SignatureScript) inputs[i] = appmessage.NewTxIn(outpoint, protoInput.SignatureScript, protoInput.Sequence)
} }
outputs := make([]*appmessage.TxOut, len(x.Outputs)) outputs := make([]*appmessage.TxOut, len(x.Outputs))

2
testing/integration/tx_relay_test.go
View File

@ -88,7 +88,7 @@ func waitForPayeeToReceiveBlock(t *testing.T, payeeBlockAddedChan chan *appmessa
func generateTx(t *testing.T, firstBlockCoinbase *externalapi.DomainTransaction, payer, payee *appHarness) *appmessage.MsgTx { func generateTx(t *testing.T, firstBlockCoinbase *externalapi.DomainTransaction, payer, payee *appHarness) *appmessage.MsgTx {
txIns := make([]*appmessage.TxIn, 1) txIns := make([]*appmessage.TxIn, 1)
txIns[0] = appmessage.NewTxIn(appmessage.NewOutpoint(consensushashing.TransactionID(firstBlockCoinbase), 0), []byte{}) txIns[0] = appmessage.NewTxIn(appmessage.NewOutpoint(consensushashing.TransactionID(firstBlockCoinbase), 0), []byte{}, 0)
payeeAddress, err := util.DecodeAddress(payee.miningAddress, util.Bech32PrefixKaspaSim) payeeAddress, err := util.DecodeAddress(payee.miningAddress, util.Bech32PrefixKaspaSim)
if err != nil { if err != nil {

2
testing/integration/utxo_index_test.go
View File

@ -151,7 +151,7 @@ func buildTransactionForUTXOIndexTest(t *testing.T, entry *appmessage.UTXOsByAdd
} }
txIns := make([]*appmessage.TxIn, 1) txIns := make([]*appmessage.TxIn, 1)
txIns[0] = appmessage.NewTxIn(appmessage.NewOutpoint(transactionID, entry.Outpoint.Index), []byte{}) txIns[0] = appmessage.NewTxIn(appmessage.NewOutpoint(transactionID, entry.Outpoint.Index), []byte{}, 0)
payeeAddress, err := util.DecodeAddress(miningAddress1, util.Bech32PrefixKaspaSim) payeeAddress, err := util.DecodeAddress(miningAddress1, util.Bech32PrefixKaspaSim)
if err != nil { if err != nil {