diff --git a/app/appmessage/p2p_msgtx.go b/app/appmessage/p2p_msgtx.go index f369a7aea..2062f03c7 100644 --- a/app/appmessage/p2p_msgtx.go +++ b/app/appmessage/p2p_msgtx.go @@ -159,7 +159,7 @@ func (msg *MsgTx) IsCoinBase() bool { // TxHash generates the Hash for the transaction. func (msg *MsgTx) TxHash() *externalapi.DomainHash { - return consensushashing.TransactionHash(MsgTxToDomainTransaction(msg), false) + return consensushashing.TransactionHash(MsgTxToDomainTransaction(msg)) } // TxID generates the Hash for the transaction without the signature script, gas and payload fields. diff --git a/app/appmessage/p2p_msgtx_test.go b/app/appmessage/p2p_msgtx_test.go index 57f8e7346..52bf5618d 100644 --- a/app/appmessage/p2p_msgtx_test.go +++ b/app/appmessage/p2p_msgtx_test.go @@ -133,7 +133,7 @@ func TestTx(t *testing.T) { // TestTxHash tests the ability to generate the hash of a transaction accurately. func TestTxHashAndID(t *testing.T) { - txHash1Str := "93663e597f6c968d32d229002f76408edf30d6a0151ff679fc729812d8cb2acc" + txHash1Str := "b06f8b650115b5cf4d59499e10764a9312742930cb43c9b4ff6495d76f332ed7" txID1Str := "e20225c3d065ee41743607ee627db44d01ef396dc9779b05b2caf55bac50e12d" wantTxID1, err := transactionid.FromString(txID1Str) if err != nil { @@ -185,7 +185,7 @@ func TestTxHashAndID(t *testing.T) { spew.Sprint(tx1ID), spew.Sprint(wantTxID1)) } - hash2Str := "8dafd1bec24527d8e3b443ceb0a3b92fffc0d60026317f890b2faf5e9afc177a" + hash2Str := "fa16a8ce88d52ca1ff45187bbba0d33044e9f5fe309e8d0b22d4812dcf1782b7" wantHash2, err := externalapi.NewDomainHashFromString(hash2Str) if err != nil { t.Errorf("NewTxIDFromStr: %v", err) diff --git a/app/rpc/rpccontext/verbosedata.go b/app/rpc/rpccontext/verbosedata.go index 4de2669cf..e42d3ed8d 100644 --- a/app/rpc/rpccontext/verbosedata.go +++ b/app/rpc/rpccontext/verbosedata.go @@ -123,19 +123,9 @@ func (ctx *Context) PopulateTransactionWithVerboseData( ctx.Domain.Consensus().PopulateMass(domainTransaction) - var daaScore uint64 - if domainBlockHeader != nil { - daaScore = domainBlockHeader.DAAScore() - } else { - daaScore, err = ctx.Domain.Consensus().GetVirtualDAAScore() - if err != nil { - return err - } - } - transaction.VerboseData = &appmessage.RPCTransactionVerboseData{ TransactionID: consensushashing.TransactionID(domainTransaction).String(), - Hash: consensushashing.TransactionHash(domainTransaction, daaScore >= ctx.Config.NetParams().HFDAAScore).String(), + Hash: consensushashing.TransactionHash(domainTransaction).String(), Mass: domainTransaction.Mass, } if domainBlockHeader != nil { diff --git a/cmd/kaspawallet/daemon/server/split_transaction.go b/cmd/kaspawallet/daemon/server/split_transaction.go index 9e15f6890..b2154c900 100644 --- a/cmd/kaspawallet/daemon/server/split_transaction.go +++ b/cmd/kaspawallet/daemon/server/split_transaction.go @@ -158,7 +158,7 @@ func (s *server) splitAndInputPerSplitCounts(transaction *serialization.Partiall // to calculate how much mass do all the inputs have transactionWithoutInputs := transaction.Tx.Clone() transactionWithoutInputs.Inputs = []*externalapi.DomainTransactionInput{} - massWithoutInputs := s.txMassCalculator.CalculateTransactionMass(transactionWithoutInputs, true) + massWithoutInputs := s.txMassCalculator.CalculateTransactionMass(transactionWithoutInputs) massOfAllInputs := transactionMass - massWithoutInputs @@ -177,7 +177,7 @@ func (s *server) splitAndInputPerSplitCounts(transaction *serialization.Partiall return 0, 0, err } massForEverythingExceptInputsInSplitTransaction := - s.txMassCalculator.CalculateTransactionMass(splitTransactionWithoutInputs.Tx, true) + s.txMassCalculator.CalculateTransactionMass(splitTransactionWithoutInputs.Tx) massForInputsInSplitTransaction := mempool.MaximumStandardTransactionMass - massForEverythingExceptInputsInSplitTransaction inputsPerSplitCount = int(massForInputsInSplitTransaction / massPerInput) @@ -245,7 +245,7 @@ func (s *server) estimateMassAfterSignatures(transaction *serialization.Partiall return 0, err } - return s.txMassCalculator.CalculateTransactionMass(transactionWithSignatures, true), nil + return s.txMassCalculator.CalculateTransactionMass(transactionWithSignatures), nil } func (s *server) moreUTXOsForMergeTransaction(alreadySelectedUTXOs []*libkaspawallet.UTXO, requiredAmount uint64) ( diff --git a/cmd/kaspawallet/daemon/server/split_transaction_test.go b/cmd/kaspawallet/daemon/server/split_transaction_test.go index 3f2ebb335..0f521bb62 100644 --- a/cmd/kaspawallet/daemon/server/split_transaction_test.go +++ b/cmd/kaspawallet/daemon/server/split_transaction_test.go @@ -58,7 +58,7 @@ func TestEstimateMassAfterSignatures(t *testing.T) { t.Fatalf("ExtractTransaction: %+v", err) } - actualMassAfterSignatures := serverInstance.txMassCalculator.CalculateTransactionMass(extractedSignedTx, true) + actualMassAfterSignatures := serverInstance.txMassCalculator.CalculateTransactionMass(extractedSignedTx) if estimatedMassAfterSignatures != actualMassAfterSignatures { t.Errorf("Estimated mass after signatures: %d but actually got %d", diff --git a/cmd/kaspawallet/sweep.go b/cmd/kaspawallet/sweep.go index 90da0341f..d36065d05 100644 --- a/cmd/kaspawallet/sweep.go +++ b/cmd/kaspawallet/sweep.go @@ -184,7 +184,7 @@ func createSplitTransactionsWithSchnorrPrivteKey( ScriptPublicKey: scriptPublicKey, } - if massCalculater.CalculateTransactionMass(currentTx, true)+extraMass >= mempool.MaximumStandardTransactionMass { + if massCalculater.CalculateTransactionMass(currentTx)+extraMass >= mempool.MaximumStandardTransactionMass { //in this loop we assume a transaction with one input and one output cannot violate max transaction mass, hence a sanity check. if len(currentTx.Inputs) == 1 { diff --git a/domain/consensus/consensus.go b/domain/consensus/consensus.go index a2a3a724e..a615869f6 100644 --- a/domain/consensus/consensus.go +++ b/domain/consensus/consensus.go @@ -21,7 +21,6 @@ type consensus struct { genesisBlock *externalapi.DomainBlock genesisHash *externalapi.DomainHash - hfDAAScore uint64 expectedDAAWindowDurationInMilliseconds int64 @@ -918,7 +917,7 @@ func (s *consensus) EstimateNetworkHashesPerSecond(startHash *externalapi.Domain } func (s *consensus) PopulateMass(transaction *externalapi.DomainTransaction) { - s.transactionValidator.PopulateMass(transaction, s.hfDAAScore) + s.transactionValidator.PopulateMass(transaction) } func (s *consensus) ResolveVirtual(progressReportCallback func(uint64, uint64)) error { diff --git a/domain/consensus/factory.go b/domain/consensus/factory.go index 91e5067fd..8d1efef47 100644 --- a/domain/consensus/factory.go +++ b/domain/consensus/factory.go @@ -216,7 +216,6 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas transactionValidator := transactionvalidator.New(config.BlockCoinbaseMaturity, config.EnableNonNativeSubnetworks, config.MaxCoinbasePayloadLength, - config.HFDAAScore, config.K, config.CoinbasePayloadScriptPublicKeyMaxLength, dbManager, @@ -247,7 +246,6 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas config.GenesisHash, config.DeflationaryPhaseDaaScore, config.DeflationaryPhaseBaseSubsidy, - config.HFDAAScore, dagTraversalManager, ghostdagDataStore, @@ -284,7 +282,6 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas config.MaxBlockParents, config.MergeSetSizeLimit, genesisHash, - config.HFDAAScore, ghostdagManager, dagTopologyManager, @@ -353,7 +350,6 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas config.TimestampDeviationTolerance, config.TargetTimePerBlock, config.MaxBlockLevel, - config.HFDAAScore, dbManager, difficultyManager, @@ -401,7 +397,6 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas blockBuilder := blockbuilder.New( dbManager, genesisHash, - config.HFDAAScore, difficultyManager, pastMedianTimeManager, @@ -483,7 +478,6 @@ func (f *factory) NewConsensus(config *Config, db infrastructuredatabase.Databas genesisBlock: config.GenesisBlock, genesisHash: config.GenesisHash, - hfDAAScore: config.HFDAAScore, expectedDAAWindowDurationInMilliseconds: config.TargetTimePerBlock.Milliseconds() * int64(config.DifficultyAdjustmentWindowSize), diff --git a/domain/consensus/model/interface_processes_coinbasemanager.go b/domain/consensus/model/interface_processes_coinbasemanager.go index 33bf5ace1..878c02caf 100644 --- a/domain/consensus/model/interface_processes_coinbasemanager.go +++ b/domain/consensus/model/interface_processes_coinbasemanager.go @@ -8,5 +8,5 @@ type CoinbaseManager interface { ExpectedCoinbaseTransaction(stagingArea *StagingArea, blockHash *externalapi.DomainHash, coinbaseData *externalapi.DomainCoinbaseData) (expectedTransaction *externalapi.DomainTransaction, hasRedReward bool, err error) CalcBlockSubsidy(stagingArea *StagingArea, blockHash *externalapi.DomainHash) (uint64, error) - ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTx *externalapi.DomainTransaction, postHF bool) (blueScore uint64, coinbaseData *externalapi.DomainCoinbaseData, subsidy uint64, err error) + ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTx *externalapi.DomainTransaction) (blueScore uint64, coinbaseData *externalapi.DomainCoinbaseData, subsidy uint64, err error) } diff --git a/domain/consensus/model/interface_processes_transactionvalidator.go b/domain/consensus/model/interface_processes_transactionvalidator.go index f95f8b48c..a43d0adc9 100644 --- a/domain/consensus/model/interface_processes_transactionvalidator.go +++ b/domain/consensus/model/interface_processes_transactionvalidator.go @@ -12,5 +12,5 @@ type TransactionValidator interface { povBlockHash *externalapi.DomainHash, povBlockPastMedianTime int64) error ValidateTransactionInContextAndPopulateFee(stagingArea *StagingArea, tx *externalapi.DomainTransaction, povBlockHash *externalapi.DomainHash) error - PopulateMass(transaction *externalapi.DomainTransaction, daaScore uint64) + PopulateMass(transaction *externalapi.DomainTransaction) } diff --git a/domain/consensus/processes/blockbuilder/block_builder.go b/domain/consensus/processes/blockbuilder/block_builder.go index 2678fc779..bef78afd8 100644 --- a/domain/consensus/processes/blockbuilder/block_builder.go +++ b/domain/consensus/processes/blockbuilder/block_builder.go @@ -20,7 +20,6 @@ import ( type blockBuilder struct { databaseContext model.DBManager genesisHash *externalapi.DomainHash - hfDAAScore uint64 difficultyManager model.DifficultyManager pastMedianTimeManager model.PastMedianTimeManager @@ -43,7 +42,6 @@ type blockBuilder struct { func New( databaseContext model.DBManager, genesisHash *externalapi.DomainHash, - hfDAAScore uint64, difficultyManager model.DifficultyManager, pastMedianTimeManager model.PastMedianTimeManager, @@ -65,7 +63,6 @@ func New( return &blockBuilder{ databaseContext: databaseContext, genesisHash: genesisHash, - hfDAAScore: hfDAAScore, difficultyManager: difficultyManager, pastMedianTimeManager: pastMedianTimeManager, @@ -209,7 +206,7 @@ func (bb *blockBuilder) buildHeader(stagingArea *model.StagingArea, transactions if err != nil { return nil, err } - hashMerkleRoot := bb.newBlockHashMerkleRoot(transactions, daaScore >= bb.hfDAAScore) + hashMerkleRoot := bb.newBlockHashMerkleRoot(transactions) acceptedIDMerkleRoot, err := bb.newBlockAcceptedIDMerkleRoot(stagingArea) if err != nil { return nil, err @@ -282,8 +279,8 @@ func (bb *blockBuilder) newBlockDifficulty(stagingArea *model.StagingArea) (uint return bb.difficultyManager.RequiredDifficulty(stagingArea, model.VirtualBlockHash) } -func (bb *blockBuilder) newBlockHashMerkleRoot(transactions []*externalapi.DomainTransaction, postHF bool) *externalapi.DomainHash { - return merkle.CalculateHashMerkleRoot(transactions, postHF) +func (bb *blockBuilder) newBlockHashMerkleRoot(transactions []*externalapi.DomainTransaction) *externalapi.DomainHash { + return merkle.CalculateHashMerkleRoot(transactions) } func (bb *blockBuilder) newBlockAcceptedIDMerkleRoot(stagingArea *model.StagingArea) (*externalapi.DomainHash, error) { diff --git a/domain/consensus/processes/blockbuilder/test_block_builder.go b/domain/consensus/processes/blockbuilder/test_block_builder.go index 9a623dd52..d7089cc8d 100644 --- a/domain/consensus/processes/blockbuilder/test_block_builder.go +++ b/domain/consensus/processes/blockbuilder/test_block_builder.go @@ -76,7 +76,7 @@ func (bb *testBlockBuilder) buildUTXOInvalidHeader(stagingArea *model.StagingAre return nil, err } - hashMerkleRoot := bb.newBlockHashMerkleRoot(transactions, daaScore >= bb.hfDAAScore) + hashMerkleRoot := bb.newBlockHashMerkleRoot(transactions) pruningPoint, err := bb.newBlockPruningPoint(stagingArea, tempBlockHash) if err != nil { @@ -120,7 +120,7 @@ func (bb *testBlockBuilder) buildHeaderWithParents(stagingArea *model.StagingAre return nil, err } - hashMerkleRoot := bb.newBlockHashMerkleRoot(transactions, daaScore >= bb.hfDAAScore) + hashMerkleRoot := bb.newBlockHashMerkleRoot(transactions) acceptedIDMerkleRoot, err := bb.calculateAcceptedIDMerkleRoot(acceptanceData) if err != nil { return nil, err diff --git a/domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go b/domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go index bad3af72d..3f4000a6d 100644 --- a/domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go +++ b/domain/consensus/processes/blockprocessor/validate_and_insert_block_test.go @@ -94,7 +94,7 @@ func TestBlockStatus(t *testing.T) { invalidBlock.Header = blockheader.NewImmutableBlockHeader( disqualifiedBlock.Header.Version(), disqualifiedBlock.Header.Parents(), - merkle.CalculateHashMerkleRoot(invalidBlock.Transactions, invalidBlock.Header.DAAScore() >= consensusConfig.HFDAAScore), + merkle.CalculateHashMerkleRoot(invalidBlock.Transactions), disqualifiedBlock.Header.AcceptedIDMerkleRoot(), disqualifiedBlock.Header.UTXOCommitment(), disqualifiedBlock.Header.TimeInMilliseconds(), diff --git a/domain/consensus/processes/blockvalidator/block_body_in_context.go b/domain/consensus/processes/blockvalidator/block_body_in_context.go index 3467a8906..f032fd96f 100644 --- a/domain/consensus/processes/blockvalidator/block_body_in_context.go +++ b/domain/consensus/processes/blockvalidator/block_body_in_context.go @@ -187,7 +187,7 @@ func (v *blockValidator) checkCoinbaseSubsidy( return err } - _, _, subsidy, err := v.coinbaseManager.ExtractCoinbaseDataBlueScoreAndSubsidy(block.Transactions[transactionhelper.CoinbaseTransactionIndex], block.Header.DAAScore() >= v.hfDAAScore) + _, _, subsidy, err := v.coinbaseManager.ExtractCoinbaseDataBlueScoreAndSubsidy(block.Transactions[transactionhelper.CoinbaseTransactionIndex]) if err != nil { return err } diff --git a/domain/consensus/processes/blockvalidator/block_body_in_isolation.go b/domain/consensus/processes/blockvalidator/block_body_in_isolation.go index bcaff2813..ea2999895 100644 --- a/domain/consensus/processes/blockvalidator/block_body_in_isolation.go +++ b/domain/consensus/processes/blockvalidator/block_body_in_isolation.go @@ -5,7 +5,6 @@ import ( "github.com/kaspanet/kaspad/domain/consensus/model/externalapi" "github.com/kaspanet/kaspad/domain/consensus/ruleerrors" "github.com/kaspanet/kaspad/domain/consensus/utils/consensushashing" - "github.com/kaspanet/kaspad/domain/consensus/utils/constants" "github.com/kaspanet/kaspad/domain/consensus/utils/merkle" "github.com/kaspanet/kaspad/domain/consensus/utils/subnetworks" "github.com/kaspanet/kaspad/domain/consensus/utils/transactionhelper" @@ -89,21 +88,11 @@ func (v *blockValidator) ValidateBodyInIsolation(stagingArea *model.StagingArea, return err } - if block.Header.DAAScore() < v.hfDAAScore { - totalInputs := 0 - for _, tx := range block.Transactions { - totalInputs += len(tx.Inputs) - if totalInputs > constants.MaxBlockInputsPreHF { - return errors.Wrapf(ruleerrors.ErrOverMaxBlockInputsPreHF, "block has more than %d inputs", constants.MaxBlockInputsPreHF) - } - } - } - return nil } func (v *blockValidator) checkCoinbaseBlueScore(block *externalapi.DomainBlock) error { - coinbaseBlueScore, _, _, err := v.coinbaseManager.ExtractCoinbaseDataBlueScoreAndSubsidy(block.Transactions[transactionhelper.CoinbaseTransactionIndex], block.Header.DAAScore() >= v.hfDAAScore) + coinbaseBlueScore, _, _, err := v.coinbaseManager.ExtractCoinbaseDataBlueScoreAndSubsidy(block.Transactions[transactionhelper.CoinbaseTransactionIndex]) if err != nil { return err } @@ -162,7 +151,7 @@ func (v *blockValidator) checkTransactionsInIsolation(block *externalapi.DomainB } func (v *blockValidator) checkBlockHashMerkleRoot(block *externalapi.DomainBlock) error { - calculatedHashMerkleRoot := merkle.CalculateHashMerkleRoot(block.Transactions, block.Header.DAAScore() >= v.hfDAAScore) + calculatedHashMerkleRoot := merkle.CalculateHashMerkleRoot(block.Transactions) if !block.Header.HashMerkleRoot().Equal(calculatedHashMerkleRoot) { return errors.Wrapf(ruleerrors.ErrBadMerkleRoot, "block hash merkle root is invalid - block "+ "header indicates %s, but calculated value is %s", @@ -232,7 +221,7 @@ func (v *blockValidator) validateGasLimit(block *externalapi.DomainBlock) error func (v *blockValidator) checkBlockMass(block *externalapi.DomainBlock) error { mass := uint64(0) for _, transaction := range block.Transactions { - v.transactionValidator.PopulateMass(transaction, block.Header.DAAScore()) + v.transactionValidator.PopulateMass(transaction) massBefore := mass mass += transaction.Mass diff --git a/domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go b/domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go index 21397887c..15d60206d 100644 --- a/domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go +++ b/domain/consensus/processes/blockvalidator/block_body_in_isolation_test.go @@ -34,7 +34,6 @@ func TestBlockValidator_ValidateBodyInIsolation(t *testing.T) { CheckFirstBlockTransactionIsCoinbase, } testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) { - consensusConfig.HFDAAScore = 10 tc, teardown, err := consensus.NewFactory().NewTestConsensus(consensusConfig, "TestChainedTransactions") if err != nil { t.Fatalf("Error setting up consensus: %+v", err) @@ -170,10 +169,10 @@ var unOrderedParentsBlock = externalapi.DomainBlock{ }), }}, externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{ - 0x31, 0x33, 0x37, 0x72, 0x5c, 0xde, 0x1c, 0xdf, - 0xf5, 0x9f, 0xde, 0x16, 0x74, 0xbf, 0x0c, 0x64, - 0x37, 0x40, 0x49, 0xdf, 0x02, 0x05, 0xca, 0x6d, - 0x52, 0x23, 0x6f, 0xc2, 0x2b, 0xec, 0xad, 0x42, + 0x7e, 0xe2, 0x10, 0x4e, 0x21, 0x2f, 0x2a, 0xb1, + 0x7d, 0x22, 0xf5, 0xe8, 0xa0, 0x98, 0xef, 0x53, + 0x83, 0xae, 0x59, 0x1f, 0x83, 0xf3, 0x78, 0x5d, + 0x30, 0xae, 0x3e, 0xb3, 0x06, 0x08, 0x6f, 0x79, }), externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{ 0x80, 0xf7, 0x00, 0xe3, 0x16, 0x3d, 0x04, 0x95, @@ -203,20 +202,7 @@ var unOrderedParentsBlock = externalapi.DomainBlock{ Transactions: []*externalapi.DomainTransaction{ { Version: 0, - Inputs: []*externalapi.DomainTransactionInput{ - { - PreviousOutpoint: externalapi.DomainOutpoint{ - TransactionID: *externalapi.NewDomainTransactionIDFromByteArray(&[externalapi.DomainHashSize]byte{}), - Index: 0xffffffff, - }, - SignatureScript: []byte{ - 0x02, 0x10, 0x27, 0x08, 0xac, 0x29, 0x2f, 0x2f, - 0xcf, 0x70, 0xb0, 0x7e, 0x0b, 0x2f, 0x50, 0x32, - 0x53, 0x48, 0x2f, 0x62, 0x74, 0x63, 0x64, 0x2f, - }, - Sequence: math.MaxUint64, - }, - }, + Inputs: nil, Outputs: []*externalapi.DomainTransactionOutput{ { Value: 0x12a05f200, // 5000000000 @@ -447,10 +433,10 @@ var exampleValidBlock = externalapi.DomainBlock{ }), }}, externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{ - 0x86, 0x8b, 0x73, 0xcd, 0x20, 0x51, 0x23, 0x60, - 0xea, 0x62, 0x99, 0x9b, 0x87, 0xf6, 0xdd, 0x8d, - 0xa4, 0x0b, 0xd7, 0xcf, 0xc6, 0x32, 0x38, 0xee, - 0xd9, 0x68, 0x72, 0x1f, 0xa2, 0x51, 0xe4, 0x28, + 0x46, 0xec, 0xf4, 0x5b, 0xe3, 0xba, 0xca, 0x34, + 0x9d, 0xfe, 0x8a, 0x78, 0xde, 0xaf, 0x05, 0x3b, + 0x0a, 0xa6, 0xd5, 0x38, 0x97, 0x4d, 0xa5, 0x0f, + 0xd6, 0xef, 0xb4, 0xd2, 0x66, 0xbc, 0x8d, 0x21, }), externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{ 0x8a, 0xb7, 0xd6, 0x73, 0x1b, 0xe6, 0xc5, 0xd3, @@ -475,21 +461,7 @@ var exampleValidBlock = externalapi.DomainBlock{ Transactions: []*externalapi.DomainTransaction{ { Version: 0, - Inputs: []*externalapi.DomainTransactionInput{ - { - PreviousOutpoint: externalapi.DomainOutpoint{ - TransactionID: *externalapi.NewDomainTransactionIDFromByteArray(&[externalapi.DomainHashSize]byte{ - 0x9b, 0x22, 0x59, 0x44, 0x66, 0xf0, 0xbe, 0x50, - 0x7c, 0x1c, 0x8a, 0xf6, 0x06, 0x27, 0xe6, 0x33, - 0x38, 0x7e, 0xd1, 0xd5, 0x8c, 0x42, 0x59, 0x1a, - 0x31, 0xac, 0x9a, 0xa6, 0x2e, 0xd5, 0x2b, 0x0f, - }), - Index: 0xffffffff, - }, - SignatureScript: nil, - Sequence: math.MaxUint64, - }, - }, + Inputs: nil, Outputs: []*externalapi.DomainTransactionOutput{ { Value: 0x12a05f200, // 5000000000 @@ -752,10 +724,10 @@ var blockWithWrongTxOrder = externalapi.DomainBlock{ }), }}, externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{ - 0x7b, 0x25, 0x8b, 0xfa, 0xfb, 0x49, 0xe4, 0x94, - 0x48, 0x2c, 0xf9, 0x74, 0xdd, 0xad, 0x9d, 0x6f, - 0x98, 0x8f, 0xfb, 0x01, 0x9d, 0x49, 0x29, 0xbe, - 0x3c, 0xec, 0x90, 0xfe, 0xa5, 0x0c, 0xaf, 0x6b, + 0xd5, 0xd2, 0x32, 0xe4, 0xbe, 0x9c, 0x33, 0xbd, + 0xf1, 0x0a, 0xd2, 0x9d, 0x0c, 0xbd, 0xe5, 0xae, + 0xcb, 0x1a, 0xf9, 0x5a, 0x3e, 0xfb, 0xf3, 0xc7, + 0x2b, 0x4d, 0x10, 0xa6, 0xbd, 0x5f, 0x07, 0xe7, }), externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{ 0xa0, 0x69, 0x2d, 0x16, 0xb5, 0xd7, 0xe4, 0xf3, @@ -1310,7 +1282,7 @@ func initBlockWithFirstTransactionDifferentThanCoinbase(consensusConfig *consens Header: blockheader.NewImmutableBlockHeader( constants.BlockVersion, []externalapi.BlockLevelParents{[]*externalapi.DomainHash{consensusConfig.GenesisHash}}, - merkle.CalculateHashMerkleRoot([]*externalapi.DomainTransaction{tx}, consensusConfig.HFDAAScore == 0), + merkle.CalculateHashMerkleRoot([]*externalapi.DomainTransaction{tx}), &externalapi.DomainHash{}, externalapi.NewDomainHashFromByteArray(&[externalapi.DomainHashSize]byte{ 0x80, 0xf7, 0x00, 0xe3, 0x16, 0x3d, 0x04, 0x95, diff --git a/domain/consensus/processes/blockvalidator/blockvalidator.go b/domain/consensus/processes/blockvalidator/blockvalidator.go index e4eefe9b3..7788a49b5 100644 --- a/domain/consensus/processes/blockvalidator/blockvalidator.go +++ b/domain/consensus/processes/blockvalidator/blockvalidator.go @@ -25,7 +25,6 @@ type blockValidator struct { timestampDeviationTolerance int targetTimePerBlock time.Duration maxBlockLevel int - hfDAAScore uint64 databaseContext model.DBReader difficultyManager model.DifficultyManager @@ -65,7 +64,6 @@ func New(powMax *big.Int, timestampDeviationTolerance int, targetTimePerBlock time.Duration, maxBlockLevel int, - hfDAAScore uint64, databaseContext model.DBReader, @@ -105,7 +103,6 @@ func New(powMax *big.Int, mergeSetSizeLimit: mergeSetSizeLimit, maxBlockParents: maxBlockParents, maxBlockLevel: maxBlockLevel, - hfDAAScore: hfDAAScore, timestampDeviationTolerance: timestampDeviationTolerance, targetTimePerBlock: targetTimePerBlock, diff --git a/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go b/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go index 1f1f8178f..4ca2ff479 100644 --- a/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go +++ b/domain/consensus/processes/blockvalidator/pruning_violation_proof_of_work_and_difficulty_test.go @@ -181,7 +181,7 @@ func TestCheckParentHeadersExist(t *testing.T) { invalidBlock.Header = blockheader.NewImmutableBlockHeader( invalidBlock.Header.Version(), invalidBlock.Header.Parents(), - merkle.CalculateHashMerkleRoot(invalidBlock.Transactions, orphanBlock.Header.DAAScore() >= consensusConfig.HFDAAScore), + merkle.CalculateHashMerkleRoot(invalidBlock.Transactions), orphanBlock.Header.AcceptedIDMerkleRoot(), orphanBlock.Header.UTXOCommitment(), orphanBlock.Header.TimeInMilliseconds(), diff --git a/domain/consensus/processes/coinbasemanager/coinbasemanager.go b/domain/consensus/processes/coinbasemanager/coinbasemanager.go index 873e554ec..3d187a3e1 100644 --- a/domain/consensus/processes/coinbasemanager/coinbasemanager.go +++ b/domain/consensus/processes/coinbasemanager/coinbasemanager.go @@ -19,7 +19,6 @@ type coinbaseManager struct { genesisHash *externalapi.DomainHash deflationaryPhaseDaaScore uint64 deflationaryPhaseBaseSubsidy uint64 - hfDAAScore uint64 databaseContext model.DBReader dagTraversalManager model.DAGTraversalManager @@ -128,8 +127,7 @@ func (c *coinbaseManager) coinbaseOutputForBlueBlock(stagingArea *model.StagingA } // the ScriptPublicKey for the coinbase is parsed from the coinbase payload - // We pass postHF=true since it only affects the deserialization of the subsidy, which is not used in this context. - _, coinbaseData, _, err := c.ExtractCoinbaseDataBlueScoreAndSubsidy(blockAcceptanceData.TransactionAcceptanceData[0].Transaction, true) + _, coinbaseData, _, err := c.ExtractCoinbaseDataBlueScoreAndSubsidy(blockAcceptanceData.TransactionAcceptanceData[0].Transaction) if err != nil { return nil, false, err } @@ -267,7 +265,7 @@ func (c *coinbaseManager) calcMergedBlockReward(stagingArea *model.StagingArea, return 0, err } - _, _, subsidy, err := c.ExtractCoinbaseDataBlueScoreAndSubsidy(block.Transactions[transactionhelper.CoinbaseTransactionIndex], block.Header.DAAScore() >= c.hfDAAScore) + _, _, subsidy, err := c.ExtractCoinbaseDataBlueScoreAndSubsidy(block.Transactions[transactionhelper.CoinbaseTransactionIndex]) if err != nil { return 0, err } @@ -285,7 +283,6 @@ func New( genesisHash *externalapi.DomainHash, deflationaryPhaseDaaScore uint64, deflationaryPhaseBaseSubsidy uint64, - hfDAAScore uint64, dagTraversalManager model.DAGTraversalManager, ghostdagDataStore model.GHOSTDAGDataStore, @@ -304,7 +301,6 @@ func New( genesisHash: genesisHash, deflationaryPhaseDaaScore: deflationaryPhaseDaaScore, deflationaryPhaseBaseSubsidy: deflationaryPhaseBaseSubsidy, - hfDAAScore: hfDAAScore, dagTraversalManager: dagTraversalManager, ghostdagDataStore: ghostdagDataStore, diff --git a/domain/consensus/processes/coinbasemanager/coinbasemanager_external_test.go b/domain/consensus/processes/coinbasemanager/coinbasemanager_external_test.go index dc66fc167..a446ba5d6 100644 --- a/domain/consensus/processes/coinbasemanager/coinbasemanager_external_test.go +++ b/domain/consensus/processes/coinbasemanager/coinbasemanager_external_test.go @@ -18,19 +18,16 @@ func TestExtractCoinbaseDataBlueScoreAndSubsidy(t *testing.T) { defer teardown(false) tests := []struct { - name string - scriptPublicKeyVersion uint16 - expectedScriptPublicKeyVersionBeforeHF uint16 + name string + scriptPublicKeyVersion uint16 }{ { - name: "below 255", - scriptPublicKeyVersion: 100, - expectedScriptPublicKeyVersionBeforeHF: 100, + name: "below 255", + scriptPublicKeyVersion: 100, }, { - name: "above 255", - scriptPublicKeyVersion: 300, - expectedScriptPublicKeyVersionBeforeHF: 44, + name: "above 255", + scriptPublicKeyVersion: 300, }, } @@ -46,16 +43,7 @@ func TestExtractCoinbaseDataBlueScoreAndSubsidy(t *testing.T) { t.Fatal(err) } - _, cbData, _, err := tc.CoinbaseManager().ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTx, false) - if err != nil { - t.Fatal(err) - } - - if cbData.ScriptPublicKey.Version != test.expectedScriptPublicKeyVersionBeforeHF { - t.Fatalf("test %s pre HF expected %d but got %d", test.name, test.expectedScriptPublicKeyVersionBeforeHF, cbData.ScriptPublicKey.Version) - } - - _, cbData, _, err = tc.CoinbaseManager().ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTx, true) + _, cbData, _, err := tc.CoinbaseManager().ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTx) if err != nil { t.Fatal(err) } diff --git a/domain/consensus/processes/coinbasemanager/coinbasemanager_test.go b/domain/consensus/processes/coinbasemanager/coinbasemanager_test.go index f0e7b9c55..a5e658c08 100644 --- a/domain/consensus/processes/coinbasemanager/coinbasemanager_test.go +++ b/domain/consensus/processes/coinbasemanager/coinbasemanager_test.go @@ -21,7 +21,6 @@ func TestCalcDeflationaryPeriodBlockSubsidy(t *testing.T) { &externalapi.DomainHash{}, deflationaryPhaseDaaScore, deflationaryPhaseBaseSubsidy, - 0, nil, nil, nil, @@ -97,7 +96,6 @@ func TestBuildSubsidyTable(t *testing.T) { &externalapi.DomainHash{}, 0, deflationaryPhaseBaseSubsidy, - 0, nil, nil, nil, diff --git a/domain/consensus/processes/coinbasemanager/payload.go b/domain/consensus/processes/coinbasemanager/payload.go index f67374abc..ff82e5c69 100644 --- a/domain/consensus/processes/coinbasemanager/payload.go +++ b/domain/consensus/processes/coinbasemanager/payload.go @@ -61,7 +61,7 @@ func ModifyCoinbasePayload(payload []byte, coinbaseData *externalapi.DomainCoinb } // ExtractCoinbaseDataBlueScoreAndSubsidy deserializes the coinbase payload to its component (scriptPubKey, extra data, and subsidy). -func (c *coinbaseManager) ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTx *externalapi.DomainTransaction, postHF bool) ( +func (c *coinbaseManager) ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTx *externalapi.DomainTransaction) ( blueScore uint64, coinbaseData *externalapi.DomainCoinbaseData, subsidy uint64, err error) { minLength := uint64Len + lengthOfSubsidy + lengthOfVersionScriptPubKey + lengthOfScriptPubKeyLength @@ -73,10 +73,7 @@ func (c *coinbaseManager) ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTx *ext blueScore = binary.LittleEndian.Uint64(coinbaseTx.Payload[:uint64Len]) subsidy = binary.LittleEndian.Uint64(coinbaseTx.Payload[uint64Len:]) - scriptPubKeyVersion := uint16(coinbaseTx.Payload[uint64Len+lengthOfSubsidy]) - if postHF { - scriptPubKeyVersion = binary.LittleEndian.Uint16(coinbaseTx.Payload[uint64Len+lengthOfSubsidy : uint64Len+lengthOfSubsidy+uint16Len]) - } + scriptPubKeyVersion := binary.LittleEndian.Uint16(coinbaseTx.Payload[uint64Len+lengthOfSubsidy : uint64Len+lengthOfSubsidy+uint16Len]) scriptPubKeyScriptLength := coinbaseTx.Payload[uint64Len+lengthOfSubsidy+lengthOfVersionScriptPubKey] diff --git a/domain/consensus/processes/consensusstatemanager/consensus_state_manager.go b/domain/consensus/processes/consensusstatemanager/consensus_state_manager.go index 37a5684de..08fbb37bb 100644 --- a/domain/consensus/processes/consensusstatemanager/consensus_state_manager.go +++ b/domain/consensus/processes/consensusstatemanager/consensus_state_manager.go @@ -10,7 +10,6 @@ type consensusStateManager struct { maxBlockParents externalapi.KType mergeSetSizeLimit uint64 genesisHash *externalapi.DomainHash - hfDAAScore uint64 databaseContext model.DBManager ghostdagManager model.GHOSTDAGManager @@ -45,7 +44,6 @@ func New( maxBlockParents externalapi.KType, mergeSetSizeLimit uint64, genesisHash *externalapi.DomainHash, - hfDAAScore uint64, ghostdagManager model.GHOSTDAGManager, dagTopologyManager model.DAGTopologyManager, @@ -74,7 +72,6 @@ func New( maxBlockParents: maxBlockParents, mergeSetSizeLimit: mergeSetSizeLimit, genesisHash: genesisHash, - hfDAAScore: hfDAAScore, databaseContext: databaseContext, diff --git a/domain/consensus/processes/consensusstatemanager/verify_and_build_utxo.go b/domain/consensus/processes/consensusstatemanager/verify_and_build_utxo.go index 7160d413c..f1958cdbe 100644 --- a/domain/consensus/processes/consensusstatemanager/verify_and_build_utxo.go +++ b/domain/consensus/processes/consensusstatemanager/verify_and_build_utxo.go @@ -39,7 +39,7 @@ func (csm *consensusStateManager) verifyUTXO(stagingArea *model.StagingArea, blo coinbaseTransaction := block.Transactions[0] log.Debugf("Validating coinbase transaction %s for block %s", consensushashing.TransactionID(coinbaseTransaction), blockHash) - err = csm.validateCoinbaseTransaction(stagingArea, blockHash, coinbaseTransaction, block.Header.DAAScore() >= csm.hfDAAScore) + err = csm.validateCoinbaseTransaction(stagingArea, blockHash, coinbaseTransaction) if err != nil { return err } @@ -153,14 +153,14 @@ func calculateAcceptedIDMerkleRoot(multiblockAcceptanceData externalapi.Acceptan } func (csm *consensusStateManager) validateCoinbaseTransaction(stagingArea *model.StagingArea, - blockHash *externalapi.DomainHash, coinbaseTransaction *externalapi.DomainTransaction, postHF bool) error { + blockHash *externalapi.DomainHash, coinbaseTransaction *externalapi.DomainTransaction) error { log.Tracef("validateCoinbaseTransaction start for block %s", blockHash) defer log.Tracef("validateCoinbaseTransaction end for block %s", blockHash) log.Tracef("Extracting coinbase data for coinbase transaction %s in block %s", consensushashing.TransactionID(coinbaseTransaction), blockHash) - _, coinbaseData, _, err := csm.coinbaseManager.ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTransaction, postHF) + _, coinbaseData, _, err := csm.coinbaseManager.ExtractCoinbaseDataBlueScoreAndSubsidy(coinbaseTransaction) if err != nil { return err } @@ -172,8 +172,8 @@ func (csm *consensusStateManager) validateCoinbaseTransaction(stagingArea *model return err } - coinbaseTransactionHash := consensushashing.TransactionHash(coinbaseTransaction, true) - expectedCoinbaseTransactionHash := consensushashing.TransactionHash(expectedCoinbaseTransaction, true) + coinbaseTransactionHash := consensushashing.TransactionHash(coinbaseTransaction) + expectedCoinbaseTransactionHash := consensushashing.TransactionHash(expectedCoinbaseTransaction) log.Tracef("given coinbase hash: %s, expected coinbase hash: %s", coinbaseTransactionHash, expectedCoinbaseTransactionHash) diff --git a/domain/consensus/processes/transactionvalidator/mass.go b/domain/consensus/processes/transactionvalidator/mass.go index 918fd9048..d99410470 100644 --- a/domain/consensus/processes/transactionvalidator/mass.go +++ b/domain/consensus/processes/transactionvalidator/mass.go @@ -5,9 +5,9 @@ import ( ) // PopulateMass calculates and populates the mass of the given transaction -func (v *transactionValidator) PopulateMass(transaction *externalapi.DomainTransaction, daaScore uint64) { +func (v *transactionValidator) PopulateMass(transaction *externalapi.DomainTransaction) { if transaction.Mass != 0 { return } - transaction.Mass = v.txMassCalculator.CalculateTransactionMass(transaction, daaScore >= v.hfDAAScore) + transaction.Mass = v.txMassCalculator.CalculateTransactionMass(transaction) } diff --git a/domain/consensus/processes/transactionvalidator/transaction_in_context.go b/domain/consensus/processes/transactionvalidator/transaction_in_context.go index bbff8e076..88f6cf076 100644 --- a/domain/consensus/processes/transactionvalidator/transaction_in_context.go +++ b/domain/consensus/processes/transactionvalidator/transaction_in_context.go @@ -90,12 +90,7 @@ func (v *transactionValidator) ValidateTransactionInContextAndPopulateFee(stagin return err } - daaScore, err := v.daaBlocksStore.DAAScore(v.databaseContext, stagingArea, povBlockHash) - if err != nil { - return err - } - - err = v.validateTransactionSigOpCounts(tx, daaScore >= v.hfDAAScore) + err = v.validateTransactionSigOpCounts(tx) if err != nil { return err } @@ -346,7 +341,7 @@ func (v *transactionValidator) sequenceLockActive(sequenceLock *sequenceLock, bl return true } -func (v *transactionValidator) validateTransactionSigOpCounts(tx *externalapi.DomainTransaction, postHF bool) error { +func (v *transactionValidator) validateTransactionSigOpCounts(tx *externalapi.DomainTransaction) error { for i, input := range tx.Inputs { utxoEntry := input.UTXOEntry @@ -356,19 +351,10 @@ func (v *transactionValidator) validateTransactionSigOpCounts(tx *externalapi.Do isP2SH := txscript.IsPayToScriptHash(utxoEntry.ScriptPublicKey()) sigOpCount := txscript.GetPreciseSigOpCount(sigScript, utxoEntry.ScriptPublicKey(), isP2SH) - if postHF { - if sigOpCount != int(input.SigOpCount) { - return errors.Wrapf(ruleerrors.ErrWrongSigOpCount, - "input %d specifies SigOpCount %d while actual SigOpCount is %d", - i, input.SigOpCount, sigOpCount) - } - } else { - const sigOpCountLimit = 10 - if sigOpCount > sigOpCountLimit { - return errors.Wrapf(ruleerrors.ErrWrongSigOpCount, - "input %d is using SigOpCount %d while the limit is %d", - i, sigOpCount, sigOpCountLimit) - } + if sigOpCount != int(input.SigOpCount) { + return errors.Wrapf(ruleerrors.ErrWrongSigOpCount, + "input %d specifies SigOpCount %d while actual SigOpCount is %d", + i, input.SigOpCount, sigOpCount) } } return nil diff --git a/domain/consensus/processes/transactionvalidator/transaction_in_isolation.go b/domain/consensus/processes/transactionvalidator/transaction_in_isolation.go index 5eca8c2e0..699374aab 100644 --- a/domain/consensus/processes/transactionvalidator/transaction_in_isolation.go +++ b/domain/consensus/processes/transactionvalidator/transaction_in_isolation.go @@ -23,7 +23,7 @@ func (v *transactionValidator) ValidateTransactionInIsolation(tx *externalapi.Do if err != nil { return err } - err = v.checkCoinbaseInIsolation(tx, povDAAScore >= v.hfDAAScore) + err = v.checkCoinbaseInIsolation(tx) if err != nil { return err } @@ -114,7 +114,7 @@ func (v *transactionValidator) checkDuplicateTransactionInputs(tx *externalapi.D return nil } -func (v *transactionValidator) checkCoinbaseInIsolation(tx *externalapi.DomainTransaction, postHF bool) error { +func (v *transactionValidator) checkCoinbaseInIsolation(tx *externalapi.DomainTransaction) error { if !transactionhelper.IsCoinBase(tx) { return nil } @@ -127,21 +127,19 @@ func (v *transactionValidator) checkCoinbaseInIsolation(tx *externalapi.DomainTr payloadLen, v.maxCoinbasePayloadLength) } - if postHF { - if len(tx.Inputs) != 0 { - return errors.Wrap(ruleerrors.ErrCoinbaseWithInputs, "coinbase has inputs") - } + if len(tx.Inputs) != 0 { + return errors.Wrap(ruleerrors.ErrCoinbaseWithInputs, "coinbase has inputs") + } - outputsLimit := uint64(v.ghostdagK) + 2 - if uint64(len(tx.Outputs)) > outputsLimit { - return errors.Wrapf(ruleerrors.ErrCoinbaseTooManyOutputs, "coinbase has too many outputs: got %d where the limit is %d", len(tx.Outputs), outputsLimit) - } + outputsLimit := uint64(v.ghostdagK) + 2 + if uint64(len(tx.Outputs)) > outputsLimit { + return errors.Wrapf(ruleerrors.ErrCoinbaseTooManyOutputs, "coinbase has too many outputs: got %d where the limit is %d", len(tx.Outputs), outputsLimit) + } - for i, output := range tx.Outputs { - if len(output.ScriptPublicKey.Script) > int(v.coinbasePayloadScriptPublicKeyMaxLength) { - return errors.Wrapf(ruleerrors.ErrCoinbaseTooLongScriptPublicKey, "coinbase output %d has a too long script public key", i) + for i, output := range tx.Outputs { + if len(output.ScriptPublicKey.Script) > int(v.coinbasePayloadScriptPublicKeyMaxLength) { + return errors.Wrapf(ruleerrors.ErrCoinbaseTooLongScriptPublicKey, "coinbase output %d has a too long script public key", i) - } } } diff --git a/domain/consensus/processes/transactionvalidator/transaction_in_isolation_test.go b/domain/consensus/processes/transactionvalidator/transaction_in_isolation_test.go index 7a0842225..b9acce545 100644 --- a/domain/consensus/processes/transactionvalidator/transaction_in_isolation_test.go +++ b/domain/consensus/processes/transactionvalidator/transaction_in_isolation_test.go @@ -22,7 +22,6 @@ type txSubnetworkData struct { func TestValidateTransactionInIsolationAndPopulateMass(t *testing.T) { testutils.ForAllNets(t, true, func(t *testing.T, consensusConfig *consensus.Config) { cfg := *consensusConfig - cfg.HFDAAScore = 1000 factory := consensus.NewFactory() tc, teardown, err := factory.NewTestConsensus(&cfg, "TestValidateTransactionInIsolationAndPopulateMass") @@ -70,22 +69,14 @@ func TestValidateTransactionInIsolationAndPopulateMass(t *testing.T) { nil, func(tx *externalapi.DomainTransaction) { tx.Inputs[1].PreviousOutpoint.Index = 0 }, ruleerrors.ErrDuplicateTxInputs, 0}, - {"1 input coinbase - pre HF", + {"1 input coinbase", 1, 1, 1, subnetworks.SubnetworkIDNative, &txSubnetworkData{subnetworks.SubnetworkIDCoinbase, 0, nil}, nil, - nil, 0}, - {"1 input coinbase - post HF", - 1, - 1, - 1, - subnetworks.SubnetworkIDNative, - &txSubnetworkData{subnetworks.SubnetworkIDCoinbase, 0, nil}, - nil, - ruleerrors.ErrCoinbaseWithInputs, cfg.HFDAAScore}, + ruleerrors.ErrCoinbaseWithInputs, 0}, {"no inputs coinbase", 0, 1, diff --git a/domain/consensus/processes/transactionvalidator/transactionvalidator.go b/domain/consensus/processes/transactionvalidator/transactionvalidator.go index 1c33ef22c..818e88e9b 100644 --- a/domain/consensus/processes/transactionvalidator/transactionvalidator.go +++ b/domain/consensus/processes/transactionvalidator/transactionvalidator.go @@ -19,7 +19,6 @@ type transactionValidator struct { daaBlocksStore model.DAABlocksStore enableNonNativeSubnetworks bool maxCoinbasePayloadLength uint64 - hfDAAScore uint64 ghostdagK externalapi.KType coinbasePayloadScriptPublicKeyMaxLength uint8 sigCache *txscript.SigCache @@ -31,7 +30,6 @@ type transactionValidator struct { func New(blockCoinbaseMaturity uint64, enableNonNativeSubnetworks bool, maxCoinbasePayloadLength uint64, - hfDAAScore uint64, ghostdagK externalapi.KType, coinbasePayloadScriptPublicKeyMaxLength uint8, databaseContext model.DBReader, @@ -44,7 +42,6 @@ func New(blockCoinbaseMaturity uint64, blockCoinbaseMaturity: blockCoinbaseMaturity, enableNonNativeSubnetworks: enableNonNativeSubnetworks, maxCoinbasePayloadLength: maxCoinbasePayloadLength, - hfDAAScore: hfDAAScore, ghostdagK: ghostdagK, coinbasePayloadScriptPublicKeyMaxLength: coinbasePayloadScriptPublicKeyMaxLength, databaseContext: databaseContext, diff --git a/domain/consensus/ruleerrors/rule_error.go b/domain/consensus/ruleerrors/rule_error.go index 0da7ef2e9..b3321e9ca 100644 --- a/domain/consensus/ruleerrors/rule_error.go +++ b/domain/consensus/ruleerrors/rule_error.go @@ -244,7 +244,6 @@ var ( ErrCoinbaseWithInputs = newRuleError("ErrCoinbaseWithInputs") ErrCoinbaseTooManyOutputs = newRuleError("ErrCoinbaseTooManyOutputs") ErrCoinbaseTooLongScriptPublicKey = newRuleError("ErrCoinbaseTooLongScriptPublicKey") - ErrOverMaxBlockInputsPreHF = newRuleError("ErrOverMaxBlockInputsPreHF") ) // RuleError identifies a rule violation. It is used to indicate that diff --git a/domain/consensus/utils/consensushashing/transaction.go b/domain/consensus/utils/consensushashing/transaction.go index 5012abdcf..aadbaafd4 100644 --- a/domain/consensus/utils/consensushashing/transaction.go +++ b/domain/consensus/utils/consensushashing/transaction.go @@ -23,11 +23,11 @@ const ( ) // TransactionHash returns the transaction hash. -func TransactionHash(tx *externalapi.DomainTransaction, postHF bool) *externalapi.DomainHash { +func TransactionHash(tx *externalapi.DomainTransaction) *externalapi.DomainHash { // Encode the header and hash everything prior to the number of // transactions. writer := hashes.NewTransactionHashWriter() - err := serializeTransaction(writer, tx, txEncodingFull, postHF) + err := serializeTransaction(writer, tx, txEncodingFull) if err != nil { // It seems like this could only happen if the writer returned an error. // and this writer should never return an error (no allocations or possible failures) @@ -52,7 +52,7 @@ func TransactionID(tx *externalapi.DomainTransaction) *externalapi.DomainTransac encodingFlags = txEncodingExcludeSignatureScript } writer := hashes.NewTransactionIDWriter() - err := serializeTransaction(writer, tx, encodingFlags, true) + err := serializeTransaction(writer, tx, encodingFlags) if err != nil { // this writer never return errors (no allocations or possible failures) so errors can only come from validity checks, // and we assume we never construct malformed transactions. @@ -74,7 +74,7 @@ func TransactionIDs(txs []*externalapi.DomainTransaction) []*externalapi.DomainT return txIDs } -func serializeTransaction(w io.Writer, tx *externalapi.DomainTransaction, encodingFlags txEncoding, postHF bool) error { +func serializeTransaction(w io.Writer, tx *externalapi.DomainTransaction, encodingFlags txEncoding) error { err := binaryserializer.PutUint16(w, tx.Version) if err != nil { return err @@ -87,7 +87,7 @@ func serializeTransaction(w io.Writer, tx *externalapi.DomainTransaction, encodi } for _, ti := range tx.Inputs { - err = writeTransactionInput(w, ti, encodingFlags, postHF) + err = writeTransactionInput(w, ti, encodingFlags) if err != nil { return err } @@ -131,7 +131,7 @@ func serializeTransaction(w io.Writer, tx *externalapi.DomainTransaction, encodi // writeTransactionInput encodes ti to the kaspa protocol encoding for a transaction // input to w. -func writeTransactionInput(w io.Writer, ti *externalapi.DomainTransactionInput, encodingFlags txEncoding, postHF bool) error { +func writeTransactionInput(w io.Writer, ti *externalapi.DomainTransactionInput, encodingFlags txEncoding) error { err := writeOutpoint(w, &ti.PreviousOutpoint) if err != nil { return err @@ -143,11 +143,9 @@ func writeTransactionInput(w io.Writer, ti *externalapi.DomainTransactionInput, return err } - if postHF { - _, err = w.Write([]byte{ti.SigOpCount}) - if err != nil { - return err - } + _, err = w.Write([]byte{ti.SigOpCount}) + if err != nil { + return err } } else { err = writeVarBytes(w, []byte{}) diff --git a/domain/consensus/utils/constants/constants.go b/domain/consensus/utils/constants/constants.go index ef030ac6b..ab9b3fafd 100644 --- a/domain/consensus/utils/constants/constants.go +++ b/domain/consensus/utils/constants/constants.go @@ -38,7 +38,4 @@ const ( // UnacceptedDAAScore is used to for UTXOEntries that were created by transactions in the mempool, or otherwise // not-yet-accepted transactions. UnacceptedDAAScore = math.MaxUint64 - - // MaxBlockInputsPreHF is the maximum number of inputs a block can hold before the HF - MaxBlockInputsPreHF = 900 ) diff --git a/domain/consensus/utils/merkle/merkle.go b/domain/consensus/utils/merkle/merkle.go index a6599e2f4..c53a0ef88 100644 --- a/domain/consensus/utils/merkle/merkle.go +++ b/domain/consensus/utils/merkle/merkle.go @@ -37,10 +37,10 @@ func hashMerkleBranches(left, right *externalapi.DomainHash) *externalapi.Domain // CalculateHashMerkleRoot calculates the merkle root of a tree consisted of the given transaction hashes. // See `merkleRoot` for more info. -func CalculateHashMerkleRoot(transactions []*externalapi.DomainTransaction, postHF bool) *externalapi.DomainHash { +func CalculateHashMerkleRoot(transactions []*externalapi.DomainTransaction) *externalapi.DomainHash { txHashes := make([]*externalapi.DomainHash, len(transactions)) for i, tx := range transactions { - txHashes[i] = consensushashing.TransactionHash(tx, postHF) + txHashes[i] = consensushashing.TransactionHash(tx) } return merkleRoot(txHashes) } diff --git a/domain/dagconfig/params.go b/domain/dagconfig/params.go index 34f75a456..67e20c16f 100644 --- a/domain/dagconfig/params.go +++ b/domain/dagconfig/params.go @@ -188,8 +188,6 @@ type Params struct { MaxBlockLevel int MergeDepth uint64 - - HFDAAScore uint64 } // NormalizeRPCServerAddress returns addr with the current network default @@ -290,8 +288,6 @@ var MainnetParams = Params{ // This means that any block that has a level lower or equal to genesis will be level 0. MaxBlockLevel: 225, MergeDepth: defaultMergeDepth, - - HFDAAScore: 27905000, } // TestnetParams defines the network parameters for the test Kaspa network. @@ -354,7 +350,6 @@ var TestnetParams = Params{ MaxBlockLevel: 250, MergeDepth: defaultMergeDepth, - HFDAAScore: 14106400, } // SimnetParams defines the network parameters for the simulation test Kaspa diff --git a/domain/miningmanager/blocktemplatebuilder/blocktemplatebuilder.go b/domain/miningmanager/blocktemplatebuilder/blocktemplatebuilder.go index c40c35146..564542db8 100644 --- a/domain/miningmanager/blocktemplatebuilder/blocktemplatebuilder.go +++ b/domain/miningmanager/blocktemplatebuilder/blocktemplatebuilder.go @@ -37,19 +37,17 @@ type blockTemplateBuilder struct { policy policy coinbasePayloadScriptPublicKeyMaxLength uint8 - hfDAAScore uint64 } // New creates a new blockTemplateBuilder func New(consensusReference consensusreference.ConsensusReference, mempool miningmanagerapi.Mempool, - blockMaxMass uint64, coinbasePayloadScriptPublicKeyMaxLength uint8, hfDAAScore uint64) miningmanagerapi.BlockTemplateBuilder { + blockMaxMass uint64, coinbasePayloadScriptPublicKeyMaxLength uint8) miningmanagerapi.BlockTemplateBuilder { return &blockTemplateBuilder{ consensusReference: consensusReference, mempool: mempool, policy: policy{BlockMaxMass: blockMaxMass}, coinbasePayloadScriptPublicKeyMaxLength: coinbasePayloadScriptPublicKeyMaxLength, - hfDAAScore: hfDAAScore, } } @@ -192,7 +190,7 @@ func (btb *blockTemplateBuilder) ModifyBlockTemplate(newCoinbaseData *consensuse // Update the hash merkle root according to the modified transactions mutableHeader := blockTemplateToModify.Block.Header.ToMutable() // TODO: can be optimized to O(log(#transactions)) by caching the whole merkle tree in BlockTemplate and changing only the relevant path - mutableHeader.SetHashMerkleRoot(merkle.CalculateHashMerkleRoot(blockTemplateToModify.Block.Transactions, mutableHeader.DAAScore() >= btb.hfDAAScore)) + mutableHeader.SetHashMerkleRoot(merkle.CalculateHashMerkleRoot(blockTemplateToModify.Block.Transactions)) newTimestamp := mstime.Now().UnixMilliseconds() if newTimestamp >= mutableHeader.TimeInMilliseconds() { diff --git a/domain/miningmanager/blocktemplatebuilder/txselection.go b/domain/miningmanager/blocktemplatebuilder/txselection.go index 1bf64bc1b..6ebfec689 100644 --- a/domain/miningmanager/blocktemplatebuilder/txselection.go +++ b/domain/miningmanager/blocktemplatebuilder/txselection.go @@ -1,7 +1,6 @@ package blocktemplatebuilder import ( - "github.com/kaspanet/kaspad/domain/consensus/utils/constants" "math" "math/rand" "sort" @@ -75,8 +74,6 @@ func (btb *blockTemplateBuilder) selectTransactions(candidateTxs []*candidateTx) usedP += candidateTx.p } - totalInputs := 0 - selectedTxs := make([]*candidateTx, 0) for len(candidateTxs)-usedCount > 0 { // Rebalance the candidates if it's required @@ -102,10 +99,6 @@ func (btb *blockTemplateBuilder) selectTransactions(candidateTxs []*candidateTx) } tx := selectedTx.DomainTransaction - if totalInputs+len(tx.Inputs) > maxBlockInputsPreHF(btb.hfDAAScore) { - continue - } - // Enforce maximum transaction mass per block. Also check // for overflow. if txsForBlockTemplate.totalMass+selectedTx.Mass < txsForBlockTemplate.totalMass || @@ -150,7 +143,6 @@ func (btb *blockTemplateBuilder) selectTransactions(candidateTxs []*candidateTx) // save the masses, fees, and signature operation counts to the // result. selectedTxs = append(selectedTxs, selectedTx) - totalInputs += len(selectedTx.Inputs) txsForBlockTemplate.totalMass += selectedTx.Mass txsForBlockTemplate.totalFees += selectedTx.Fee @@ -158,10 +150,6 @@ func (btb *blockTemplateBuilder) selectTransactions(candidateTxs []*candidateTx) consensushashing.TransactionID(tx), selectedTx.Fee*1e6/selectedTx.Mass) markCandidateTxForDeletion(selectedTx) - - if totalInputs == maxBlockInputsPreHF(btb.hfDAAScore) { - break - } } sort.Slice(selectedTxs, func(i, j int) bool { @@ -175,10 +163,6 @@ func (btb *blockTemplateBuilder) selectTransactions(candidateTxs []*candidateTx) return txsForBlockTemplate } -func maxBlockInputsPreHF(hfDAAScore uint64) int { - return constants.MaxBlockInputsPreHF -} - func rebalanceCandidates(oldCandidateTxs []*candidateTx, isFirstRun bool) ( candidateTxs []*candidateTx, totalP float64) { diff --git a/domain/miningmanager/factory.go b/domain/miningmanager/factory.go index ab5fc537d..16b50fb29 100644 --- a/domain/miningmanager/factory.go +++ b/domain/miningmanager/factory.go @@ -21,7 +21,7 @@ func (f *factory) NewMiningManager(consensusReference consensusreference.Consens mempoolConfig *mempoolpkg.Config) MiningManager { mempool := mempoolpkg.New(mempoolConfig, consensusReference) - blockTemplateBuilder := blocktemplatebuilder.New(consensusReference, mempool, params.MaxBlockMass, params.CoinbasePayloadScriptPublicKeyMaxLength, params.HFDAAScore) + blockTemplateBuilder := blocktemplatebuilder.New(consensusReference, mempool, params.MaxBlockMass, params.CoinbasePayloadScriptPublicKeyMaxLength) return &miningManager{ consensusReference: consensusReference, diff --git a/util/txmass/calculator.go b/util/txmass/calculator.go index 4dc286965..5206f7fe5 100644 --- a/util/txmass/calculator.go +++ b/util/txmass/calculator.go @@ -31,7 +31,7 @@ func (c *Calculator) MassPerScriptPubKeyByte() uint64 { return c.massPerScriptPu func (c *Calculator) MassPerSigOp() uint64 { return c.massPerSigOp } // CalculateTransactionMass calculates the mass of the given transaction -func (c *Calculator) CalculateTransactionMass(transaction *externalapi.DomainTransaction, postHF bool) uint64 { +func (c *Calculator) CalculateTransactionMass(transaction *externalapi.DomainTransaction) uint64 { if transactionhelper.IsCoinBase(transaction) { return 0 } @@ -49,14 +49,11 @@ func (c *Calculator) CalculateTransactionMass(transaction *externalapi.DomainTra massForScriptPubKey := totalScriptPubKeySize * c.massPerScriptPubKeyByte // calculate mass for SigOps - massForSigOps := uint64(0) - if postHF { - totalSigOpCount := uint64(0) - for _, input := range transaction.Inputs { - totalSigOpCount += uint64(input.SigOpCount) - } - massForSigOps = totalSigOpCount * c.massPerSigOp + totalSigOpCount := uint64(0) + for _, input := range transaction.Inputs { + totalSigOpCount += uint64(input.SigOpCount) } + massForSigOps := totalSigOpCount * c.massPerSigOp // Sum all components of mass return massForSize + massForScriptPubKey + massForSigOps