Merge branch 'master' into GH-88-rebase

# Conflicts:
#	apps/aecore/lib/aecore/miner/worker.ex

Author: thepiwo

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

@@ -18,7 +18,6 @@ defmodule Aecore.Chain.Worker do
     genesis_block_map = %{genesis_block_hash => Block.genesis_block()}
     genesis_chain_state = ChainState.calculate_block_state(Block.genesis_block().txs)
     latest_block_chain_state = %{genesis_block_hash => genesis_chain_state}
-    # latest_block_chain_state = genesis_chain_state
 
     initial_state = {genesis_block_map, latest_block_chain_state}
     GenServer.start_link(__MODULE__, initial_state, name: __MODULE__)

apps/aecore/lib/aecore/keys/worker.ex

@@ -9,6 +9,7 @@ defmodule Aecore.Keys.Worker do
 
   @filename_pub "key.pub"
   @filename_priv "key"
+  @pub_key_length 65
 
   def start_link() do
     GenServer.start_link(
@@ -123,19 +124,23 @@ defmodule Aecore.Keys.Worker do
       0
     }
   end
-
   def handle_call(
         {:verify, {term, signature, pub_key}},
         _from,
         %{algo: algo, digest: digest, curve: curve} = state
       ) do
-    result =
-      :crypto.verify(algo, digest, :erlang.term_to_binary(term), signature, [
-        pub_key,
-        :crypto.ec_curve(curve)
-      ])
+    case is_valid_pub_key(pub_key) do
+      true ->
+        result =
+          :crypto.verify(algo, digest, :erlang.term_to_binary(term), signature, [
+                pub_key,
+                :crypto.ec_curve(curve)
+              ])
 
-    {:reply, result, state}
+        {:reply, result, state}
+      false ->
+        {:reply, {:error, "Key length is not valid!"}, state}
+    end
   end
 
   def handle_call(
@@ -294,6 +299,11 @@ defmodule Aecore.Keys.Worker do
     pub
   end
 
+  defp is_valid_pub_key(pub_key_str) do
+    pub_key_str
+    |> byte_size() == @pub_key_length
+  end
+
   defp padding128(bin) do
     pad0 = 128 - :erlang.size(bin)
     pad1 = pad0 * 8

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

@@ -6,6 +6,7 @@ defmodule Aecore.Miner.Worker do
   alias Aecore.Utils.Blockchain.Difficulty
   alias Aecore.Structures.Header
   alias Aecore.Structures.Block
+  alias Aecore.Pow.Cuckoo
   alias Aecore.Keys.Worker, as: Keys
   alias Aecore.Structures.TxData
   alias Aecore.Structures.SignedTx
@@ -119,7 +120,7 @@ defmodule Aecore.Miner.Worker do
         blocks = Chain.get_blocks(latest_block_hash, 2)
         Enum.at(blocks, 1)
     end
-    
+
     BlockValidation.validate_block!(latest_block, previous_block, chain_state)
 
     valid_txs = BlockValidation.filter_invalid_transactions_chainstate(ordered_txs_list, chain_state)
@@ -146,8 +147,8 @@ defmodule Aecore.Miner.Worker do
         Block.current_block_version()
       )
     Logger.debug("start nonce #{start_nonce}. Final nonce = #{start_nonce + @nonce_per_cycle}")
-    case Aecore.Pow.Cuckoo.generate(%{unmined_header
-                                      | nonce: start_nonce + @nonce_per_cycle}) do
+    case Cuckoo.generate(%{unmined_header
+                           | nonce: start_nonce + @nonce_per_cycle}) do
       {:ok, mined_header} ->
         block = %Block{header: mined_header, txs: valid_txs}
         Chain.add_block(block)

apps/aecore/lib/aecore/txs/pool/worker.ex

@@ -45,7 +45,7 @@ defmodule Aecore.Txs.Pool.Worker do
       updated_pool = Map.put_new(tx_pool, :crypto.hash(:sha256, :erlang.term_to_binary(tx)), tx)
       case tx_pool == updated_pool do
         true -> Logger.info(" This transaction has already been added")
-        false -> Aecore.Peers.Worker.broadcast_tx(tx)
+        false -> Peers.broadcast_tx(tx)
       end
       {:reply, :ok, updated_pool}
     else

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

@@ -1,7 +1,7 @@
 defmodule Aecore.Utils.Blockchain.BlockValidation do
 
   alias Aecore.Keys.Worker, as: KeyManager
