Merge pull request #1068 from nspcc-dev/fix/free

Remove logic related to free transactions

config/protocol.mainnet.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 5195086
   SecondsPerBlock: 15
-  LowPriorityThreshold: 0.001
   MemPoolSize: 50000
   StandbyValidators:
   - 03b209fd4f53a7170ea4444e0cb0a6bb6a53c2bd016926989cf85f9b0fba17a70c
@@ -19,11 +18,7 @@ ProtocolConfiguration:
   - seed5.neo.org:10333
   VerifyBlocks: true
   VerifyTransactions: false
-  FreeGasLimit: 10.0
   MaxTransactionsPerBlock: 500
-  MaxFreeTransactionsPerBlock: 20
-  MaxFreeTransactionSize: 1024
-  FeePerExtraByte: 0.00001
 
 ApplicationConfiguration:
   # LogPath could be set up in case you need stdout logs to some proper file.

config/protocol.privnet.docker.four.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 56753
   SecondsPerBlock: 15
-  LowPriorityThreshold: 0.000
   MemPoolSize: 50000
   StandbyValidators:
     - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2

config/protocol.privnet.docker.one.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 56753
   SecondsPerBlock: 15
-  LowPriorityThreshold: 0.000
   MemPoolSize: 50000
   StandbyValidators:
     - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2

config/protocol.privnet.docker.single.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 56753
   SecondsPerBlock: 1
-  LowPriorityThreshold: 0.001
   MemPoolSize: 50000
   StandbyValidators:
     - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2

config/protocol.privnet.docker.three.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 56753
   SecondsPerBlock: 15
-  LowPriorityThreshold: 0.000
   MemPoolSize: 50000
   StandbyValidators:
     - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2

config/protocol.privnet.docker.two.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 56753
   SecondsPerBlock: 15
-  LowPriorityThreshold: 0.000
   MemPoolSize: 50000
   StandbyValidators:
     - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2

config/protocol.privnet.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 56753
   SecondsPerBlock: 15
-  LowPriorityThreshold: 0.000
   MemPoolSize: 50000
   StandbyValidators:
     - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2

config/protocol.testnet.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 1951352142
   SecondsPerBlock: 15
-  LowPriorityThreshold: 0.000
   MemPoolSize: 50000
   StandbyValidators:
   - 023e9b32ea89b94d066e649b124fd50e396ee91369e8e2a6ae1b11c170d022256d
@@ -19,11 +18,7 @@ ProtocolConfiguration:
   - seed5t.neo.org:20333
   VerifyBlocks: true
   VerifyTransactions: false
-  FreeGasLimit: 10.0
   MaxTransactionsPerBlock: 500
-  MaxFreeTransactionsPerBlock: 20
-  MaxFreeTransactionSize: 1024
-  FeePerExtraByte: 0.00001
 
 ApplicationConfiguration:
   # LogPath could be set up in case you need stdout logs to some proper file.

config/protocol.unit_testnet.yml

@@ -1,7 +1,6 @@
 ProtocolConfiguration:
   Magic: 42
   SecondsPerBlock: 15
-  LowPriorityThreshold: 0.000
   MemPoolSize: 50000
   StandbyValidators:
     - 02b3622bf4017bdfe317c58aed5f4c753f206b7db896046fa7d774bbc4bf7f8dc2

pkg/config/protocol_config.go

