From bfe4f33c24e66edc950d520c2ff7e51715ed566b Mon Sep 17 00:00:00 2001
From: Shaopeng Wang <spxwang@gmail.com>
Date: Mon, 30 Mar 2020 14:16:46 +1300
Subject: [PATCH] Upgrade substrate (#130)

* Upgrade substrate to alpha 5.

* Upgrade serde & codec.
---
 auction/Cargo.toml                | 16 ++++++++--------
 currencies/Cargo.toml             | 18 +++++++++---------
 gradually-update/Cargo.toml       | 14 +++++++-------
 oracle/Cargo.toml                 | 18 +++++++++---------
 oracle/rpc/Cargo.toml             |  6 +++---
 oracle/rpc/runtime-api/Cargo.toml |  2 +-
 prices/Cargo.toml                 | 14 +++++++-------
 schedule-update/Cargo.toml        | 16 ++++++++--------
 tokens/Cargo.toml                 | 16 ++++++++--------
 traits/Cargo.toml                 | 14 +++++++-------
 utilities/Cargo.toml              | 16 ++++++++--------
 utilities/src/linked_item.rs      |  2 +-
 vesting/Cargo.toml                | 18 +++++++++---------
 13 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/auction/Cargo.toml b/auction/Cargo.toml
index 7bf672d..8b5cbd5 100644
--- a/auction/Cargo.toml
+++ b/auction/Cargo.toml
@@ -5,20 +5,20 @@ authors = ["Acala Developers"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
-runtime-io = { package = "sp-io", version = "2.0.0-alpha.3", default-features = false }
-rstd = { package = "sp-std", version = "2.0.0-alpha.3", default-features = false }
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
+runtime-io = { package = "sp-io", version = "2.0.0-alpha.5", default-features = false }
+rstd = { package = "sp-std", version = "2.0.0-alpha.5", default-features = false }
 
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
 
 orml-traits = { path = "../traits", default-features = false }
 orml-utilities = { path = "../utilities", default-features = false }
 
 [dev-dependencies]
-primitives = { package = "sp-core",  version = "2.0.0-alpha.3", default-features = false }
+primitives = { package = "sp-core",  version = "2.0.0-alpha.5", default-features = false }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
index cd790d8..8defe5d 100644
--- a/currencies/Cargo.toml
+++ b/currencies/Cargo.toml
@@ -5,20 +5,20 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
-runtime-io = { package = "sp-io", version = "2.0.0-alpha.3", default-features = false }
-rstd = { package = "sp-std", version = "2.0.0-alpha.3", default-features = false }
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
+runtime-io = { package = "sp-io", version = "2.0.0-alpha.5", default-features = false }
+rstd = { package = "sp-std", version = "2.0.0-alpha.5", default-features = false }
 
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
 
 orml-traits = { path = "../traits", default-features = false }
 
 [dev-dependencies]
-primitives = { package = "sp-core",  version = "2.0.0-alpha.3", default-features = false }
-pallet-balances = { package = "pallet-balances", version = "2.0.0-alpha.3" }
+primitives = { package = "sp-core", version = "2.0.0-alpha.5", default-features = false }
+pallet-balances = { package = "pallet-balances", version = "2.0.0-alpha.5" }
 tokens = { package = "orml-tokens", path = "../tokens" }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml
index b25fc84..6d53ae6 100644
--- a/gradually-update/Cargo.toml
+++ b/gradually-update/Cargo.toml
@@ -5,14 +5,14 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
 
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
-sp-io = { version = "2.0.0-alpha.3", default-features = false }
-sp-std = { version = "2.0.0-alpha.3", default-features = false }
-sp-core = { version = "2.0.0-alpha.3", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
+sp-io = { version = "2.0.0-alpha.5", default-features = false }
+sp-std = { version = "2.0.0-alpha.5", default-features = false }
+sp-core = { version = "2.0.0-alpha.5", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
 
 [dev-dependencies]
 orml-utilities = { path = "../utilities", default-features = false }
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
index a256fa1..348fbd1 100644
--- a/oracle/Cargo.toml
+++ b/oracle/Cargo.toml
@@ -5,21 +5,21 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
-runtime-io = { package = "sp-io", version = "2.0.0-alpha.3", default-features = false }
-sp-std = { version = "2.0.0-alpha.3", default-features = false }
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
+runtime-io = { package = "sp-io", version = "2.0.0-alpha.5", default-features = false }
+sp-std = { version = "2.0.0-alpha.5", default-features = false }
 
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
 
 orml-traits = { path = "../traits", default-features = false }
 orml-utilities = { path = "../utilities", default-features = false }
 
 [dev-dependencies]
-primitives = { version = "2.0.0-alpha.3", package = "sp-core", default-features = false }
-pallet-timestamp = { version = "2.0.0-alpha.3" }
+primitives = { version = "2.0.0-alpha.5", package = "sp-core", default-features = false }
+pallet-timestamp = { version = "2.0.0-alpha.5" }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml
index 639d7c4..ac917f5 100644
--- a/oracle/rpc/Cargo.toml
+++ b/oracle/rpc/Cargo.toml
@@ -9,7 +9,7 @@ codec = { package = "parity-scale-codec", version = "1.2.0" }
 jsonrpc-core = "14.0.3"
 jsonrpc-core-client = "14.0.3"
 jsonrpc-derive = "14.0.3"
-sp-runtime = { version = "2.0.0-alpha.3" }
-sp-api = { version = "2.0.0-alpha.3" }
-sp-blockchain = { version = "2.0.0-alpha.3" }
+sp-runtime = { version = "2.0.0-alpha.5" }
+sp-api = { version = "2.0.0-alpha.5" }
+sp-blockchain = { version = "2.0.0-alpha.5" }
 orml-oracle-rpc-runtime-api = { path = "runtime-api" }
diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml
index 3c4b634..abfabee 100644
--- a/oracle/rpc/runtime-api/Cargo.toml
+++ b/oracle/rpc/runtime-api/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false, features = ["derive"] }
-sp-api = { default-features = false, version = "2.0.0-alpha.3" }
+sp-api = { default-features = false, version = "2.0.0-alpha.5" }
 
 [features]
 default = ["std"]
diff --git a/prices/Cargo.toml b/prices/Cargo.toml
index 164e38b..4ff8daa 100644
--- a/prices/Cargo.toml
+++ b/prices/Cargo.toml
@@ -5,19 +5,19 @@ authors = ["Acala Developers"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
-runtime-io = { package = "sp-io", version = "2.0.0-alpha.3", default-features = false }
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
+runtime-io = { package = "sp-io", version = "2.0.0-alpha.5", default-features = false }
 
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
 
 orml-traits = { path = "../traits", default-features = false }
 orml-utilities = { path = "../utilities", default-features = false }
 
 [dev-dependencies]
-primitives = { package = "sp-core",  version = "2.0.0-alpha.3", default-features = false }
+primitives = { package = "sp-core",  version = "2.0.0-alpha.5", default-features = false }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
diff --git a/schedule-update/Cargo.toml b/schedule-update/Cargo.toml
index afd46cc..2565971 100644
--- a/schedule-update/Cargo.toml
+++ b/schedule-update/Cargo.toml
@@ -6,17 +6,17 @@ edition = "2018"
 
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
 
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
-sp-std = { version = "2.0.0-alpha.3", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
+sp-std = { version = "2.0.0-alpha.5", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
 
 [dev-dependencies]
-sp-io = { version = "2.0.0-alpha.3", default-features = false }
-sp-core = { version = "2.0.0-alpha.3", default-features = false }
-pallet-balances = { version = "2.0.0-alpha.3", default-features = false }
+sp-io = { version = "2.0.0-alpha.5", default-features = false }
+sp-core = { version = "2.0.0-alpha.5", default-features = false }
+pallet-balances = { version = "2.0.0-alpha.5", default-features = false }
 
 
 [features]
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
index 89f6be9..3d53124 100644
--- a/tokens/Cargo.toml
+++ b/tokens/Cargo.toml
@@ -5,20 +5,20 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
-runtime-io = { package = "sp-io", version = "2.0.0-alpha.3", default-features = false }
-rstd = { package = "sp-std", version = "2.0.0-alpha.3", default-features = false }
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
+runtime-io = { package = "sp-io", version = "2.0.0-alpha.5", default-features = false }
+rstd = { package = "sp-std", version = "2.0.0-alpha.5", default-features = false }
 
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
 
 orml-traits = { path = "../traits", default-features = false }
 orml-utilities = { path = "../utilities", default-features = false }
 
 [dev-dependencies]
-primitives = { package = "sp-core",  version = "2.0.0-alpha.3", default-features = false }
+primitives = { package = "sp-core",  version = "2.0.0-alpha.5", default-features = false }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index 9959504..37634ea 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -5,14 +5,14 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
-runtime-io = { package = "sp-io", version = "2.0.0-alpha.3", default-features = false }
-rstd = { package = "sp-std", version = "2.0.0-alpha.3", default-features = false }
-num-traits = { version = "0.2.8", default-features = false }
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
+runtime-io = { package = "sp-io", version = "2.0.0-alpha.5", default-features = false }
+rstd = { package = "sp-std", version = "2.0.0-alpha.5", default-features = false }
+num-traits = { version = "0.2.11", default-features = false }
 impl-trait-for-tuples = "0.1.3"
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
 
 [dev-dependencies]
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
index e866cd9..437e8f8 100644
--- a/utilities/Cargo.toml
+++ b/utilities/Cargo.toml
@@ -5,15 +5,15 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
-primitives = { package = "sp-core",  version = "2.0.0-alpha.3", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
-runtime-io = { package = "sp-io", version = "2.0.0-alpha.3", default-features = false }
-rstd = { package = "sp-std", version = "2.0.0-alpha.3", default-features = false }
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+primitives = { package = "sp-core",  version = "2.0.0-alpha.5", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
+runtime-io = { package = "sp-io", version = "2.0.0-alpha.5", default-features = false }
+rstd = { package = "sp-std", version = "2.0.0-alpha.5", default-features = false }
 
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0.41"
diff --git a/utilities/src/linked_item.rs b/utilities/src/linked_item.rs
index 354cc14..d183bad 100644
--- a/utilities/src/linked_item.rs
+++ b/utilities/src/linked_item.rs
@@ -172,7 +172,7 @@ mod tests {
 
 	decl_storage! {
 		trait Store for Module<T: Trait> as Test {
-			pub TestItem get(linked_list): map hasher(blake2_256) (Key, Option<Value>) => Option<TestLinkedItem>;
+			pub TestItem get(linked_list): map hasher(blake2_128_concat) (Key, Option<Value>) => Option<TestLinkedItem>;
 		}
 	}
 
diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml
index 4d3f21d..a957e2b 100644
--- a/vesting/Cargo.toml
+++ b/vesting/Cargo.toml
@@ -5,18 +5,18 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-serde = { version = "1.0", optional = true }
-codec = { package = "parity-scale-codec", version = "1.2.0", default-features = false }
-sp-runtime = { version = "2.0.0-alpha.3", default-features = false }
-sp-io = { version = "2.0.0-alpha.3", default-features = false }
-sp-std = { version = "2.0.0-alpha.3", default-features = false }
+serde = { version = "1.0.101", optional = true }
+codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+sp-runtime = { version = "2.0.0-alpha.5", default-features = false }
+sp-io = { version = "2.0.0-alpha.5", default-features = false }
+sp-std = { version = "2.0.0-alpha.5", default-features = false }
 
-frame-support = { version = "2.0.0-alpha.3", default-features = false }
-frame-system = { version = "2.0.0-alpha.3", default-features = false }
+frame-support = { version = "2.0.0-alpha.5", default-features = false }
+frame-system = { version = "2.0.0-alpha.5", default-features = false }
 
 [dev-dependencies]
-sp-core = { version = "2.0.0-alpha.3", default-features = false }
-pallet-balances = { version = "2.0.0-alpha.3" }
+sp-core = { version = "2.0.0-alpha.5", default-features = false }
+pallet-balances = { version = "2.0.0-alpha.5" }
 
 clear_on_drop = { version = "0.2.3", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
 
-- 
GitLab