M api/txspool.go → api/txspool.go

@@ -179,7 +179,7 @@ }
 	// Get public key
 	account, err := a.h.GetCommonAccountAPI(poolTx.FromIdx)
 	if err != nil {
-		return tracerr.Wrap(err)
+		return tracerr.Wrap(fmt.Errorf("Error getting from account: %w", err))
 	}
 	// Validate TokenID
 	if poolTx.TokenID != account.TokenID {

M db/historydb/apiqueries.go → db/historydb/apiqueries.go

@@ -1129,7 +1129,6 @@ if nBatches == 0 { // Avoid dividing by 0
 		nBatches++
 	}
 	if (p.ToBatchNum - p.FromBatchNum) > 0 {
-		fmt.Printf("DBG ntxs: %v, nBatches: %v\n", nTxs, nBatches)
 		metrics.TransactionsPerBatch = float64(nTxs) /
 			float64(nBatches)
 	} else {

M db/l2db/apiqueries.go → db/l2db/apiqueries.go

@@ -80,7 +80,7 @@
 	q := fmt.Sprintf(
 		`INSERT INTO tx_pool (%s)
 		SELECT %s
-		WHERE (SELECT COUNT(*) FROM tx_pool WHERE state = $%v) < $%v;`,
+		WHERE (SELECT COUNT(*) FROM tx_pool WHERE state = $%v AND NOT external_delete) < $%v;`,
 		namesPart, valuesPart,
 		len(values)+1, len(values)+2) //nolint:gomnd
 	values = append(values, common.PoolL2TxStatePending, l2db.maxTxs)

M db/l2db/l2db.go → db/l2db/l2db.go

@@ -204,7 +204,7 @@ func (l2db *L2DB) GetPendingTxs() ([]common.PoolL2Tx, error) {
 	var txs []*common.PoolL2Tx
 	err := meddler.QueryAll(
 		l2db.dbRead, &txs,
-		selectPoolTxCommon+"WHERE state = $1",
+		selectPoolTxCommon+"WHERE state = $1 AND NOT external_delete;",
 		common.PoolL2TxStatePending,
 	)
 	return db.SlicePtrsToSlice(txs).([]common.PoolL2Tx), tracerr.Wrap(err)