-  alias Aecore.Pow.Hashcash
+  alias Aecore.Pow.Cuckoo
   alias Aecore.Miner.Worker, as: Miner
   alias Aecore.Structures.Block
   alias Aecore.Structures.Header
@@ -15,7 +15,7 @@ defmodule Aecore.Utils.Blockchain.BlockValidation do
     chain_state_hash = ChainState.calculate_chain_state_hash(chain_state)
     is_valid_chain_state = ChainState.validate_chain_state(chain_state)
 
-    is_difficulty_target_met = Aecore.Pow.Cuckoo.verify(new_block.header)
+    is_difficulty_target_met = Cuckoo.verify(new_block.header)
     coinbase_transactions_sum = sum_coinbase_transactions(new_block)
 
     cond do

apps/aecore/lib/aecore/utils/serialization.ex

@@ -5,49 +5,36 @@ defmodule Aecore.Utils.Serialization do
 
   alias Aecore.Structures.Block
   alias Aecore.Structures.SignedTx
-  alias Aecore.Structures.TxData
 
   @spec block(%Block{}, :serialize | :deserialize) :: %Block{}
   def block(block, direction) do
     new_header = %{block.header |
       chain_state_hash: hex_binary(block.header.chain_state_hash, direction),
       prev_hash: hex_binary(block.header.prev_hash, direction),
       txs_hash: hex_binary(block.header.txs_hash, direction)}
-    new_txs = for tx <- block.txs do
-      from_acc = if(tx.data.from_acc != nil) do
-          hex_binary(tx.data_from_acc, direction)
-        else
-          nil
-        end
-      new_data = %{tx.data |
-        from_acc: from_acc,
-        to_acc: hex_binary(tx.data.to_acc, direction)}
-      new_signature = if(tx.signature != nil) do
-          hex_binary(tx.signature, direction)
-        else
-          nil
-        end
-      %SignedTx{data: new_data, signature: new_signature}
-    end
+    new_txs = Enum.map(block.txs, fn(tx) -> tx(tx,direction) end)
     %{block | header: new_header, txs: new_txs}
   end
 
-
   @spec tx(map(), :serialize | :deserialize) :: map() | {:error, term()}
   def tx(tx, direction) do
-       new_data = %{tx.data | 
-         from_acc: hex_binary(tx.data.from_acc, direction),
-         to_acc: hex_binary(tx.data.to_acc, direction)}
-       new_signature = hex_binary(tx.signature, direction)
-       %SignedTx{data: TxData.new(new_data), signature: new_signature}
+    new_data = %{tx.data |
+      from_acc: hex_binary(tx.data.from_acc, direction),
+      to_acc: hex_binary(tx.data.to_acc, direction)}
+    new_signature = hex_binary(tx.signature, direction)
+    %SignedTx{data: new_data, signature: new_signature}
   end
 
   def hex_binary(data, direction) do
-    case(direction) do
-      :serialize ->
-        Base.encode16(data)
-      :deserialize ->
-        Base.decode16!(data)
+    if(data != nil) do
+      case(direction) do
+        :serialize ->
+          Base.encode16(data)
+        :deserialize ->
+          Base.decode16!(data)
+      end
+    else
+      nil
     end
   end
 end

apps/aecore/test/aecore_keys_test.exs

@@ -22,4 +22,18 @@ defmodule AecoreKeysTest do
     {:ok, to_account} = Keys.pubkey()
     assert {:ok, _} = Keys.sign_tx(to_account, 5, Map.get(Chain.chain_state(), to_account, %{nonce: 0}).nonce + 1)
   end
+
+  test "check pubkey length" do
+    pub_key_str = "041A470AE9831B61D9951A10D49663419CE087DF1BD7DB06578971767F032D389CB283AD4DD4E3532F3A5F3C89B006092CB6CECE39CAC3B06C2CB6DF8B51C73675"
+    pub_key_bin = pub_key_str |> Base.decode16!()
+    assert false  == Keys.verify("", "", pub_key_bin)
+  end
+
+  test "wrong key verification" do
+    pub_key_str = "041A470AE9831B61D9951A10D49663419CE087DF1BD7DB06578971767F032D389CB283AD4DD4E3"
+    pub_key_bin = pub_key_str |> Base.decode16!()
+
+    assert {:error, _} = Keys.verify("", "", pub_key_bin)
+  end
+
 end

apps/aehttpclient/lib/client.ex