@@ -2,24 +2,13 @@ package config
 
 import (
 	"github.com/nspcc-dev/neo-go/pkg/config/netmode"
-	"github.com/nspcc-dev/neo-go/pkg/util"
 )
 
 // ProtocolConfiguration represents the protocol config.
 type (
 	ProtocolConfiguration struct {
-		// FeePerExtraByte sets the expected per-byte fee for
-		// transactions exceeding the MaxFreeTransactionSize.
-		FeePerExtraByte float64 `yaml:"FeePerExtraByte"`
-		// FreeGasLimit is an amount of GAS which can be spent for free.
-		FreeGasLimit            util.Fixed8   `yaml:"FreeGasLimit"`
-		LowPriorityThreshold    float64       `yaml:"LowPriorityThreshold"`
 		Magic                   netmode.Magic `yaml:"Magic"`
 		MaxTransactionsPerBlock int           `yaml:"MaxTransactionsPerBlock"`
-		// Maximum size of low priority transaction in bytes.
-		MaxFreeTransactionSize int `yaml:"MaxFreeTransactionSize"`
-		// Maximum number of low priority transactions accepted into block.
-		MaxFreeTransactionsPerBlock int `yaml:"MaxFreeTransactionsPerBlock"`
 		MemPoolSize             int           `yaml:"MemPoolSize"`
 		// SaveStorageBatch enables storage batch saving before every persist.
 		SaveStorageBatch  bool     `yaml:"SaveStorageBatch"`

pkg/consensus/consensus_test.go

@@ -229,10 +229,6 @@ func newTestChain(t *testing.T) *core.Blockchain {
 	return chain
 }
 
-type feer struct{}
-
-func (fs *feer) IsLowPriority(util.Fixed8) bool { return false }
-
 var neoOwner = testchain.MultisigScriptHash()
 
 func addSender(t *testing.T, txs ...*transaction.Transaction) {

pkg/core/blockchain.go

@@ -156,18 +156,6 @@ func NewBlockchain(s storage.Store, cfg config.ProtocolConfiguration, log *zap.L
 		cfg.MaxTransactionsPerBlock = 0
 		log.Info("MaxTransactionsPerBlock is not set or wrong, setting default value (unlimited)", zap.Int("MaxTransactionsPerBlock", cfg.MaxTransactionsPerBlock))
 	}
-	if cfg.MaxFreeTransactionsPerBlock <= 0 {
-		cfg.MaxFreeTransactionsPerBlock = 0
-		log.Info("MaxFreeTransactionsPerBlock is not set or wrong, setting default value (unlimited)", zap.Int("MaxFreeTransactionsPerBlock", cfg.MaxFreeTransactionsPerBlock))
-	}
-	if cfg.MaxFreeTransactionSize <= 0 {
-		cfg.MaxFreeTransactionSize = 0
-		log.Info("MaxFreeTransactionSize is not set or wrong, setting default value (unlimited)", zap.Int("MaxFreeTransactionSize", cfg.MaxFreeTransactionSize))
-	}
-	if cfg.FeePerExtraByte <= 0 {
-		cfg.FeePerExtraByte = 0
-		log.Info("FeePerExtraByte is not set or wrong, setting default value", zap.Float64("FeePerExtraByte", cfg.FeePerExtraByte))
-	}
 	bc := &Blockchain{
 		config:        cfg,
 		dao:           dao.NewSimple(s, cfg.Magic),
@@ -605,9 +593,7 @@ func (bc *Blockchain) storeBlock(block *block.Block) error {
 		v := SpawnVM(systemInterop)
 		v.LoadScriptWithFlags(tx.Script, smartcontract.All)
 		v.SetPriceGetter(getPrice)
-		if bc.config.FreeGasLimit > 0 {
+		v.GasLimit = tx.SystemFee
-			v.GasLimit = bc.config.FreeGasLimit + tx.SystemFee
-		}
 
 		err := v.Run()
 		if !v.HasFailed() {
@@ -1102,12 +1088,6 @@ func (bc *Blockchain) FeePerByte() util.Fixed8 {
 	return util.Fixed8(1000)
 }
 
-// IsLowPriority checks given fee for being less than configured
-// LowPriorityThreshold.
-func (bc *Blockchain) IsLowPriority(fee util.Fixed8) bool {
-	return fee < util.Fixed8FromFloat(bc.GetConfig().LowPriorityThreshold)
-}
-
 // GetMemPool returns the memory pool of the blockchain.
 func (bc *Blockchain) GetMemPool() *mempool.Pool {
 	return &bc.memPool
@@ -1119,15 +1099,6 @@ func (bc *Blockchain) ApplyPolicyToTxSet(txes []*transaction.Transaction) []*tra
 	if bc.config.MaxTransactionsPerBlock != 0 && len(txes) > bc.config.MaxTransactionsPerBlock {
 		txes = txes[:bc.config.MaxTransactionsPerBlock]
 	}
-	maxFree := bc.config.MaxFreeTransactionsPerBlock
-	if maxFree != 0 {
-		lowStart := sort.Search(len(txes), func(i int) bool {
-			return bc.IsLowPriority(txes[i].NetworkFee)
-		})
-		if lowStart+maxFree < len(txes) {
-			txes = txes[:lowStart+maxFree]
-		}
-	}
 	return txes
 }
 
@@ -1227,14 +1198,6 @@ func (bc *Blockchain) PoolTx(t *transaction.Transaction) error {
 		return err
 	}
 	// Policying.
-	txSize := io.GetVarSize(t)
-	maxFree := bc.config.MaxFreeTransactionSize
-	if maxFree != 0 && txSize > maxFree {
-		if bc.IsLowPriority(t.NetworkFee) ||
-			t.NetworkFee < util.Fixed8FromFloat(bc.config.FeePerExtraByte)*util.Fixed8(txSize-maxFree) {
-			return ErrPolicy
-		}
-	}
 	if err := bc.memPool.Add(t, bc); err != nil {
 		switch err {
 		case mempool.ErrOOM:

pkg/core/mempool/feer.go

@@ -6,7 +6,6 @@ import (
 
 // Feer is an interface that abstract the implementation of the fee calculation.
 type Feer interface {
-	IsLowPriority(util.Fixed8) bool
 	FeePerByte() util.Fixed8
 	GetUtilityTokenBalance(util.Uint160) util.Fixed8
 }

pkg/core/mempool/mem_pool.go

@@ -27,7 +27,6 @@ var (
 type item struct {
 	txn       *transaction.Transaction
 	timeStamp time.Time
-	isLowPrio bool
 }
 
 // items is a slice of item.
@@ -63,14 +62,6 @@ func (p *item) CompareTo(otherP *item) int {
 		return 1
 	}
 
-	if !p.isLowPrio && otherP.isLowPrio {
-		return 1
-	}
-
-	if p.isLowPrio && !otherP.isLowPrio {
-		return -1
-	}
-
 	// Fees sorted ascending.
 	if ret := p.txn.FeePerByte().CompareTo(otherP.txn.FeePerByte()); ret != 0 {
 		return ret
@@ -151,7 +142,6 @@ func (mp *Pool) Add(t *transaction.Transaction, fee Feer) error {
 		txn:       t,
 		timeStamp: time.Now().UTC(),
 	}
-	pItem.isLowPrio = fee.IsLowPriority(pItem.txn.NetworkFee)
 	mp.lock.Lock()
 	if !mp.checkTxConflicts(t, fee) {
 		mp.lock.Unlock()

pkg/core/mempool/mem_pool_test.go

@@ -13,14 +13,9 @@ import (
 )
 
 type FeerStub struct {
-	lowPriority bool
 	feePerByte util.Fixed8
 }
 
-func (fs *FeerStub) IsLowPriority(util.Fixed8) bool {
-	return fs.lowPriority
-}
-
 func (fs *FeerStub) FeePerByte() util.Fixed8 {
 	return fs.feePerByte
 }
@@ -50,14 +45,12 @@ func testMemPoolAddRemoveWithFeer(t *testing.T, fs Feer) {
 }
 
 func TestMemPoolAddRemove(t *testing.T) {
-	var fs = &FeerStub{lowPriority: false}
+	var fs = &FeerStub{}
-	t.Run("low priority", func(t *testing.T) { testMemPoolAddRemoveWithFeer(t, fs) })
+	testMemPoolAddRemoveWithFeer(t, fs)
-	fs.lowPriority = true
-	t.Run("high priority", func(t *testing.T) { testMemPoolAddRemoveWithFeer(t, fs) })
 }
 
 func TestOverCapacity(t *testing.T) {
-	var fs = &FeerStub{lowPriority: true}
+	var fs = &FeerStub{}
 	const mempoolSize = 10
 	mp := NewMemPool(mempoolSize)
 
@@ -110,9 +103,9 @@ func TestOverCapacity(t *testing.T) {
 	require.Equal(t, true, sort.IsSorted(sort.Reverse(mp.verifiedTxes)))
 
 	// High priority always wins over low priority.
-	fs.lowPriority = false
 	for i := 0; i < mempoolSize; i++ {
 		tx := transaction.New(netmode.UnitTestNet, []byte{byte(opcode.PUSH1)}, 0)
+		tx.NetworkFee = util.Fixed8FromFloat(0.00008)
 		tx.Nonce = txcnt
 		txcnt++
 		require.NoError(t, mp.Add(tx, fs))
@@ -120,16 +113,16 @@ func TestOverCapacity(t *testing.T) {
 		require.Equal(t, true, sort.IsSorted(sort.Reverse(mp.verifiedTxes)))
 	}
 	// Good luck with low priority now.
-	fs.lowPriority = true
 	tx = transaction.New(netmode.UnitTestNet, []byte{byte(opcode.PUSH1)}, 0)
 	tx.Nonce = txcnt
+	tx.NetworkFee = util.Fixed8FromFloat(0.00007)
 	require.Error(t, mp.Add(tx, fs))
 	require.Equal(t, mempoolSize, mp.Count())
 	require.Equal(t, true, sort.IsSorted(sort.Reverse(mp.verifiedTxes)))
 }
 
 func TestGetVerified(t *testing.T) {
-	var fs = &FeerStub{lowPriority: true}
+	var fs = &FeerStub{}
 	const mempoolSize = 10
 	mp := NewMemPool(mempoolSize)
 
@@ -152,7 +145,7 @@ func TestGetVerified(t *testing.T) {
 }
 
 func TestRemoveStale(t *testing.T) {
-	var fs = &FeerStub{lowPriority: true}
+	var fs = &FeerStub{}
 	const mempoolSize = 10
 	mp := NewMemPool(mempoolSize)
 

pkg/core/native_contract_test.go

@@ -107,7 +107,14 @@ func TestNativeContract_Invoke(t *testing.T) {
 	tx.ValidUntilBlock = validUntil
 	require.NoError(t, addSender(tx))
 	require.NoError(t, signTx(chain, tx))
-	b := chain.newBlock(tx)
+
+	// Enough for Call and other opcodes, but not enough for "sum" call.
+	tx2 := transaction.New(chain.GetConfig().Magic, script, testSumPrice*2)
+	tx2.ValidUntilBlock = chain.blockHeight + 1
+	require.NoError(t, addSender(tx2))
+	require.NoError(t, signTx(chain, tx2))
+
+	b := chain.newBlock(tx, tx2)
 	require.NoError(t, chain.AddBlock(b))
 
 	res, err := chain.GetAppExecResult(tx.Hash())
@@ -117,6 +124,10 @@ func TestNativeContract_Invoke(t *testing.T) {
 	require.Equal(t, smartcontract.IntegerType, res.Stack[0].Type)
 	require.EqualValues(t, 42, res.Stack[0].Value)
 
+	res, err = chain.GetAppExecResult(tx2.Hash())
+	require.NoError(t, err)
+	require.Equal(t, "FAULT", res.VMState)
+
 	require.NoError(t, chain.persist())
 	select {
 	case index := <-tn.blocks:

pkg/network/helper_test.go

@@ -123,10 +123,6 @@ func (chain testChain) GetMemPool() *mempool.Pool {
 	panic("TODO")
 }
 
-func (chain testChain) IsLowPriority(util.Fixed8) bool {
-	panic("TODO")
-}
-
 func (chain testChain) GetGoverningTokenBalance(acc util.Uint160) (util.Fixed8, uint32) {
 	panic("TODO")
 }

pkg/rpc/server/server_helper_test.go

@@ -85,10 +85,6 @@ func initServerWithInMemoryChain(t *testing.T) (*core.Blockchain, *Server, *http
 
 type FeerStub struct{}
 
-func (fs *FeerStub) IsLowPriority(util.Fixed8) bool {
-	return false
-}
-
 func (fs *FeerStub) FeePerByte() util.Fixed8 {
 	return 0
 }