rebase to 33a592ee522bf2947a87d1015994947af016b7cd

src/block_template.cpp

@@ -268,6 +268,9 @@ void BlockTemplate::update(const MinerData& data, const Mempool& mempool, Wallet
 
 	m_blockHeaderSize = m_blockHeader.size();
 
+	// Fill in m_txinGenHeight here so get_shares() can use it to calculate the correct PPLNS window
+	m_poolBlockTemplate->m_txinGenHeight = data.height; 
+
 	const int sidechain_version = m_poolBlockTemplate->get_sidechain_version();
 
 	if (sidechain_version <= 1) {

src/p2pool.cpp

@@ -572,7 +572,7 @@ void p2pool::submit_block() const
 	request.append("\"]}");
 
 	JSONRPCRequest::call(m_params->m_host, m_params->m_rpcPort, request, m_params->m_rpcLogin, m_params->m_socks5Proxy,
-		[height, diff, template_id, nonce, extra_nonce, &sidechain_id, is_external](const char* data, size_t size)
+		[height, diff, template_id, nonce, extra_nonce, sidechain_id, is_external](const char* data, size_t size)
 		{
 			rapidjson::Document doc;
 			if (doc.Parse<rapidjson::kParseCommentsFlag | rapidjson::kParseTrailingCommasFlag>(data, size).HasParseError() || !doc.IsObject()) {

src/pool_block.cpp

@@ -397,9 +397,7 @@ uint32_t PoolBlock::signal_v2_readiness(uint32_t extra_nonce)
 {
 	const uint64_t ts = (SideChain::network_type() == NetworkType::Mainnet) ? VERSION2_MAINNET_TIMESTAMP : VERSION2_TESTNET_TIMESTAMP;
 	if (time(nullptr) < static_cast<int64_t>(ts)) {
-		extra_nonce |= 0xFF000000UL;
-		extra_nonce &= ~0x00100000UL;
-		return extra_nonce;
+		return (extra_nonce & 0x007FFFFFUL) | 0xFF000000UL;
 	}
 	return extra_nonce;
 }

src/stratum_server.cpp

@@ -828,12 +828,19 @@ void StratumServer::update_hashrate_data(uint64_t hashes, uint64_t timestamp)
 void StratumServer::on_share_found(uv_work_t* req)
 {
 	SubmittedShare* share = reinterpret_cast<SubmittedShare*>(req->data);
+	StratumServer* server = share->m_server;
+
+	if (server->is_banned(share->m_clientAddr)) {
+		share->m_highEnoughDifficulty = false;
+		share->m_result = SubmittedShare::Result::BANNED;
+		return;
+	}
+	
 	if (share->m_highEnoughDifficulty) {
 		BACKGROUND_JOB_START(StratumServer::on_share_found);
 	}
 
 	StratumClient* client = share->m_client;
-	StratumServer* server = share->m_server;
 	p2pool* pool = server->m_pool;
 
 	const uint64_t target = share->m_target;