Update substrate (#345)

shaunxw · web-flow · commit e70ae70d790f · 2021-01-05T12:09:43.000+13:00
* Update orml.

* Update substrate.

* fix mocks.
diff --git a/Cargo.dev.toml b/Cargo.dev.toml
@@ -15,21 +15,21 @@ members = [
 ]
 
 [patch.crates-io]
-frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-frame-support = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-frame-system = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-pallet-balances = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-io = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-std = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-sp-version = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+frame-support = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+frame-system = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+pallet-balances = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-io = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-std = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+sp-version = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
diff --git a/auction/src/mock.rs b/auction/src/mock.rs
@@ -57,6 +57,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 pub type System = frame_system::Module<Runtime>;
 
diff --git a/authority/src/mock.rs b/authority/src/mock.rs
@@ -48,6 +48,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 parameter_types! {
diff --git a/benchmarking/src/tests.rs b/benchmarking/src/tests.rs
@@ -73,6 +73,7 @@ impl frame_system::Config for Test {
 	type OnKilledAccount = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 impl Config for Test {
diff --git a/currencies/src/mock.rs b/currencies/src/mock.rs
@@ -61,6 +61,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 pub type System = frame_system::Module<Runtime>;
 
diff --git a/gradually-update/src/mock.rs b/gradually-update/src/mock.rs
@@ -56,6 +56,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 pub type System = system::Module<Runtime>;
 
diff --git a/nft/src/mock.rs b/nft/src/mock.rs
@@ -44,6 +44,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 pub type System = frame_system::Module<Runtime>;
 
diff --git a/oracle/src/mock.rs b/oracle/src/mock.rs
@@ -66,6 +66,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 pub type System = frame_system::Module<Test>;
 
diff --git a/rewards/src/mock.rs b/rewards/src/mock.rs
@@ -57,6 +57,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 
 thread_local! {
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
@@ -23,8 +23,8 @@ orml-traits = { path = "../traits", version = "0.3.3-dev", default-features = fa
 sp-core = { version = "2.0.0", default-features = false }
 pallet-treasury = { version = "2.0.0" }
 #TODO: use cargo version once `bounties` and `tips` pallets are released.
-pallet-bounties = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
-pallet-tips = { git = "https://github.com/paritytech/substrate.git", rev = "987a9723920217917f2708388d150add5ef52ef7" }
+pallet-bounties = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
+pallet-tips = { git = "https://github.com/paritytech/substrate.git", rev = "2eaeb91bc6d20786aa4ad5f5538c0deac46e14cd" }
 pallet-elections-phragmen = { version = "2.0.0" }
 
 clear_on_drop = { version = "0.2.4", features = ["no_cc"] }	# https://github.com/paritytech/substrate/issues/4179
diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
@@ -79,6 +79,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 pub type System = system::Module<Runtime>;
 
diff --git a/vesting/src/mock.rs b/vesting/src/mock.rs
@@ -55,6 +55,7 @@ impl frame_system::Config for Runtime {
 	type DbWeight = ();
 	type BaseCallFilter = ();
 	type SystemWeightInfo = ();
+	type SS58Prefix = ();
 }
 pub type System = frame_system::Module<Runtime>;
 

Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,7 @@ impl frame_system::Config for Runtime {`
`57`	`57`	`type DbWeight = ();`
`58`	`58`	`type BaseCallFilter = ();`
`59`	`59`	`type SystemWeightInfo = ();`
	`60`	`+ type SS58Prefix = ();`
`60`	`61`	`}`
`61`	`62`	`pub type System = frame_system::Module<Runtime>;`
`62`	`63`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ impl frame_system::Config for Runtime {`
`48`	`48`	`type DbWeight = ();`
`49`	`49`	`type BaseCallFilter = ();`
`50`	`50`	`type SystemWeightInfo = ();`
	`51`	`+ type SS58Prefix = ();`
`51`	`52`	`}`
`52`	`53`
`53`	`54`	`parameter_types! {`
Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,7 @@ impl frame_system::Config for Test {`
`73`	`73`	`type OnKilledAccount = ();`
`74`	`74`	`type BaseCallFilter = ();`
`75`	`75`	`type SystemWeightInfo = ();`
	`76`	`+ type SS58Prefix = ();`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`impl Config for Test {`
Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ impl frame_system::Config for Runtime {`
`61`	`61`	`type DbWeight = ();`
`62`	`62`	`type BaseCallFilter = ();`
`63`	`63`	`type SystemWeightInfo = ();`
	`64`	`+ type SS58Prefix = ();`
`64`	`65`	`}`
`65`	`66`	`pub type System = frame_system::Module<Runtime>;`
`66`	`67`
Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ impl frame_system::Config for Runtime {`
`56`	`56`	`type DbWeight = ();`
`57`	`57`	`type BaseCallFilter = ();`
`58`	`58`	`type SystemWeightInfo = ();`
	`59`	`+ type SS58Prefix = ();`
`59`	`60`	`}`
`60`	`61`	`pub type System = system::Module<Runtime>;`
`61`	`62`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ impl frame_system::Config for Runtime {`
`44`	`44`	`type DbWeight = ();`
`45`	`45`	`type BaseCallFilter = ();`
`46`	`46`	`type SystemWeightInfo = ();`
	`47`	`+ type SS58Prefix = ();`
`47`	`48`	`}`
`48`	`49`	`pub type System = frame_system::Module<Runtime>;`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ impl frame_system::Config for Test {`
`66`	`66`	`type DbWeight = ();`
`67`	`67`	`type BaseCallFilter = ();`
`68`	`68`	`type SystemWeightInfo = ();`
	`69`	`+ type SS58Prefix = ();`
`69`	`70`	`}`
`70`	`71`	`pub type System = frame_system::Module<Test>;`
`71`	`72`