centrifuge · mustermeiszer · Nov 10, 2023 · Aug 15, 2023 · Aug 15, 2023 · Aug 15, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
diff --git a/flake.nix b/flake.nix
@@ -31,7 +31,7 @@
           # This selects a nightly Rust version, based on the date.
           nightly-date = pkgs.lib.strings.removePrefix "nightly-" rustToolChainTOML.toolchain.channel;
           # This is the hash of the Rust toolchain at nightly-date, required for reproducibility.
-          nightly-sha256 = "sha256-0HHSyIcGCh8bXZFzFMc2dSPJTtd02eijcok5YXHd+5A=";
+          nightly-sha256 = "sha256-hEf6+Lr/Pi7Mn6ESUrNYw9Wn8vKOpicKG/Y/3p5WQlo=";
           # This is the git short commit of the current version of the program.
           shortCommit = builtins.substring 0 7 (inputs.self.rev or "dirty");
 
@@ -93,7 +93,7 @@
             };
 
             # This is a hash of all the Cargo dependencies, for reproducibility.
-            cargoSha256 = "sha256-Y1HRgFCn990xP7o0CAOJ7DUYmecMedLj2dqdPm8AZTQ=";
+            cargoSha256 = "sha256-/idodSvHfn0LdkdMt1pznh72XzAZSjGMzJqVseyZ+JU=";
 
             nativeBuildInputs = with pkgs; [ clang git-mock pkg-config ];
             buildInputs = with pkgs; [ openssl ] ++ (

diff --git a/libs/mock-builder/Cargo.toml b/libs/mock-builder/Cargo.toml
@@ -11,15 +11,15 @@ version = "0.0.1"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
 
 [dev-dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"] }
-frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
 scale-info = { version = "2.3.0", features = ["derive"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
 
 [features]
 default = ["std"]

diff --git a/libs/mock-builder/src/lib.rs b/libs/mock-builder/src/lib.rs
@@ -152,8 +152,7 @@
 //! # #[pallet::config]
 //! # pub trait Config: frame_system::Config { }
 //! # #[pallet::pallet]
-//! # #[pallet::generate_store(pub(super) trait Store)]
-//! # pub struct Pallet<T>(_);
+//! # //! # pub struct Pallet<T>(_);
 //!
 //! #[pallet::storage]
 //! pub(super) type CallIds<T: Config> = StorageMap<
@@ -194,8 +193,7 @@
 //!     }
 //!
 //!     #[pallet::pallet]
-//!     #[pallet::generate_store(pub(super) trait Store)]
-//!     pub struct Pallet<T>(_);
+//!     //!     pub struct Pallet<T>(_);
 //!
 //!     #[pallet::storage]
 //!     pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mock-builder/tests/pallet.rs b/libs/mock-builder/tests/pallet.rs
@@ -24,8 +24,7 @@ pub mod pallet_mock_test {
 	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<
@@ -118,8 +117,7 @@ pub mod my_pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	impl<T: Config> Pallet<T> {
 		pub fn my_call(name: &str, value: u64) -> Result<(), String> {

@@ -12,18 +12,18 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", default-features = false, version = "3.0.0", features = ["derive"] }
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
 scale-info = { version = "2.3.0", default-features = false, features = ["derive"] }
-sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
-sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
+sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.43" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
 
 cfg-primitives = { path = "../primitives", default-features = false }
 cfg-traits = { path = "../traits", default-features = false }
 cfg-types = { path = "../types", default-features = false }
-orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.38" }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.43" }
 
 mock-builder = { path = "../../libs/mock-builder" }
 

diff --git a/libs/mocks/src/change_guard.rs b/libs/mocks/src/change_guard.rs
@@ -12,8 +12,7 @@ pub mod pallet_mock_change_guard {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/data.rs b/libs/mocks/src/data.rs
@@ -17,8 +17,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<
@@ -88,7 +87,7 @@ pub mod pallet {
 	}
 
 	impl<T: Config> DataFeeder<T::DataId, T::DataElem, T::AccountId> for Pallet<T> {
-		fn feed_value(a: T::AccountId, b: T::DataId, c: T::DataElem) -> DispatchResult {
+		fn feed_value(a: Option<T::AccountId>, b: T::DataId, c: T::DataElem) -> DispatchResult {
 			execute_call!((a, b, c))
 		}
 	}

diff --git a/libs/mocks/src/fees.rs b/libs/mocks/src/fees.rs
@@ -11,8 +11,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/liquidity_pools.rs b/libs/mocks/src/liquidity_pools.rs
@@ -49,8 +49,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/liquidity_pools_gateway_routers.rs b/libs/mocks/src/liquidity_pools_gateway_routers.rs
@@ -13,8 +13,7 @@ pub mod pallet {
 	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/permissions.rs b/libs/mocks/src/permissions.rs
@@ -11,8 +11,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/pools.rs b/libs/mocks/src/pools.rs
@@ -27,8 +27,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/rewards.rs b/libs/mocks/src/rewards.rs
@@ -12,8 +12,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/template.rs b/libs/mocks/src/template.rs
@@ -7,8 +7,7 @@ pub mod pallet {
 	pub trait Config: frame_system::Config {}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/time.rs b/libs/mocks/src/time.rs
@@ -10,8 +10,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/mocks/src/try_convert.rs b/libs/mocks/src/try_convert.rs
@@ -14,8 +14,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T, I = ()>(_);
+		pub struct Pallet<T, I = ()>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config<I>, I: 'static = ()> = StorageMap<

diff --git a/libs/mocks/src/write_off_policy.rs b/libs/mocks/src/write_off_policy.rs
@@ -11,8 +11,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub(super) trait Store)]
-	pub struct Pallet<T>(_);
+		pub struct Pallet<T>(_);
 
 	#[pallet::storage]
 	pub(super) type CallIds<T: Config> = StorageMap<

diff --git a/libs/primitives/Cargo.toml b/libs/primitives/Cargo.toml
@@ -16,24 +16,24 @@ scale-info = { version = "2.3.0", default-features = false, features = ["derive"
 serde = { version = "1.0.119" }
 
 # substrate primitives dependencies
-sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
+sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+sp-consensus-aura = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
 
 # substrate frame dependencies
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+pallet-collective = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
 
 # cumulus primitives dependencies
-cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.38" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus", default-features = false, branch = "polkadot-v0.9.43" }
 
 # XCM primitives dependencies
-xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.38" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.38" }
+xcm = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.43" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", default-features = false, branch = "release-v0.9.43" }
 
 [features]
 default = ["std"]

diff --git a/libs/primitives/src/lib.rs b/libs/primitives/src/lib.rs
@@ -224,7 +224,7 @@ pub mod constants {
 	pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 
 	/// We allow for 0.5 seconds of compute with a 6 second average block time.
-	pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_ref_time(WEIGHT_REF_TIME_PER_SECOND)
+	pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(WEIGHT_REF_TIME_PER_SECOND, 0)
 		.saturating_div(2)
 		.set_proof_size(MAX_POV_SIZE as u64);
 

diff --git a/libs/proofs/Cargo.toml b/libs/proofs/Cargo.toml
@@ -13,10 +13,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive"], default-features = false }
 scale-info = { version = "2.3.0", default-features = false, features = ["derive"] }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
 
 [dev-dependencies]
-sp-core = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.38" }
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = true, branch = "polkadot-v0.9.43" }
 
 [features]
 default = ["std"]

diff --git a/libs/test-utils/Cargo.toml b/libs/test-utils/Cargo.toml
@@ -19,13 +19,13 @@ codec = { package = "parity-scale-codec", version = "3.0.0", features = ["derive
 scale-info = { version = "2.3.0", default-features = false, features = ["derive"] }
 serde = { version = "1.0.119", default-features = false }
 
-frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
-sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.38" }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.43" }
 
 # Optional dependencies
-frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.38" }
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.43" }
 
 [features]
 default = ["std"]

diff --git a/libs/test-utils/src/mocks/accountant.rs b/libs/test-utils/src/mocks/accountant.rs
@@ -76,6 +76,7 @@ macro_rules! impl_mock_accountant {
 			use std::borrow::{Borrow as _, BorrowMut as _};
 
 			use __private::STATE as __private_STATE;
+			use frame_support::traits::tokens::{Fortitude, Precision, Preservation};
 
 			use super::*;
 
@@ -108,7 +109,7 @@ macro_rules! impl_mock_accountant {
 			impl<Tokens> cfg_traits::investments::InvestmentAccountant<$account_id> for $name<Tokens>
 			where
 				Tokens: frame_support::traits::tokens::fungibles::Mutate<$account_id>
-					+ frame_support::traits::tokens::fungibles::Transfer<$account_id>
+					// + frame_support::traits::tokens::fungibles::Transfer<$account_id>
 					+ frame_support::traits::tokens::fungibles::Inspect<
 						$account_id,
 						Balance = $balance,
@@ -142,7 +143,8 @@ macro_rules! impl_mock_accountant {
 				) -> Result<(), Self::Error> {
 					let _ = __private_STATE.with(|s| s.borrow().info(&id))?;
 
-					Tokens::transfer(id.into(), source, dest, amount, false).map(|_| ())
+					Tokens::transfer(id.into(), source, dest, amount, Preservation::Protect)
+						.map(|_| ())
 				}
 
 				fn deposit(
@@ -152,7 +154,7 @@ macro_rules! impl_mock_accountant {
 				) -> Result<(), Self::Error> {
 					let _ = __private_STATE.with(|s| s.borrow().info(&id))?;
 
-					Tokens::mint_into(id.into(), buyer, amount)
+					Tokens::mint_into(id.into(), buyer, amount).map(|_| ())
 				}
 
 				fn withdraw(
@@ -162,7 +164,14 @@ macro_rules! impl_mock_accountant {
 				) -> Result<(), Self::Error> {
 					let _ = __private_STATE.with(|s| s.borrow().info(&id))?;
 
-					Tokens::burn_from(id.into(), seller, amount).map(|_| ())
+					Tokens::burn_from(
+						id.into(),
+						seller,
+						amount,
+						Precision::Exact,
+						Fortitude::Polite,
+					)
+					.map(|_| ())
 				}
 			}
 

diff --git a/libs/test-utils/src/mocks/nav.rs b/libs/test-utils/src/mocks/nav.rs
@@ -36,7 +36,7 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::generate_store(pub (super) trait Store)]
+
 	pub struct Pallet<T>(_);
 
 	#[pallet::storage]