diff --git a/apps/aecore/lib/aecore/chain/worker.ex b/apps/aecore/lib/aecore/chain/worker.ex index 49e629b8..957586fe 100644 --- a/apps/aecore/lib/aecore/chain/worker.ex +++ b/apps/aecore/lib/aecore/chain/worker.ex @@ -9,6 +9,7 @@ defmodule Aecore.Chain.Worker do alias Aecore.Chain.ChainState alias Aecore.Utils.Blockchain.BlockValidation alias Aecore.Utils.Blockchain.Difficulty + alias Aecore.Txs.Pool.Worker, as: Pool use GenServer @@ -85,6 +86,7 @@ defmodule Aecore.Chain.Worker do try do BlockValidation.validate_block!(b, prior_block, new_chain_state) + Enum.each(b.txs, fn(tx) -> Pool.remove_transaction(tx) end) total_tokens = ChainState.calculate_total_tokens(new_chain_state) Logger.info(fn -> "Added block ##{b.header.height} with hash #{b.header diff --git a/apps/aecore/lib/aecore/miner/worker.ex b/apps/aecore/lib/aecore/miner/worker.ex index 36bb5203..b3329d56 100644 --- a/apps/aecore/lib/aecore/miner/worker.ex +++ b/apps/aecore/lib/aecore/miner/worker.ex @@ -107,7 +107,7 @@ defmodule Aecore.Miner.Worker do defp mine_next_block() do chain_state = Chain.chain_state() - txs_list = Map.values(Pool.get_and_empty_pool()) + txs_list = Map.values(Pool.get_pool()) blocks_for_difficulty_calculation = Chain.get_blocks_for_difficulty_calculation() {latest_block, previous_block} = Chain.get_prior_blocks_for_validity_check() diff --git a/config/config.exs b/config/config.exs index 170712ab..5cf96fd4 100644 --- a/config/config.exs +++ b/config/config.exs @@ -18,7 +18,8 @@ config :aecore, :keys, config :logger, compile_time_purge_level: :info, - backends: [{LoggerFileBackend, :info}, + backends: [:console, + {LoggerFileBackend, :info}, {LoggerFileBackend, :error}] config :logger, :info,