update substrate and hasher (#123)

AcalaNetwork · Feb 25, 2020 · 07bd018 · 07bd018
1 parent 03792c6
commit 07bd018
Show file tree

Hide file tree

Showing 26 changed files with 402 additions and 475 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/modules/accounts/src/lib.rs b/modules/accounts/src/lib.rs
@@ -5,7 +5,7 @@ use frame_support::{
 	decl_module, decl_storage,
 	dispatch::Dispatchable,
 	traits::{
-		Currency, ExistenceRequirement, Get, LockIdentifier, LockableCurrency, OnReapAccount, OnUnbalanced, Time,
+		Currency, ExistenceRequirement, Get, LockIdentifier, LockableCurrency, OnKilledAccount, OnUnbalanced, Time,
 		WithdrawReason, WithdrawReasons,
 	},
 	weights::DispatchInfo,
@@ -45,8 +45,8 @@ pub trait Trait: system::Trait + pallet_transaction_payment::Trait + orml_curren
 
 decl_storage! {
 	trait Store for Module<T: Trait> as Accounts {
-		LastFreeTransfers get(fn last_free_transfers): map hasher(blake2_256) T::AccountId => Vec<MomentOf<T>>;
-		FreeTransferEnabledAccounts get(fn free_transfer_enabled_accounts): map hasher(blake2_256) T::AccountId => Option<()>;
+		LastFreeTransfers get(fn last_free_transfers): map hasher(twox_64_concat) T::AccountId => Vec<MomentOf<T>>;
+		FreeTransferEnabledAccounts get(fn free_transfer_enabled_accounts): map hasher(twox_64_concat) T::AccountId => Option<()>;
 	}
 }
 
@@ -95,8 +95,8 @@ impl<T: Trait> Module<T> {
 	}
 }
 
-impl<T: Trait> OnReapAccount<T::AccountId> for Module<T> {
-	fn on_reap_account(who: &T::AccountId) {
+impl<T: Trait> OnKilledAccount<T::AccountId> for Module<T> {
+	fn on_killed_account(who: &T::AccountId) {
 		<LastFreeTransfers<T>>::remove(who);
 	}
 }

diff --git a/modules/accounts/src/mock.rs b/modules/accounts/src/mock.rs
@@ -65,7 +65,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 
 impl orml_tokens::Trait for Runtime {

diff --git a/modules/airdrop/src/lib.rs b/modules/airdrop/src/lib.rs
@@ -15,7 +15,7 @@ pub trait Trait: system::Trait {
 
 decl_storage! {
 	trait Store for Module<T: Trait> as AirDrop {
-		AirDrops get(fn airdrops): double_map hasher(blake2_256) T::AccountId, hasher(blake2_256) T::CurrencyId => T::Balance;
+		AirDrops get(fn airdrops): double_map hasher(twox_64_concat) T::AccountId, hasher(twox_64_concat) T::CurrencyId => T::Balance;
 	}
 }
 

diff --git a/modules/airdrop/src/mock.rs b/modules/airdrop/src/mock.rs
@@ -62,7 +62,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = ();
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 pub type System = system::Module<Runtime>;
 

diff --git a/modules/auction_manager/src/lib.rs b/modules/auction_manager/src/lib.rs
@@ -85,13 +85,13 @@ decl_error! {
 
 decl_storage! {
 	trait Store for Module<T: Trait> as AuctionManager {
-		pub CollateralAuctions get(fn collateral_auctions): map hasher(blake2_256) AuctionIdOf<T> =>
+		pub CollateralAuctions get(fn collateral_auctions): map hasher(twox_64_concat) AuctionIdOf<T> =>
 			Option<CollateralAuctionItem<T::AccountId, CurrencyIdOf<T>, BalanceOf<T>, T::BlockNumber>>;
-		pub DebitAuctions get(fn debit_auctions): map hasher(blake2_256) AuctionIdOf<T> =>
+		pub DebitAuctions get(fn debit_auctions): map hasher(twox_64_concat) AuctionIdOf<T> =>
 			Option<DebitAuctionItem<BalanceOf<T>, T::BlockNumber>>;
-		pub SurplusAuctions get(fn surplus_auctions): map hasher(blake2_256) AuctionIdOf<T> =>
+		pub SurplusAuctions get(fn surplus_auctions): map hasher(twox_64_concat) AuctionIdOf<T> =>
 			Option<SurplusAuctionItem<BalanceOf<T>, T::BlockNumber>>;
-		pub TotalCollateralInAuction get(fn total_collateral_in_auction): map hasher(blake2_256) CurrencyIdOf<T> => BalanceOf<T>;
+		pub TotalCollateralInAuction get(fn total_collateral_in_auction): map hasher(twox_64_concat) CurrencyIdOf<T> => BalanceOf<T>;
 		pub TotalTargetInAuction get(fn total_target_in_auction): BalanceOf<T>;
 		pub TotalDebitInAuction get(fn total_debit_in_auction): BalanceOf<T>;
 		pub TotalSurplusInAuction get(fn total_surplus_in_auction): BalanceOf<T>;

diff --git a/modules/auction_manager/src/mock.rs b/modules/auction_manager/src/mock.rs
@@ -71,7 +71,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 pub type System = system::Module<Runtime>;
 

diff --git a/modules/cdp_engine/src/lib.rs b/modules/cdp_engine/src/lib.rs
@@ -100,12 +100,12 @@ decl_error! {
 
 decl_storage! {
 	trait Store for Module<T: Trait> as CdpEngine {
-		pub StabilityFee get(fn stability_fee): map hasher(blake2_256) CurrencyIdOf<T> => Option<Rate>;
-		pub LiquidationRatio get(fn liquidation_ratio): map hasher(blake2_256) CurrencyIdOf<T> => Option<Ratio>;
-		pub LiquidationPenalty get(fn liquidation_penalty): map hasher(blake2_256) CurrencyIdOf<T> => Option<Rate>;
-		pub RequiredCollateralRatio get(fn required_collateral_ratio): map hasher(blake2_256) CurrencyIdOf<T> => Option<Ratio>;
-		pub MaximumTotalDebitValue get(fn maximum_total_debit_value): map hasher(blake2_256) CurrencyIdOf<T> => BalanceOf<T>;
-		pub DebitExchangeRate get(fn debit_exchange_rate): map hasher(blake2_256) CurrencyIdOf<T> => Option<ExchangeRate>;
+		pub StabilityFee get(fn stability_fee): map hasher(twox_64_concat) CurrencyIdOf<T> => Option<Rate>;
+		pub LiquidationRatio get(fn liquidation_ratio): map hasher(twox_64_concat) CurrencyIdOf<T> => Option<Ratio>;
+		pub LiquidationPenalty get(fn liquidation_penalty): map hasher(twox_64_concat) CurrencyIdOf<T> => Option<Rate>;
+		pub RequiredCollateralRatio get(fn required_collateral_ratio): map hasher(twox_64_concat) CurrencyIdOf<T> => Option<Ratio>;
+		pub MaximumTotalDebitValue get(fn maximum_total_debit_value): map hasher(twox_64_concat) CurrencyIdOf<T> => BalanceOf<T>;
+		pub DebitExchangeRate get(fn debit_exchange_rate): map hasher(twox_64_concat) CurrencyIdOf<T> => Option<ExchangeRate>;
 		pub IsShutdown get(fn is_shutdown): bool;
 	}
 

diff --git a/modules/cdp_engine/src/mock.rs b/modules/cdp_engine/src/mock.rs
@@ -96,7 +96,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 pub type System = system::Module<Runtime>;
 

diff --git a/modules/cdp_treasury/src/lib.rs b/modules/cdp_treasury/src/lib.rs
@@ -50,11 +50,11 @@ decl_storage! {
 		pub SurplusBufferSize get(fn surplus_buffer_size) config(): BalanceOf<T>;
 		pub InitialAmountPerDebitAuction get(fn initial_amount_per_debit_auction) config(): BalanceOf<T>;
 		pub DebitAuctionFixedSize get(fn debit_auction_fixed_size) config(): BalanceOf<T>;
-		pub CollateralAuctionMaximumSize get(fn collateral_auction_maximum_size): map hasher(blake2_256) CurrencyIdOf<T> => BalanceOf<T>;
+		pub CollateralAuctionMaximumSize get(fn collateral_auction_maximum_size): map hasher(twox_64_concat) CurrencyIdOf<T> => BalanceOf<T>;
 
 		pub DebitPool get(fn debit_pool): BalanceOf<T>;
 		pub SurplusPool get(fn surplus_pool): BalanceOf<T>;
-		pub TotalCollaterals get(fn total_collaterals): map hasher(blake2_256) CurrencyIdOf<T> => BalanceOf<T>;
+		pub TotalCollaterals get(fn total_collaterals): map hasher(twox_64_concat) CurrencyIdOf<T> => BalanceOf<T>;
 		pub IsShutdown get(fn is_shutdown): bool;
 	}
 

diff --git a/modules/cdp_treasury/src/mock.rs b/modules/cdp_treasury/src/mock.rs
@@ -74,7 +74,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 pub type System = system::Module<Runtime>;
 

diff --git a/modules/dex/src/lib.rs b/modules/dex/src/lib.rs
@@ -56,9 +56,9 @@ decl_error! {
 
 decl_storage! {
 	trait Store for Module<T: Trait> as Dex {
-		LiquidityPool get(fn liquidity_pool): map hasher(blake2_256) CurrencyIdOf<T> => (BalanceOf<T>, BalanceOf<T>);
-		TotalShares get(fn total_shares): map hasher(blake2_256) CurrencyIdOf<T> => T::Share;
-		Shares get(fn shares): double_map hasher(blake2_256) CurrencyIdOf<T>, hasher(blake2_256) T::AccountId => T::Share;
+		LiquidityPool get(fn liquidity_pool): map hasher(twox_64_concat) CurrencyIdOf<T> => (BalanceOf<T>, BalanceOf<T>);
+		TotalShares get(fn total_shares): map hasher(twox_64_concat) CurrencyIdOf<T> => T::Share;
+		Shares get(fn shares): double_map hasher(twox_64_concat) CurrencyIdOf<T>, hasher(twox_64_concat) T::AccountId => T::Share;
 	}
 }
 

diff --git a/modules/dex/src/mock.rs b/modules/dex/src/mock.rs
@@ -62,7 +62,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 pub type System = system::Module<Runtime>;
 

diff --git a/modules/emergency_shutdown/src/mock.rs b/modules/emergency_shutdown/src/mock.rs
@@ -98,7 +98,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 pub type System = system::Module<Runtime>;
 

diff --git a/modules/honzon/src/lib.rs b/modules/honzon/src/lib.rs
@@ -18,7 +18,7 @@ type AmountOf<T> = <<T as loans::Trait>::Currency as MultiCurrencyExtended<<T as
 
 decl_storage! {
 	trait Store for Module<T: Trait> as Honzon {
-		pub Authorization get(fn authorization): double_map hasher(blake2_256) T::AccountId, hasher(blake2_256) (CurrencyIdOf<T>, T::AccountId) => bool;
+		pub Authorization get(fn authorization): double_map hasher(twox_64_concat) T::AccountId, hasher(blake2_128_concat) (CurrencyIdOf<T>, T::AccountId) => bool;
 		pub IsShutdown get(fn is_shutdown): bool;
 	}
 }

diff --git a/modules/honzon/src/mock.rs b/modules/honzon/src/mock.rs
@@ -99,7 +99,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 pub type System = system::Module<Runtime>;
 

diff --git a/modules/loans/src/lib.rs b/modules/loans/src/lib.rs
@@ -44,9 +44,9 @@ pub trait Trait: system::Trait {
 decl_storage! {
 	trait Store for Module<T: Trait> as Loans {
 		pub Debits get(fn debits): double_map hasher(twox_64_concat) CurrencyIdOf<T>, hasher(twox_64_concat) T::AccountId => (T::DebitBalance, Option<(CurrencyIdOf<T>, T::AccountId)>);
-		pub Collaterals get(fn collaterals): double_map hasher(blake2_256) T::AccountId, hasher(blake2_256) CurrencyIdOf<T> => BalanceOf<T>;
-		pub TotalDebits get(fn total_debits): map hasher(blake2_256) CurrencyIdOf<T> => T::DebitBalance;
-		pub TotalCollaterals get(fn total_collaterals): map hasher(blake2_256) CurrencyIdOf<T> => BalanceOf<T>;
+		pub Collaterals get(fn collaterals): double_map hasher(twox_64_concat) T::AccountId, hasher(twox_64_concat) CurrencyIdOf<T> => BalanceOf<T>;
+		pub TotalDebits get(fn total_debits): map hasher(twox_64_concat) CurrencyIdOf<T> => T::DebitBalance;
+		pub TotalCollaterals get(fn total_collaterals): map hasher(twox_64_concat) CurrencyIdOf<T> => BalanceOf<T>;
 	}
 }
 

diff --git a/modules/loans/src/mock.rs b/modules/loans/src/mock.rs
@@ -71,7 +71,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 pub type System = system::Module<Runtime>;
 

diff --git a/modules/prices/src/lib.rs b/modules/prices/src/lib.rs
@@ -17,7 +17,7 @@ pub trait Trait: system::Trait {
 
 decl_storage! {
 	trait Store for Module<T: Trait> as Prices {
-		LockedPrice get(fn locked_price): map hasher(blake2_256) T::CurrencyId => Option<Option<Price>>;
+		LockedPrice get(fn locked_price): map hasher(twox_64_concat) T::CurrencyId => Option<Option<Price>>;
 	}
 }
 

diff --git a/modules/prices/src/mock.rs b/modules/prices/src/mock.rs
@@ -54,7 +54,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ();
 	type AccountData = ();
 	type OnNewAccount = ();
-	type OnReapAccount = ();
+	type OnKilledAccount = ();
 }
 
 pub struct MockDataProvider;

diff --git a/orml b/orml
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -140,7 +140,7 @@ impl system::Trait for Runtime {
 	type ModuleToIndex = ModuleToIndex;
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type OnNewAccount = ();
-	type OnReapAccount = (Balances, Staking, Session, Recovery);
+	type OnKilledAccount = ();
 }
 
 parameter_types! {

diff --git a/src/chain_spec.rs b/src/chain_spec.rs
@@ -249,7 +249,7 @@ fn testnet_genesis(
 		pallet_session: Some(SessionConfig {
 			keys: initial_authorities
 				.iter()
-				.map(|x| (x.0.clone(), session_keys(x.2.clone(), x.3.clone())))
+				.map(|x| (x.0.clone(), x.0.clone(), session_keys(x.2.clone(), x.3.clone())))
 				.collect::<Vec<_>>(),
 		}),
 		pallet_staking: Some(StakingConfig {
@@ -348,7 +348,7 @@ fn mandala_genesis(
 		pallet_session: Some(SessionConfig {
 			keys: initial_authorities
 				.iter()
-				.map(|x| (x.0.clone(), session_keys(x.2.clone(), x.3.clone())))
+				.map(|x| (x.0.clone(), x.0.clone(), session_keys(x.2.clone(), x.3.clone())))
 				.collect::<Vec<_>>(),
 		}),
 		pallet_staking: Some(StakingConfig {

diff --git a/src/command.rs b/src/command.rs
@@ -1,29 +1,24 @@
 use crate::chain_spec;
 use crate::cli::Cli;
 use crate::service;
-use sc_cli::{error, VersionInfo};
+use sc_cli::VersionInfo;
 
 /// Parse and run command line arguments
-pub fn run(version: VersionInfo) -> error::Result<()> {
+pub fn run(version: VersionInfo) -> sc_cli::Result<()> {
 	let opt = sc_cli::from_args::<Cli>(&version);
 
-	let config = sc_service::Configuration::new(&version);
+	let mut config = sc_service::Configuration::from_version(&version);
 
 	match opt.subcommand {
-		Some(subcommand) => sc_cli::run_subcommand(
-			config,
-			subcommand,
-			chain_spec::load_spec,
-			|config: _| Ok(new_full_start!(config).0),
-			&version,
-		),
-		None => sc_cli::run(
-			config,
-			opt.run,
-			service::new_light,
-			service::new_full,
-			chain_spec::load_spec,
-			&version,
-		),
+		Some(subcommand) => {
+			subcommand.init(&version)?;
+			subcommand.update_config(&mut config, chain_spec::load_spec, &version)?;
+			subcommand.run(config, |config: _| Ok(new_full_start!(config).0))
+		}
+		None => {
+			opt.run.init(&version)?;
+			opt.run.update_config(&mut config, chain_spec::load_spec, &version)?;
+			opt.run.run(config, service::new_light, service::new_full, &version)
+		}
 	}
 }
diff --git a/src/main.rs b/src/main.rs
@@ -6,10 +6,8 @@ mod cli;
 mod command;
 mod executor;
 
-pub use sc_cli::{error, VersionInfo};
-
-fn main() -> Result<(), error::Error> {
-	let version = VersionInfo {
+fn main() -> sc_cli::Result<()> {
+	let version = sc_cli::VersionInfo {
 		name: "Acala",
 		commit: env!("VERGEN_SHA_SHORT"),
 		version: env!("CARGO_PKG_VERSION"),