Re-organise (#1062)

Author: vanja-vechain

consensus/consensus_test.go

@@ -638,6 +638,25 @@ func TestValidateBlockBody(t *testing.T) {
 				assert.Equal(t, expected, err)
 			},
 		},
+		{
+			"TxDelegatorBlocked", func(t *testing.T) {
+				thor.MockBlocklist([]string{genesis.DevAccounts()[9].Address.String()})
+				builder := txBuilder(tc.tag)
+				builder = builder.Features(tx.Features(0x01))
+				trx := tx.MustSignDelegated(builder.Build(), genesis.DevAccounts()[8].PrivateKey, genesis.DevAccounts()[9].PrivateKey)
+				blk, err := tc.sign(
+					tc.builder(tc.original.Header()).Transaction(trx),
+				)
+				if err != nil {
+					t.Fatal(err)
+				}
+				err = tc.consent(blk)
+				expected := consensusError(
+					fmt.Sprintf("tx delegator blocked got packed: %v", genesis.DevAccounts()[9].Address),
+				)
+				assert.Equal(t, expected, err)
+			},
+		},
 		{
 			"TxSignerUnavailable", func(t *testing.T) {
 				tx := txBuilder(tc.tag).Build()

consensus/validator.go

@@ -237,6 +237,14 @@ func (c *Consensus) validateBlockBody(blk *block.Block) error {
 			return consensusError(fmt.Sprintf("tx origin blocked got packed: %v", origin))
 		}
 
+		delegator, err := tx.Delegator()
+		if err != nil {
+			return consensusError(fmt.Sprintf("tx delegator unavailable: %v", err))
+		}
+		if header.Number() >= c.forkConfig.BLOCKLIST && delegator != nil && thor.IsOriginBlocked(*delegator) {
+			return consensusError(fmt.Sprintf("tx delegator blocked got packed: %v", delegator))
+		}
+
 		switch {
 		case tx.ChainTag() != c.repo.ChainTag():
 			return consensusError(fmt.Sprintf("tx chain tag mismatch: want %v, have %v", c.repo.ChainTag(), tx.ChainTag()))

packer/flow.go

@@ -96,6 +96,14 @@ func (f *Flow) Adopt(tx *tx.Transaction) error {
 		return badTxError{"tx origin blocked"}
 	}
 
+	delegator, err := tx.Delegator()
+	if err != nil {
+		return badTxError{"delegator cannot be extracted"}
+	}
+	if f.Number() >= f.packer.forkConfig.BLOCKLIST && delegator != nil && thor.IsOriginBlocked(*delegator) {
+		return badTxError{"tx delegator blocked"}
+	}
+
 	if err := tx.TestFeatures(f.features); err != nil {
 		return badTxError{err.Error()}
 	}

packer/flow_test.go

@@ -154,7 +154,7 @@ func TestAdoptErr(t *testing.T) {
 	addr := thor.BytesToAddress([]byte("to"))
 	clause := tx.NewClause(&addr).WithValue(big.NewInt(10000))
 
-	pkr := packer.New(repo, stater, genesis.DevAccounts()[0].Address, &genesis.DevAccounts()[0].Address, thor.NoFork)
+	pkr := packer.New(repo, stater, genesis.DevAccounts()[0].Address, &genesis.DevAccounts()[0].Address, thor.SoloFork)
 	sum, _ := repo.GetBlockSummary(b.Header().ID())
 
 	flow, _ := pkr.Schedule(sum, uint64(time.Now().Unix()))
@@ -179,4 +179,38 @@ func TestAdoptErr(t *testing.T) {
 	if err := flow.Adopt(tx3); err.Error() != expectedErrorMessage {
 		t.Fatalf("Expected error message: '%s', but got: '%s'", expectedErrorMessage, err.Error())
 	}
+
+	thor.MockBlocklist([]string{genesis.DevAccounts()[9].Address.String()})
+	// Test origin blacklisted
+	builder := new(tx.Builder).
+		ChainTag(repo.ChainTag()).
+		GasPriceCoef(1).
+		Expiration(0).
+		Gas(10e18).
+		Nonce(nonce).
+		Clause(clause).
+		BlockRef(tx.NewBlockRef(1))
+	tx4 := tx.MustSign(builder.Build(), genesis.DevAccounts()[9].PrivateKey)
+
+	expectedErrorMessage = "bad tx: tx origin blocked"
+	if err := flow.Adopt(tx4); err.Error() != expectedErrorMessage {
+		t.Fatalf("Expected error message: '%s', but got: '%s'", expectedErrorMessage, err.Error())
+	}
+
+	// Test delegator blacklisted
+	builder = new(tx.Builder).
+		ChainTag(repo.ChainTag()).
+		GasPriceCoef(1).
+		Expiration(0).
+		Gas(10e18).
+		Nonce(nonce).
+		Clause(clause).
+		Features(tx.Features(0x01)).
+		BlockRef(tx.NewBlockRef(1))
+	tx5 := tx.MustSignDelegated(builder.Build(), genesis.DevAccounts()[8].PrivateKey, genesis.DevAccounts()[9].PrivateKey)
+
+	expectedErrorMessage = "bad tx: tx delegator blocked"
+	if err := flow.Adopt(tx5); err.Error() != expectedErrorMessage {
+		t.Fatalf("Expected error message: '%s', but got: '%s'", expectedErrorMessage, err.Error())
+	}
 }

txpool/tx_pool.go

@@ -219,6 +219,11 @@ func (p *TxPool) add(newTx *tx.Transaction, rejectNonExecutable bool, localSubmi
 		return nil
 	}
 
+	delegator, _ := newTx.Delegator()
+	if delegator != nil && (thor.IsOriginBlocked(*delegator) || p.blocklist.Contains(*delegator)) {
+		return nil
+	}
+
 	headSummary := p.repo.BestBlockSummary()
 
 	// validation
@@ -355,6 +360,10 @@ func (p *TxPool) Fill(txs tx.Transactions) {
 		if thor.IsOriginBlocked(origin) || p.blocklist.Contains(origin) {
 			continue
 		}
+		delegator, _ := tx.Delegator()
+		if delegator != nil && (thor.IsOriginBlocked(*delegator) || p.blocklist.Contains(*delegator)) {
+			continue
+		}
 		// here we ignore errors
 		if txObj, err := resolveTx(tx, false); err == nil {
 			txObjs = append(txObjs, txObj)
@@ -418,6 +427,12 @@ func (p *TxPool) wash(headSummary *chain.BlockSummary) (executables tx.Transacti
 			logger.Trace("tx washed out", "id", txObj.ID(), "err", "blocked")
 			continue
 		}
+		delegator := txObj.Delegator()
+		if delegator != nil && (thor.IsOriginBlocked(*delegator) || p.blocklist.Contains(*delegator)) {
+			toRemove = append(toRemove, txObj)
+			logger.Trace("tx washed out", "id", txObj.ID(), "err", "blocked delegator")
+			continue
+		}
 
 		// out of lifetime
 		if !txObj.localSubmitted && now > txObj.timeAdded+int64(p.options.MaxLifetime) {