@@ -4,6 +4,8 @@ defmodule Aehttpclient.Client do
   """
 
   alias Aecore.Structures.Block
+  alias Aecore.Structures.SignedTx
+  alias Aecore.Structures.TxData
   alias Aecore.Peers.Worker, as: Peers
 
   @spec get_info(term()) :: {:ok, map()} | :error
@@ -27,10 +29,16 @@ defmodule Aehttpclient.Client do
     Enum.each(peers, fn{peer, _} -> Peers.add_peer(peer) end)
   end
 
+  @spec get_account_balance({term(), term()}) :: {:ok, map()} | :error
   def get_account_balance({uri,acc}) do
     get(uri <> "/balance/#{acc}", :balance)
   end
 
+  @spec get_account_txs({term(), term()}) :: {:ok, list()} | :error
+  def get_account_txs({uri,acc}) do
+    get(uri <> "/tx_pool/#{acc}", :acc_txs)
+  end
+
   def get(uri, identifier) do
     case(HTTPoison.get(uri)) do
       {:ok, %{body: body, status_code: 200}} ->
@@ -41,10 +49,12 @@ defmodule Aehttpclient.Client do
           :info ->
             response = Poison.decode!(body, keys: :atoms!)
             {:ok, response}
-          :peers ->
-            standard_response(body)
-          :balance ->
-            standard_response(body)
+          :acc_txs ->
+            response = Poison.decode!(body,
+              as: [%SignedTx{data: %TxData{}}], keys: :atoms!)
+            {:ok, response}
+          _ ->
+            json_response(body)
         end
       {:ok, %HTTPoison.Response{status_code: 404}} ->
         :error
@@ -62,7 +72,7 @@ defmodule Aehttpclient.Client do
         [{"Content-Type", "application/json"}]
   end
 
-  def standard_response(body) do
+  def json_response(body) do
     response = Poison.decode!(body)
     {:ok,response}
   end

apps/aehttpclient/test/aehttpclient_test.exs

@@ -2,4 +2,31 @@ defmodule AehttpclientTest do
 
   use ExUnit.Case
 
+  alias Aecore.Structures.Block
+  alias Aecore.Chain.Worker, as: Chain
+  alias Aecore.Txs.Pool.Worker, as: Pool
+  alias Aecore.Keys.Worker, as: Keys
+  alias Aehttpclient.Client
+
+  test "Client functions" do
+    account = Keys.pubkey() |> elem(1) |> Base.encode16()
+    add_txs_to_pool()
+    genesis_block = Block.genesis_block()
+    assert {:ok, _} = Client.get_info("localhost:4000")
+    assert {:ok, genesis_block} = Client.get_block({"localhost:4000",
+      "C061E48A6F7FB2634E0C012B168D41F4773A38BD9E5EA28E5BE7D04186127BA0"})
+    assert {:ok, _} = Client.get_peers("localhost:4000")
+    assert Enum.count(Client.get_account_txs({"localhost:4000", account})
+      |> elem(1)) == 2
+  end
+
+  def add_txs_to_pool() do
+    {:ok, to_account} = Keys.pubkey()
+    {:ok, tx1} = Keys.sign_tx(to_account, 5,
+                              Map.get(Chain.chain_state, to_account, %{nonce: 0}).nonce + 1)
+    {:ok, tx2} = Keys.sign_tx(to_account, 5,
+                              Map.get(Chain.chain_state, to_account, %{nonce: 0}).nonce + 1)
+    Pool.add_transaction(tx1)
+    Pool.add_transaction(tx2)
+  end
 end

apps/aehttpserver/web/controllers/new_tx_controller.ex

@@ -1,20 +1,14 @@
 defmodule Aehttpserver.NewTxController do
   use Aehttpserver.Web, :controller
 
-  alias Aecore.Structures.Block
-  alias Aecore.Structures.TxData
-  alias Aecore.Structures.SignedTx
-  alias Aecore.Chain.Worker, as: Chain
-  alias Aecore.Utils.Blockchain.BlockValidation
-  alias Aecore.Utils.Serialization 
-  alias Aecore.Keys.Worker, as: Keys
-
+  alias Aecore.Utils.Serialization
+  alias Aecore.Txs.Pool.Worker, as: Pool
 
   def new_tx(conn, _params) do
     conn.body_params["_json"]
     |> Poison.decode!([keys: :atoms])
     |> Serialization.tx(:deserialize)
-    |> Aecore.Txs.Pool.Worker.add_transaction()
+    |> Pool.add_transaction()
     json conn, %{:status => :new_tx_added}
   end
 end