[GH-#83] Fees are now added to the coinbase transaction

Author: cheezus1

apps/aecore/lib/aecore/chain/chain_state.ex

@@ -80,24 +80,6 @@ defmodule Aecore.Chain.ChainState do
       Enum.all?()
   end
 
-  @spec add_fees_to_block_state(list(), map(), binary()) :: map()
-  def add_fees_to_block_state(txs, block_state, account) do
-    total_fees = List.foldl(txs, 0, fn(tx, acc) ->
-        acc + tx.data.fee
-      end)
-
-    cond do
-      !Map.has_key?(block_state, account) ->
-        Map.put(block_state, account, %{balance: total_fees, nonce: 0})
-
-      true ->
-        current_pubkey_block_state = Map.get(block_state, account)
-        new_pubkey_block_state = %{balance: current_pubkey_block_state.balance + total_fees,
-                                   nonce: current_pubkey_block_state.nonce}
-        Map.replace(block_state, account, new_pubkey_block_state)
-    end
-  end
-
   @spec update_block_state(map(), binary(), integer(), integer()) :: map()
   defp update_block_state(block_state, account, value, nonce) do
     block_state_filled_empty =

apps/aecore/lib/aecore/chain/worker.ex

@@ -100,8 +100,7 @@ defmodule Aecore.Chain.Worker do
     [prior_block | _] = chain
     pubkey = elem(Keys.pubkey(), 1)
     new_block_state = ChainState.calculate_block_state(b.txs)
-    new_block_state_with_fees = ChainState.add_fees_to_block_state(b.txs, new_block_state, pubkey)
-    new_chain_state = ChainState.calculate_chain_state(new_block_state_with_fees, prev_chain_state)
+    new_chain_state = ChainState.calculate_chain_state(new_block_state, prev_chain_state)
 
     try do
       BlockValidation.validate_block!(b, prior_block, new_chain_state)

apps/aecore/lib/aecore/miner/worker.ex

@@ -90,13 +90,13 @@ defmodule Aecore.Miner.Worker do
     {:next_state, :idle, data}
   end
 
-  def get_coinbase_transaction(to_acc) do
+  def get_coinbase_transaction(to_acc, total_fees) do
     tx_data = %TxData{
       from_acc: nil,
       to_acc: to_acc,
-      value: @coinbase_transaction_value,
+      value: @coinbase_transaction_value + total_fees,
       nonce: 0,
-      fee: 0
+      fee: total_fees
     }
 
     %SignedTx{data: tx_data, signature: nil}
@@ -119,13 +119,14 @@ defmodule Aecore.Miner.Worker do
 
     valid_txs = BlockValidation.filter_invalid_transactions_chainstate(ordered_txs_list, chain_state)
     {_, pubkey} = Keys.pubkey()
-    valid_txs = [get_coinbase_transaction(pubkey) | valid_txs]
+    total_fees = List.foldl(valid_txs, 0, fn(tx, acc) ->
+        acc + tx.data.fee
+      end)
+    valid_txs = [get_coinbase_transaction(pubkey, total_fees) | valid_txs]
     root_hash = BlockValidation.calculate_root_hash(valid_txs)
 
     new_block_state = ChainState.calculate_block_state(valid_txs)
-    new_block_state_with_fees = ChainState.add_fees_to_block_state(valid_txs, new_block_state, pubkey)
-
-    new_chain_state = ChainState.calculate_chain_state(new_block_state_with_fees, chain_state)
+    new_chain_state = ChainState.calculate_chain_state(new_block_state, chain_state)
     chain_state_hash = ChainState.calculate_chain_state_hash(new_chain_state)
 
     latest_block_hash = BlockValidation.block_header_hash(latest_block.header)

apps/aecore/lib/aecore/utils/blockchain/block_validation.ex

@@ -37,6 +37,7 @@ defmodule Aecore.Utils.Blockchain.BlockValidation do
         throw({:error, "One or more transactions not valid"})
 
       coinbase_transactions_sum > Miner.coinbase_transaction_value() ->
+        IO.puts(coinbase_transactions_sum)
         throw({:error, "Sum of coinbase transactions values exceeds the maximum coinbase transactions value"})
 
       new_block.header.chain_state_hash != chain_state_hash ->
@@ -150,7 +151,7 @@ defmodule Aecore.Utils.Blockchain.BlockValidation do
     block.txs
     |> Enum.map(
          fn tx -> cond do
-                    SignedTx.is_coinbase(tx) -> tx.data.value
+                    SignedTx.is_coinbase(tx) -> tx.data.value - tx.data.fee
                     true -> 0
                   end
          end