Revert "Reset to main 16801958 and forbid the tx"

This reverts commit d0e1ed2.

Revert "Forbid all txns and reset block number to 21306000 on barnard"

This reverts commit 5a6816c.

Revert "cargo fmt"

This reverts commit 8e7d414.

Revert "testing blacklist"

This reverts commit 29845e9.

Revert "verifier: Verify if the block contain txn in blacklist"

This reverts commit 09d21fc.

Revert "miner: Excluded transactions from blacklisted addresses during create block template"

This reverts commit 7811626.

Author: sanlee42

chain/open-block/src/lib.rs

@@ -10,7 +10,6 @@ use starcoin_logger::prelude::*;
 use starcoin_state_api::{ChainStateReader, ChainStateWriter};
 use starcoin_statedb::ChainStateDB;
 use starcoin_storage::Store;
-use starcoin_types::block::BlockNumber;
 use starcoin_types::genesis_config::{ChainId, ConsensusStrategy};
 use starcoin_types::vm_error::KeptVMStatus;
 use starcoin_types::{
@@ -137,17 +136,9 @@ impl OpenedBlock {
     /// as the internal state may be corrupted.
     /// TODO: make the function can be called again even last call returns error.  
     pub fn push_txns(&mut self, user_txns: Vec<SignedUserTransaction>) -> Result<ExcludedTxns> {
-        let mut discard_txns: Vec<SignedUserTransaction> = Vec::new();
         let mut txns: Vec<_> = user_txns
-            .into_iter()
-            .filter(|txn| {
-                let is_blacklisted = AddressFilter::is_blacklisted(txn, self.block_number());
-                // Discard the txns send by the account in black list after a block number.
-                if is_blacklisted {
-                    discard_txns.push(txn.clone());
-                }
-                !is_blacklisted
-            })
+            .iter()
+            .cloned()
             .map(Transaction::UserTransaction)
             .collect();
 
@@ -174,6 +165,8 @@ impl OpenedBlock {
                 .map(|t| t.try_into().expect("user txn"))
                 .collect()
         };
+
+        let mut discard_txns: Vec<SignedUserTransaction> = Vec::new();
         debug_assert_eq!(txns.len(), txn_outputs.len());
         for (txn, output) in txns.into_iter().zip(txn_outputs.into_iter()) {
             let txn_hash = txn.id();
@@ -295,16 +288,3 @@ impl OpenedBlock {
         Ok(block_template)
     }
 }
-pub struct AddressFilter;
-//static BLACKLIST: [&str; 0] = [];
-impl AddressFilter {
-    const ACTIVATION_BLOCK_NUMBER: BlockNumber = 16801958;
-    pub fn is_blacklisted(_raw_txn: &SignedUserTransaction, block_number: BlockNumber) -> bool {
-        block_number > Self::ACTIVATION_BLOCK_NUMBER
-        /*&& BLACKLIST
-            .iter()
-            .map(|&s| AccountAddress::from_str(s).expect("account address decode must success"))
-            .any(|x| x == raw_txn.sender())
-        */
-    }
-}

chain/src/verifier/mod.rs

@@ -8,7 +8,6 @@ use starcoin_chain_api::{
 };
 use starcoin_consensus::{Consensus, ConsensusVerifyError};
 use starcoin_logger::prelude::debug;
-use starcoin_open_block::AddressFilter;
 use starcoin_types::block::{Block, BlockHeader, ALLOWED_FUTURE_BLOCKTIME};
 use std::{collections::HashSet, str::FromStr};
 
@@ -69,7 +68,6 @@ pub trait BlockVerifier {
         watch(CHAIN_WATCH_NAME, "n11");
         //verify header
         let new_block_header = new_block.header();
-        Self::verify_blacklisted_txns(&new_block)?;
         Self::verify_header(current_chain, new_block_header)?;
         watch(CHAIN_WATCH_NAME, "n12");
         StaticVerifier::verify_body_hash(&new_block)?;
@@ -84,18 +82,6 @@ pub trait BlockVerifier {
         Ok(VerifiedBlock(new_block))
     }
 
-    fn verify_blacklisted_txns(new_block: &Block) -> Result<()> {
-        let block_number = new_block.header().number();
-        for txn in new_block.transactions() {
-            verify_block!(
-                VerifyBlockField::Body,
-                !AddressFilter::is_blacklisted(txn, block_number),
-                "Invalid block: the sender of transaction in block must be not blacklisted"
-            );
-        }
-        Ok(())
-    }
-
     fn verify_uncles<R>(
         current_chain: &R,
         uncles: &[BlockHeader],