use account provider (#361)

wangjj9219 · web-flow · commit d64c99e9e13a · 2021-02-04T12:05:49.000+13:00
diff --git a/Cargo.dev.toml b/Cargo.dev.toml
@@ -18,21 +18,21 @@ members = [
 resolver = "2"
 
 [patch.crates-io]
-frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-frame-support = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-frame-system = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-pallet-balances = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-pallet-treasury = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-io = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-std = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
-sp-version = { git = "https://github.com/paritytech/substrate.git", rev = "8b3e4c86bc5a86570a3091e470011604fb46d324" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+frame-support = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+frame-system = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+pallet-balances = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+pallet-scheduler = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+pallet-treasury = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-api = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-application-crypto = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-core = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-inherents = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-io = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-runtime = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-runtime-interface = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-std = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-trie = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
+sp-version = { git = "https://github.com/paritytech/substrate.git", rev = "5a94966e91fcd20d5a7981ae8186090221d8f096" }
diff --git a/auction/Cargo.toml b/auction/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
 frame-support = { version = "2.0.1", default-features = false }
diff --git a/authority/Cargo.toml b/authority/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
 frame-support = { version = "2.0.1", default-features = false }
diff --git a/authority/src/mock.rs b/authority/src/mock.rs
@@ -13,7 +13,7 @@ use frame_system::{ensure_root, ensure_signed, EnsureRoot};
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
-	traits::{BadOrigin, Block as BlockT, IdentityLookup},
+	traits::{BadOrigin, IdentityLookup},
 	DispatchResult, Perbill,
 };
 
diff --git a/benchmarking/Cargo.toml b/benchmarking/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 paste = "0.1.16"
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-api = { version = "2.0.1", default-features = false }
 sp-runtime-interface = { version = "2.0.1", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
diff --git a/currencies/Cargo.toml b/currencies/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 sp-io = { version = "2.0.1", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
diff --git a/gradually-update/Cargo.toml b/gradually-update/Cargo.toml
@@ -8,7 +8,7 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.1", default-features = false }
 frame-system = { version = "2.0.1", default-features = false }
 sp-io = { version = "2.0.1", default-features = false }
diff --git a/nft/Cargo.toml b/nft/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 
diff --git a/oracle/Cargo.toml b/oracle/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 
 sp-application-crypto = { version = "2.0.1", default-features = false }
 sp-io = { version = "2.0.1", default-features = false }
diff --git a/oracle/rpc/Cargo.toml b/oracle/rpc/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.0" }
+codec = { package = "parity-scale-codec", version = "2.0.0" }
 jsonrpc-core = "15.0.0"
 jsonrpc-core-client = "15.0.0"
 jsonrpc-derive = "15.0.0"
diff --git a/oracle/rpc/runtime-api/Cargo.toml b/oracle/rpc/runtime-api/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2018"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false, features = ["derive"] }
 sp-api = { default-features = false, version = "2.0.1" }
 sp-std = { default-features = false, version = "2.0.1" }
 
diff --git a/rewards/Cargo.toml b/rewards/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 sp-io = { version = "2.0.1", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
 frame-support = { version = "2.0.1", default-features = false }
@@ -20,7 +20,7 @@ orml-traits = { path = "../traits", version = "0.4.0-dev", default-features = fa
 sp-core = { version = "2.0.1", default-features = false }
 sp-io = { version = "2.0.1", default-features = false }
 pallet-treasury = { version = "2.0.1" }
-pallet-elections-phragmen = { version = "2.0.1" }
+pallet-elections-phragmen = { version = "3.0.0" }
 
 [features]
 default = ["std"]
diff --git a/tokens/src/lib.rs b/tokens/src/lib.rs
@@ -375,11 +375,13 @@ pub mod module {
 			})
 			.map(|(existed, exists, handle_dust, result)| {
 				if existed && !exists {
-					// if existed before, decrease account ref count
-					frame_system::Module::<T>::dec_ref(who);
+					// If existed before, decrease account provider.
+					// Ignore the result, because if it failed means that these’s remain consumers,
+					// and the account storage in frame_system shouldn't be repeaded.
+					let _ = frame_system::Module::<T>::dec_providers(who);
 				} else if !existed && exists {
-					// if new, increase account ref count
-					frame_system::Module::<T>::inc_ref(who);
+					// if new, increase account provider
+					frame_system::Module::<T>::inc_providers(who);
 				}
 
 				if let Some(dust_amount) = handle_dust {
@@ -441,13 +443,21 @@ pub mod module {
 				<Locks<T>>::remove(who, currency_id);
 				if existed {
 					// decrease account ref count when destruct lock
-					frame_system::Module::<T>::dec_ref(who);
+					frame_system::Module::<T>::dec_consumers(who);
 				}
 			} else {
 				<Locks<T>>::insert(who, currency_id, locks);
 				if !existed {
 					// increase account ref count when initialize lock
-					frame_system::Module::<T>::inc_ref(who);
+					if frame_system::Module::<T>::inc_consumers(who).is_err() {
+						// No providers for the locks. This is impossible under normal circumstances
+						// since the funds that are under the lock will themselves be stored in the
+						// account and therefore will need a reference.
+						frame_support::debug::warn!(
+							"Warning: Attempt to introduce lock consumer reference, yet no providers. \
+							This is unexpected but should be safe."
+						);
+					}
 				}
 			}
 		}
diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs
@@ -195,6 +195,8 @@ parameter_types! {
 	pub const DesiredMembers: u32 = 2;
 	pub const DesiredRunnersUp: u32 = 2;
 	pub const TermDuration: u64 = 5;
+	pub const VotingBondBase: u64 = 2;
+	pub const VotingBondFactor: u64 = 0;
 }
 
 impl pallet_elections_phragmen::Config for Runtime {
@@ -205,13 +207,13 @@ impl pallet_elections_phragmen::Config for Runtime {
 	type ChangeMembers = TestChangeMembers;
 	type InitializeMembers = ();
 	type CandidacyBond = CandidacyBond;
-	type VotingBond = VotingBond;
+	type VotingBondBase = VotingBondBase;
+	type VotingBondFactor = VotingBondFactor;
 	type TermDuration = TermDuration;
 	type DesiredMembers = DesiredMembers;
 	type DesiredRunnersUp = DesiredRunnersUp;
 	type LoserCandidate = ();
 	type KickedMember = ();
-	type BadReport = ();
 	type WeightInfo = ();
 }
 
diff --git a/tokens/src/tests.rs b/tokens/src/tests.rs
@@ -48,33 +48,33 @@ fn remove_dust_work() {
 		assert_eq!(Tokens::total_issuance(DOT), 100);
 		assert_eq!(Accounts::<Runtime>::contains_key(ALICE, DOT), true);
 		assert_eq!(Tokens::free_balance(DOT, &ALICE), 100);
-		assert_eq!(System::refs(&ALICE), 1);
+		assert_eq!(System::providers(&ALICE), 1);
 		assert_eq!(Accounts::<Runtime>::contains_key(DustAccount::get(), DOT), false);
 		assert_eq!(Tokens::free_balance(DOT, &DustAccount::get()), 0);
-		assert_eq!(System::refs(&DustAccount::get()), 0);
+		assert_eq!(System::providers(&DustAccount::get()), 0);
 
 		// total is gte ED, will not handle dust
 		assert_ok!(Tokens::withdraw(DOT, &ALICE, 98));
 		assert_eq!(Tokens::total_issuance(DOT), 2);
 		assert_eq!(Accounts::<Runtime>::contains_key(ALICE, DOT), true);
 		assert_eq!(Tokens::free_balance(DOT, &ALICE), 2);
-		assert_eq!(System::refs(&ALICE), 1);
+		assert_eq!(System::providers(&ALICE), 1);
 		assert_eq!(Accounts::<Runtime>::contains_key(DustAccount::get(), DOT), false);
 		assert_eq!(Tokens::free_balance(DOT, &DustAccount::get()), 0);
-		assert_eq!(System::refs(&DustAccount::get()), 0);
+		assert_eq!(System::providers(&DustAccount::get()), 0);
 
 		assert_ok!(Tokens::withdraw(DOT, &ALICE, 1));
 
 		// total is lte ED, will handle dust
 		assert_eq!(Tokens::total_issuance(DOT), 1);
 		assert_eq!(Accounts::<Runtime>::contains_key(ALICE, DOT), false);
 		assert_eq!(Tokens::free_balance(DOT, &ALICE), 0);
-		assert_eq!(System::refs(&ALICE), 0);
+		assert_eq!(System::providers(&ALICE), 0);
 
 		// will not handle dust for module account
 		assert_eq!(Accounts::<Runtime>::contains_key(DustAccount::get(), DOT), true);
 		assert_eq!(Tokens::free_balance(DOT, &DustAccount::get()), 1);
-		assert_eq!(System::refs(&DustAccount::get()), 1);
+		assert_eq!(System::providers(&DustAccount::get()), 1);
 
 		let dust_lost_event = TestEvent::tokens(Event::DustLost(ALICE, DOT, 1));
 		assert!(System::events().iter().any(|record| record.event == dust_lost_event));
@@ -478,9 +478,8 @@ fn currency_adapter_ensure_currency_adapter_should_work() {
 			assert_eq!(Tokens::total_issuance(DOT), 102);
 			assert_eq!(Tokens::total_balance(DOT, &Treasury::account_id()), 2);
 			assert_eq!(Tokens::total_balance(DOT, &TREASURY_ACCOUNT), 100);
-			// CandidacyBond = 3 VotingBond = 2
-			assert_eq!(Tokens::reserved_balance(DOT, &TREASURY_ACCOUNT), 5);
-			assert_eq!(Tokens::free_balance(DOT, &TREASURY_ACCOUNT), 95);
+			assert_eq!(Tokens::reserved_balance(DOT, &TREASURY_ACCOUNT), 0);
+			assert_eq!(Tokens::free_balance(DOT, &TREASURY_ACCOUNT), 100);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::total_balance(&TREASURY_ACCOUNT),
 				100
@@ -529,7 +528,7 @@ fn currency_adapter_ensure_currency_adapter_should_work() {
 			// transfer
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
-				95
+				100
 			);
 			assert_ok!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::ensure_can_withdraw(
@@ -547,7 +546,7 @@ fn currency_adapter_ensure_currency_adapter_should_work() {
 			));
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
-				84
+				89
 			);
 
 			// deposit
@@ -558,7 +557,7 @@ fn currency_adapter_ensure_currency_adapter_should_work() {
 			let imbalance = TreasuryCurrencyAdapter::deposit_creating(&TREASURY_ACCOUNT, 11);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
-				95
+				100
 			);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
@@ -567,7 +566,7 @@ fn currency_adapter_ensure_currency_adapter_should_work() {
 			drop(imbalance);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
-				95
+				100
 			);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
@@ -583,7 +582,7 @@ fn currency_adapter_ensure_currency_adapter_should_work() {
 			);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
-				85
+				90
 			);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
@@ -592,7 +591,7 @@ fn currency_adapter_ensure_currency_adapter_should_work() {
 			drop(imbalance);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::free_balance(&TREASURY_ACCOUNT),
-				85
+				90
 			);
 			assert_eq!(
 				<Runtime as pallet_elections_phragmen::Config>::Currency::total_issuance(),
@@ -694,11 +693,10 @@ fn currency_adapter_basic_locking_should_work() {
 		.one_hundred_for_treasury_account()
 		.build()
 		.execute_with(|| {
-			// CandidacyBond = 3 VotingBond = 2
-			assert_eq!(TreasuryCurrencyAdapter::free_balance(&TREASURY_ACCOUNT), 95);
+			assert_eq!(TreasuryCurrencyAdapter::free_balance(&TREASURY_ACCOUNT), 100);
 			TreasuryCurrencyAdapter::set_lock(ID_1, &TREASURY_ACCOUNT, 91, WithdrawReasons::all());
 			assert_noop!(
-				TreasuryCurrencyAdapter::transfer(&TREASURY_ACCOUNT, &ALICE, 5, ExistenceRequirement::AllowDeath),
+				TreasuryCurrencyAdapter::transfer(&TREASURY_ACCOUNT, &ALICE, 10, ExistenceRequirement::AllowDeath),
 				Error::<Runtime>::LiquidityRestrictions
 			);
 		});
@@ -844,17 +842,17 @@ fn currency_adapter_lock_reasons_extension_should_work() {
 		.execute_with(|| {
 			TreasuryCurrencyAdapter::set_lock(ID_1, &TREASURY_ACCOUNT, 90, WithdrawReasons::TRANSFER);
 			assert_noop!(
-				TreasuryCurrencyAdapter::transfer(&TREASURY_ACCOUNT, &ALICE, 6, ExistenceRequirement::AllowDeath),
+				TreasuryCurrencyAdapter::transfer(&TREASURY_ACCOUNT, &ALICE, 11, ExistenceRequirement::AllowDeath),
 				Error::<Runtime>::LiquidityRestrictions
 			);
 			TreasuryCurrencyAdapter::extend_lock(ID_1, &TREASURY_ACCOUNT, 90, WithdrawReasons::empty());
 			assert_noop!(
-				TreasuryCurrencyAdapter::transfer(&TREASURY_ACCOUNT, &ALICE, 6, ExistenceRequirement::AllowDeath),
+				TreasuryCurrencyAdapter::transfer(&TREASURY_ACCOUNT, &ALICE, 11, ExistenceRequirement::AllowDeath),
 				Error::<Runtime>::LiquidityRestrictions
 			);
 			TreasuryCurrencyAdapter::extend_lock(ID_1, &TREASURY_ACCOUNT, 90, WithdrawReasons::RESERVE);
 			assert_noop!(
-				TreasuryCurrencyAdapter::transfer(&TREASURY_ACCOUNT, &ALICE, 6, ExistenceRequirement::AllowDeath),
+				TreasuryCurrencyAdapter::transfer(&TREASURY_ACCOUNT, &ALICE, 11, ExistenceRequirement::AllowDeath),
 				Error::<Runtime>::LiquidityRestrictions
 			);
 		});
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 sp-io = { version = "2.0.1", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
diff --git a/utilities/Cargo.toml b/utilities/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 frame-support = { version = "2.0.1", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
diff --git a/vesting/Cargo.toml b/vesting/Cargo.toml
@@ -9,7 +9,7 @@ edition = "2018"
 
 [dependencies]
 serde = { version = "1.0.111", optional = true }
-codec = { package = "parity-scale-codec", version = "1.3.0", default-features = false }
+codec = { package = "parity-scale-codec", version = "2.0.0", default-features = false }
 sp-runtime = { version = "2.0.1", default-features = false }
 sp-io = { version = "2.0.1", default-features = false }
 sp-std = { version = "2.0.1", default-features = false }
