From 8ee09773602c47b5ae026a0c7750534fbe1f63ad Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Sun, 25 Nov 2018 14:26:03 +0300 Subject: [PATCH 1/3] bump ex_rlp version to 0.4.0 --- apps/blockchain/mix.exs | 2 +- apps/evm/mix.exs | 2 +- apps/ex_wire/mix.exs | 2 +- apps/merkle_patricia_tree/mix.exs | 2 +- mix.exs | 5 +++-- mix.lock | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/blockchain/mix.exs b/apps/blockchain/mix.exs index 568a949e6..88f0ccafd 100644 --- a/apps/blockchain/mix.exs +++ b/apps/blockchain/mix.exs @@ -52,7 +52,7 @@ defmodule Blockchain.Mixfile do [ {:ethereumex, "~> 0.5.0"}, {:evm, in_umbrella: true}, - {:ex_rlp, "~> 0.3.1"}, + {:ex_rlp, "~> 0.4.0"}, {:exth_crypto, in_umbrella: true}, {:merkle_patricia_tree, in_umbrella: true} ] diff --git a/apps/evm/mix.exs b/apps/evm/mix.exs index c8ccfc37a..b76332382 100644 --- a/apps/evm/mix.exs +++ b/apps/evm/mix.exs @@ -49,7 +49,7 @@ defmodule EVM.Mixfile do {:decimal, "~>1.5.0"}, {:merkle_patricia_tree, in_umbrella: true}, {:exth_crypto, in_umbrella: true}, - {:ex_rlp, "~> 0.3.1"}, + {:ex_rlp, "~> 0.4.0"}, {:jason, "~> 1.1", test: true}, {:bn, "~> 0.2.1"} ] diff --git a/apps/ex_wire/mix.exs b/apps/ex_wire/mix.exs index 61fb50179..7adcc48bf 100644 --- a/apps/ex_wire/mix.exs +++ b/apps/ex_wire/mix.exs @@ -33,7 +33,7 @@ defmodule ExWire.Mixfile do defp deps do [ {:ex_doc, "~> 0.16", only: :dev, runtime: false}, - {:ex_rlp, "~> 0.3.1"}, + {:ex_rlp, "~> 0.4.0"}, {:blockchain, in_umbrella: true}, {:exth_crypto, in_umbrella: true}, {:evm, in_umbrella: true} diff --git a/apps/merkle_patricia_tree/mix.exs b/apps/merkle_patricia_tree/mix.exs index 0d7a285aa..cfd31fb71 100644 --- a/apps/merkle_patricia_tree/mix.exs +++ b/apps/merkle_patricia_tree/mix.exs @@ -48,7 +48,7 @@ defmodule MerklePatriciaTree.Mixfile do # defp deps do [ - {:ex_rlp, "~> 0.3.1"}, + {:ex_rlp, "~> 0.4.0"}, {:exth_crypto, in_umbrella: true}, {:rocksdb, "~> 0.23.2"} ] diff --git a/mix.exs b/mix.exs index 48324029f..652166130 100644 --- a/mix.exs +++ b/mix.exs @@ -32,14 +32,15 @@ defmodule Mana.MixProject do # Run "mix help deps" for examples and options. defp deps do [ - {:ex_rlp, "~> 0.3.1"}, + {:ex_rlp, "~> 0.4.0"}, {:ex_doc, "~> 0.19", only: :dev, runtime: false}, {:dialyxir, "~> 1.0.0-rc.4", only: [:dev, :test], runtime: false}, {:ethereumex, "~> 0.5.1"}, {:jason, "~> 1.1"}, {:credo, "~> 1.0.0-rc1", only: [:dev, :test], runtime: false}, {:distillery, "~> 2.0", runtime: false}, - {:artificery, github: "mana-ethereum/artificery", branch: "hayesgm/allow-extra-args", override: true} + {:artificery, + github: "mana-ethereum/artificery", branch: "hayesgm/allow-extra-args", override: true} ] end end diff --git a/mix.lock b/mix.lock index dca756733..345585771 100644 --- a/mix.lock +++ b/mix.lock @@ -14,7 +14,7 @@ "erlex": {:hex, :erlex, "0.1.6", "c01c889363168d3fdd23f4211647d8a34c0f9a21ec726762312e08e083f3d47e", [:mix], [], "hexpm"}, "ethereumex": {:hex, :ethereumex, "0.5.1", "19eb53224dedb3a8275dc71ab2a0223a301dcae136de3dcddcebbd26dcf8ce0b", [:mix], [{:httpoison, "~> 1.4.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5.1", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm"}, "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"}, - "ex_rlp": {:hex, :ex_rlp, "0.3.1", "190554f7b26f79734fc5a772241eec14a71b2e83576e43f451479feb017013e9", [:mix], [], "hexpm"}, + "ex_rlp": {:hex, :ex_rlp, "0.4.0", "bd76fa4bf2a20851bddf1797384d6d363b90cda60ff0c9366653af4b335d59dd", [:mix], [], "hexpm"}, "hackney": {:hex, :hackney, "1.14.3", "b5f6f5dcc4f1fba340762738759209e21914516df6be440d85772542d4a5e412", [:rebar3], [{:certifi, "2.4.2", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"}, "httpoison": {:hex, :httpoison, "1.4.0", "e0b3c2ad6fa573134e42194d13e925acfa8f89d138bc621ffb7b1989e6d22e73", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"}, "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"}, From 1ba2b55cb5a4a7a2046cba060ab2966b0f3b3e3d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Mon, 26 Nov 2018 22:24:34 +0300 Subject: [PATCH 2/3] use patched ex_rlp branch --- apps/blockchain/mix.exs | 2 +- apps/evm/mix.exs | 2 +- apps/ex_wire/mix.exs | 2 +- apps/merkle_patricia_tree/mix.exs | 2 +- mix.exs | 2 +- mix.lock | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/blockchain/mix.exs b/apps/blockchain/mix.exs index 88f0ccafd..17863c9a9 100644 --- a/apps/blockchain/mix.exs +++ b/apps/blockchain/mix.exs @@ -52,7 +52,7 @@ defmodule Blockchain.Mixfile do [ {:ethereumex, "~> 0.5.0"}, {:evm, in_umbrella: true}, - {:ex_rlp, "~> 0.4.0"}, + {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, {:exth_crypto, in_umbrella: true}, {:merkle_patricia_tree, in_umbrella: true} ] diff --git a/apps/evm/mix.exs b/apps/evm/mix.exs index b76332382..68cc9ec45 100644 --- a/apps/evm/mix.exs +++ b/apps/evm/mix.exs @@ -49,7 +49,7 @@ defmodule EVM.Mixfile do {:decimal, "~>1.5.0"}, {:merkle_patricia_tree, in_umbrella: true}, {:exth_crypto, in_umbrella: true}, - {:ex_rlp, "~> 0.4.0"}, + {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, {:jason, "~> 1.1", test: true}, {:bn, "~> 0.2.1"} ] diff --git a/apps/ex_wire/mix.exs b/apps/ex_wire/mix.exs index 7adcc48bf..569665ea5 100644 --- a/apps/ex_wire/mix.exs +++ b/apps/ex_wire/mix.exs @@ -33,7 +33,7 @@ defmodule ExWire.Mixfile do defp deps do [ {:ex_doc, "~> 0.16", only: :dev, runtime: false}, - {:ex_rlp, "~> 0.4.0"}, + {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, {:blockchain, in_umbrella: true}, {:exth_crypto, in_umbrella: true}, {:evm, in_umbrella: true} diff --git a/apps/merkle_patricia_tree/mix.exs b/apps/merkle_patricia_tree/mix.exs index cfd31fb71..e40069683 100644 --- a/apps/merkle_patricia_tree/mix.exs +++ b/apps/merkle_patricia_tree/mix.exs @@ -48,7 +48,7 @@ defmodule MerklePatriciaTree.Mixfile do # defp deps do [ - {:ex_rlp, "~> 0.4.0"}, + {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, {:exth_crypto, in_umbrella: true}, {:rocksdb, "~> 0.23.2"} ] diff --git a/mix.exs b/mix.exs index 652166130..e0a46d994 100644 --- a/mix.exs +++ b/mix.exs @@ -32,7 +32,7 @@ defmodule Mana.MixProject do # Run "mix help deps" for examples and options. defp deps do [ - {:ex_rlp, "~> 0.4.0"}, + {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, {:ex_doc, "~> 0.19", only: :dev, runtime: false}, {:dialyxir, "~> 1.0.0-rc.4", only: [:dev, :test], runtime: false}, {:ethereumex, "~> 0.5.1"}, diff --git a/mix.lock b/mix.lock index 345585771..1aa05f638 100644 --- a/mix.lock +++ b/mix.lock @@ -14,7 +14,7 @@ "erlex": {:hex, :erlex, "0.1.6", "c01c889363168d3fdd23f4211647d8a34c0f9a21ec726762312e08e083f3d47e", [:mix], [], "hexpm"}, "ethereumex": {:hex, :ethereumex, "0.5.1", "19eb53224dedb3a8275dc71ab2a0223a301dcae136de3dcddcebbd26dcf8ce0b", [:mix], [{:httpoison, "~> 1.4.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5.1", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm"}, "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"}, - "ex_rlp": {:hex, :ex_rlp, "0.4.0", "bd76fa4bf2a20851bddf1797384d6d363b90cda60ff0c9366653af4b335d59dd", [:mix], [], "hexpm"}, + "ex_rlp": {:git, "https://github.com/mana-ethereum/ex_rlp", "2b84119b6d6bf5920dfcd359a402fedb9fc79bf9", [branch: "ab-fix-decoding"]}, "hackney": {:hex, :hackney, "1.14.3", "b5f6f5dcc4f1fba340762738759209e21914516df6be440d85772542d4a5e412", [:rebar3], [{:certifi, "2.4.2", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"}, "httpoison": {:hex, :httpoison, "1.4.0", "e0b3c2ad6fa573134e42194d13e925acfa8f89d138bc621ffb7b1989e6d22e73", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"}, "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"}, From 030bb1af4d5c886c5c5b83375d6d0c00faf2ae1d Mon Sep 17 00:00:00 2001 From: Ayrat Badykov Date: Tue, 27 Nov 2018 20:17:41 +0300 Subject: [PATCH 3/3] use ex_rlp version from hex.pm --- apps/blockchain/mix.exs | 2 +- apps/evm/mix.exs | 2 +- apps/ex_wire/mix.exs | 2 +- apps/merkle_patricia_tree/mix.exs | 2 +- mix.exs | 2 +- mix.lock | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/blockchain/mix.exs b/apps/blockchain/mix.exs index 17863c9a9..516bc7a7d 100644 --- a/apps/blockchain/mix.exs +++ b/apps/blockchain/mix.exs @@ -52,7 +52,7 @@ defmodule Blockchain.Mixfile do [ {:ethereumex, "~> 0.5.0"}, {:evm, in_umbrella: true}, - {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, + {:ex_rlp, "~> 0.4.1"}, {:exth_crypto, in_umbrella: true}, {:merkle_patricia_tree, in_umbrella: true} ] diff --git a/apps/evm/mix.exs b/apps/evm/mix.exs index 68cc9ec45..5dfc3e8f0 100644 --- a/apps/evm/mix.exs +++ b/apps/evm/mix.exs @@ -49,7 +49,7 @@ defmodule EVM.Mixfile do {:decimal, "~>1.5.0"}, {:merkle_patricia_tree, in_umbrella: true}, {:exth_crypto, in_umbrella: true}, - {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, + {:ex_rlp, "~> 0.4.1"}, {:jason, "~> 1.1", test: true}, {:bn, "~> 0.2.1"} ] diff --git a/apps/ex_wire/mix.exs b/apps/ex_wire/mix.exs index 569665ea5..24fa0c087 100644 --- a/apps/ex_wire/mix.exs +++ b/apps/ex_wire/mix.exs @@ -33,7 +33,7 @@ defmodule ExWire.Mixfile do defp deps do [ {:ex_doc, "~> 0.16", only: :dev, runtime: false}, - {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, + {:ex_rlp, "~> 0.4.1"}, {:blockchain, in_umbrella: true}, {:exth_crypto, in_umbrella: true}, {:evm, in_umbrella: true} diff --git a/apps/merkle_patricia_tree/mix.exs b/apps/merkle_patricia_tree/mix.exs index e40069683..22c701e31 100644 --- a/apps/merkle_patricia_tree/mix.exs +++ b/apps/merkle_patricia_tree/mix.exs @@ -48,7 +48,7 @@ defmodule MerklePatriciaTree.Mixfile do # defp deps do [ - {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, + {:ex_rlp, "~> 0.4.1"}, {:exth_crypto, in_umbrella: true}, {:rocksdb, "~> 0.23.2"} ] diff --git a/mix.exs b/mix.exs index e0a46d994..66f03557d 100644 --- a/mix.exs +++ b/mix.exs @@ -32,7 +32,7 @@ defmodule Mana.MixProject do # Run "mix help deps" for examples and options. defp deps do [ - {:ex_rlp, git: "https://github.com/mana-ethereum/ex_rlp", branch: "ab-fix-decoding"}, + {:ex_rlp, "~> 0.4.1"}, {:ex_doc, "~> 0.19", only: :dev, runtime: false}, {:dialyxir, "~> 1.0.0-rc.4", only: [:dev, :test], runtime: false}, {:ethereumex, "~> 0.5.1"}, diff --git a/mix.lock b/mix.lock index 1aa05f638..99f71e140 100644 --- a/mix.lock +++ b/mix.lock @@ -14,7 +14,7 @@ "erlex": {:hex, :erlex, "0.1.6", "c01c889363168d3fdd23f4211647d8a34c0f9a21ec726762312e08e083f3d47e", [:mix], [], "hexpm"}, "ethereumex": {:hex, :ethereumex, "0.5.1", "19eb53224dedb3a8275dc71ab2a0223a301dcae136de3dcddcebbd26dcf8ce0b", [:mix], [{:httpoison, "~> 1.4.0", [hex: :httpoison, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:poolboy, "~> 1.5.1", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm"}, "ex_doc": {:hex, :ex_doc, "0.19.1", "519bb9c19526ca51d326c060cb1778d4a9056b190086a8c6c115828eaccea6cf", [:mix], [{:earmark, "~> 1.1", [hex: :earmark, repo: "hexpm", optional: false]}, {:makeup_elixir, "~> 0.7", [hex: :makeup_elixir, repo: "hexpm", optional: false]}], "hexpm"}, - "ex_rlp": {:git, "https://github.com/mana-ethereum/ex_rlp", "2b84119b6d6bf5920dfcd359a402fedb9fc79bf9", [branch: "ab-fix-decoding"]}, + "ex_rlp": {:hex, :ex_rlp, "0.4.1", "a99083923e61e5687e9635367e9ba242103ce25646a008564c2f4e02c5e4d9b8", [:mix], [], "hexpm"}, "hackney": {:hex, :hackney, "1.14.3", "b5f6f5dcc4f1fba340762738759209e21914516df6be440d85772542d4a5e412", [:rebar3], [{:certifi, "2.4.2", [hex: :certifi, repo: "hexpm", optional: false]}, {:idna, "6.0.0", [hex: :idna, repo: "hexpm", optional: false]}, {:metrics, "1.0.1", [hex: :metrics, repo: "hexpm", optional: false]}, {:mimerl, "1.0.2", [hex: :mimerl, repo: "hexpm", optional: false]}, {:ssl_verify_fun, "1.1.4", [hex: :ssl_verify_fun, repo: "hexpm", optional: false]}], "hexpm"}, "httpoison": {:hex, :httpoison, "1.4.0", "e0b3c2ad6fa573134e42194d13e925acfa8f89d138bc621ffb7b1989e6d22e73", [:mix], [{:hackney, "~> 1.8", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm"}, "idna": {:hex, :idna, "6.0.0", "689c46cbcdf3524c44d5f3dde8001f364cd7608a99556d8fbd8239a5798d4c10", [:rebar3], [{:unicode_util_compat, "0.4.1", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm"},