diff --git a/config/dev.exs b/config/dev.exs index 69cadee..d2d855e 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -1,3 +1 @@ use Mix.Config - -config :ethereumex, scheme: "http", host: "localhost", port: 8545 diff --git a/config/test.exs b/config/test.exs index 3272734..d2d855e 100644 --- a/config/test.exs +++ b/config/test.exs @@ -1,3 +1 @@ use Mix.Config - -config :ethereumex, scheme: "https", host: "localhost", port: 8545 diff --git a/lib/eth.ex b/lib/eth.ex index 80b831c..4e17e51 100644 --- a/lib/eth.ex +++ b/lib/eth.ex @@ -13,9 +13,7 @@ defmodule ETH do 46080211 """ - Application.put_env(:ethereumex, :scheme, Application.get_env(:eth, :scheme, "http")) - Application.put_env(:ethereumex, :host, Application.get_env(:eth, :host, "localhost")) - Application.put_env(:ethereumex, :port, Application.get_env(:eth, :port, 8545)) + Application.put_env(:ethereumex, :url, Application.get_env(:eth, :url, "http://localhost:8545")) defdelegate block_number, to: ETH.Query defdelegate block_number!, to: ETH.Query diff --git a/lib/eth/transaction/signer.ex b/lib/eth/transaction/signer.ex index 61b1e64..c6e94db 100644 --- a/lib/eth/transaction/signer.ex +++ b/lib/eth/transaction/signer.ex @@ -73,7 +73,8 @@ defmodule ETH.Transaction.Signer do _s ], <> - ) when is_map(transaction_list) do + ) + when is_map(transaction_list) do sign_transaction_list(transaction_list, private_key) end @@ -90,7 +91,8 @@ defmodule ETH.Transaction.Signer do _s ], <> - ) when is_list(transaction_list) do + ) + when is_list(transaction_list) do decoded_private_key = Base.decode16!(encoded_private_key, case: :mixed) sign_transaction_list(transaction_list, decoded_private_key) end diff --git a/mix.exs b/mix.exs index c3ef70e..e16894a 100644 --- a/mix.exs +++ b/mix.exs @@ -4,8 +4,8 @@ defmodule Eth.Mixfile do def project do [ app: :eth, - version: "0.3.1", - elixir: "~> 1.5", + version: "0.3.2", + elixir: "~> 1.6", start_permanent: Mix.env() == :prod, deps: deps(), package: package(), @@ -23,7 +23,7 @@ defmodule Eth.Mixfile do # Run "mix help deps" to learn about dependencies. defp deps do [ - {:ethereumex, "~> 0.2.1"}, + {:ethereumex, "~> 0.3.0"}, {:ex_rlp, "~> 0.2.1"}, {:ex_doc, ">= 0.0.0", only: :dev}, {:dialyxir, "~> 0.5.1", only: [:dev], runtime: false}, diff --git a/mix.lock b/mix.lock index a9611e3..160416f 100644 --- a/mix.lock +++ b/mix.lock @@ -2,10 +2,10 @@ "certifi": {:hex, :certifi, "2.0.0", "a0c0e475107135f76b8c1d5bc7efb33cd3815cb3cf3dea7aefdd174dabead064", [:rebar3], []}, "dialyxir": {:hex, :dialyxir, "0.5.1", "b331b091720fd93e878137add264bac4f644e1ddae07a70bf7062c7862c4b952", [:mix], []}, "earmark": {:hex, :earmark, "1.2.3", "206eb2e2ac1a794aa5256f3982de7a76bf4579ff91cb28d0e17ea2c9491e46a4", [:mix], []}, - "ethereumex": {:hex, :ethereumex, "0.2.1", "7d7156bd933517bf73c89ebc40a3e3cb1cc186318cef4250bd9ce1a88f082a10", [:mix], [{:httpoison, "~> 1.0.0", [hex: :httpoison, optional: false]}, {:poison, "~> 3.1.0", [hex: :poison, optional: false]}]}, + "ethereumex": {:hex, :ethereumex, "0.3.0", "9d5e25dc2f9ed357f9f7f2a49e09b608b41a56283c20f50e896a11af225cc723", [:mix], [{:httpoison, "~> 1.0.0", [hex: :httpoison, optional: false]}, {:poison, "~> 3.1.0", [hex: :poison, optional: false]}]}, "ex_doc": {:hex, :ex_doc, "0.16.3", "cd2a4cfe5d26e37502d3ec776702c72efa1adfa24ed9ce723bb565f4c30bd31a", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, optional: false]}]}, "ex_rlp": {:hex, :ex_rlp, "0.2.1", "bd320900d6316cdfe01d365d4bda22eb2f39b359798daeeffd3bd1ca7ba958ec", [:mix], []}, - "hackney": {:hex, :hackney, "1.10.1", "c38d0ca52ea80254936a32c45bb7eb414e7a96a521b4ce76d00a69753b157f21", [:rebar3], [{:certifi, "2.0.0", [hex: :certifi, optional: false]}, {:idna, "5.1.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]}, + "hackney": {:hex, :hackney, "1.11.0", "4951ee019df102492dabba66a09e305f61919a8a183a7860236c0fde586134b6", [:rebar3], [{:certifi, "2.0.0", [hex: :certifi, optional: false]}, {:idna, "5.1.0", [hex: :idna, optional: false]}, {:metrics, "1.0.1", [hex: :metrics, optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, optional: false]}, {:ssl_verify_fun, "1.1.1", [hex: :ssl_verify_fun, optional: false]}]}, "hex_prefix": {:hex, :hex_prefix, "0.1.0", "e96b5cbb6ad8493196ce193726240023f5ce0ae0753118a19a5b43e2db0267ca", [:mix], []}, "hexate": {:hex, :hexate, "0.6.1", "1cea42e462c1daa32223127d4752e71016c3d933d492b9bb7fa4709a4a0fd50d", [:mix], []}, "httpoison": {:hex, :httpoison, "1.0.0", "1f02f827148d945d40b24f0b0a89afe40bfe037171a6cf70f2486976d86921cd", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, optional: false]}]},