Skip to content

use crates.io #961

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Nov 7, 2023
Merged

use crates.io #961

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3c566ad
use crates.io
xlc Oct 25, 2023
fd9a5f0
bump upstreams
xlc Nov 6, 2023
487fedf
fix
xlc Nov 6, 2023
e7022ea
fix
xlc Nov 7, 2023
25eb583
fix
xlc Nov 7, 2023
e2dbfbf
test for extract
xlc Nov 7, 2023
5f3014a
remove unused code
xlc Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
bump upstreams
  • Loading branch information
@xlc
xlc committed Nov 6, 2023
commit fd9a5f0c52b2de5372543314ba68318f08385a0b
132 changes: 66 additions & 66 deletions Cargo.dev.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,70 +35,70 @@ scale-info = { version = "2.10.0", default-features = false, features = ["derive
serde = { version = "1.0.189" }
parity-scale-codec = { version = "3.6.5", default-features = false, features = ["max-encoded-len"] }

frame-benchmarking = { version = "24.0.0", default-features = false }
frame-support = { version = "24.0.0", default-features = false }
frame-system = { version = "24.0.0", default-features = false }
pallet-authority-discovery = { version = "24.0.0", default-features = false }
pallet-authorship = { version = "24.0.0", default-features = false }
pallet-babe = { version = "24.0.0", default-features = false }
pallet-balances = { version = "24.0.0", default-features = false }
pallet-elections-phragmen = { version = "25.0.0", default-features = false }
pallet-message-queue = { version = "27.0.0", default-features = false }
pallet-scheduler = { version = "25.0.0", default-features = false }
pallet-session = { version = "24.0.0", default-features = false }
pallet-staking = { version = "24.0.0", default-features = false }
pallet-timestamp = { version = "23.0.0", default-features = false }
pallet-treasury = { version = "23.0.0", default-features = false }
pallet-vesting = { version = "24.0.0", default-features = false }
pallet-transaction-payment = { version = "24.0.0", default-features = false }
pallet-preimage = { version = "24.0.0", default-features = false }
# pallet-root-testing = { version = "*", default-features = false }
sp-api = { version = "22.0.0", default-features = false }
sp-application-crypto = { version = "26.0.0", default-features = false }
sp-arithmetic = { version = "19.0.0", default-features = false }
sp-authority-discovery = { version = "22.0.0", default-features = false }
sp-blockchain = { version = "24.0.0", default-features = false }
sp-consensus = { version = "0.28.0", default-features = false }
sp-consensus-slots = { version = "0.28.0", default-features = false }
sp-core = { version = "24.0.0", default-features = false }
sp-debug-derive = { version = "11.0.0", default-features = false }
sp-externalities = { version = "0.22.0", default-features = false }
sp-inherents = { version = "22.0.0", default-features = false }
sp-io = { version = "26.0.0", default-features = false }
sp-keystore = { version = "0.30.0", default-features = false }
sp-npos-elections = { version = "22.0.0", default-features = false }
sp-panic-handler = { version = "11.0.0", default-features = false }
sp-runtime = { version = "27.0.0", default-features = false }
sp-runtime-interface = { version = "20.0.0", default-features = false }
sp-session = { version = "23.0.0", default-features = false }
sp-staking = { version = "22.0.0", default-features = false }
sp-state-machine = { version = "0.31.0", default-features = false }
sp-std = { version = "11.0.0", default-features = false }
sp-storage = { version = "16.0.0", default-features = false }
sp-timestamp = { version = "22.0.0", default-features = false }
sp-trie = { version = "25.0.0", default-features = false }
sp-version = { version = "25.0.0", default-features = false }
sp-wasm-interface = { version = "17.0.0", default-features = false }
sp-tracing = { version = "13.0.0", default-features = false }
sp-maybe-compressed-blob = { version = "8.0.0", default-features = false }
sp-weights = { version = "23.0.0", default-features = false }
cumulus-primitives-core = { version = "0.3.0", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.3.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.3.0", default-features = false }
cumulus-pallet-xcm = { version = "0.3.0", default-features = false }
parachain-info = { package = "staging-parachain-info", version = "0.3.0", default-features = false }
pallet-xcm = { version = "3.0.0", default-features = false }
polkadot-core-primitives = { version = "3.0.0", default-features = false }
polkadot-runtime-parachains = { version = "3.0.0", default-features = false }
polkadot-parachain-primitives = { version = "2.0.0", default-features = false }
polkadot-primitives = { version = "3.0.0", default-features = false }
xcm = { package = "staging-xcm", version = "3.0.1", default-features = false }
xcm-executor = { package = "staging-xcm-executor", version = "3.0.0", default-features = false }
xcm-builder = { package = "staging-xcm-builder", version = "3.0.1", default-features = false }
cumulus-pallet-dmp-queue = { version = "0.4.0", default-features = false }
cumulus-pallet-xcm = { version = "0.4.0", default-features = false }
cumulus-pallet-xcmp-queue = { version = "0.4.0", default-features = false }
cumulus-primitives-core = { version = "0.4.0", default-features = false }
frame-benchmarking = { version = "25.0.0", default-features = false }
frame-support = { version = "25.0.0", default-features = false }
frame-system = { version = "25.0.0", default-features = false }
pallet-authority-discovery = { version = "25.0.0", default-features = false }
pallet-authorship = { version = "25.0.0", default-features = false }
pallet-babe = { version = "25.0.0", default-features = false }
pallet-balances = { version = "25.0.0", default-features = false }
pallet-elections-phragmen = { version = "26.0.0", default-features = false }
pallet-message-queue = { version = "28.0.0", default-features = false }
pallet-preimage = { version = "25.0.0", default-features = false }
pallet-root-testing = { version = "1.0.0", default-features = false }
pallet-scheduler = { version = "26.0.0", default-features = false }
pallet-session = { version = "25.0.0", default-features = false }
pallet-staking = { version = "25.0.0", default-features = false }
pallet-timestamp = { version = "24.0.0", default-features = false }
pallet-transaction-payment = { version = "25.0.0", default-features = false }
pallet-treasury = { version = "24.0.0", default-features = false }
pallet-vesting = { version = "25.0.0", default-features = false }
pallet-xcm = { version = "4.0.0", default-features = false }
parachain-info = { package = "staging-parachain-info", version = "0.4.0", default-features = false }
polkadot-core-primitives = { version = "4.0.0", default-features = false }
polkadot-parachain-primitives = { version = "3.0.0", default-features = false }
polkadot-primitives = { version = "4.0.0", default-features = false }
polkadot-runtime-parachains = { version = "4.0.0", default-features = false }
sp-api = { version = "23.0.0", default-features = false }
sp-application-crypto = { version = "27.0.0", default-features = false }
sp-arithmetic = { version = "20.0.0", default-features = false }
sp-authority-discovery = { version = "23.0.0", default-features = false }
sp-blockchain = { version = "25.0.0", default-features = false }
sp-consensus = { version = "0.29.0", default-features = false }
sp-consensus-slots = { version = "0.29.0", default-features = false }
sp-core = { version = "25.0.0", default-features = false }
sp-debug-derive = { version = "12.0.0", default-features = false }
sp-externalities = { version = "0.23.0", default-features = false }
sp-inherents = { version = "23.0.0", default-features = false }
sp-io = { version = "27.0.0", default-features = false }
sp-keystore = { version = "0.31.0", default-features = false }
sp-maybe-compressed-blob = { version = "9.0.0", default-features = false }
sp-npos-elections = { version = "23.0.0", default-features = false }
sp-panic-handler = { version = "12.0.0", default-features = false }
sp-runtime = { version = "28.0.0", default-features = false }
sp-runtime-interface = { version = "21.0.0", default-features = false }
sp-session = { version = "24.0.0", default-features = false }
sp-staking = { version = "23.0.0", default-features = false }
sp-state-machine = { version = "0.32.0", default-features = false }
sp-std = { version = "12.0.0", default-features = false }
sp-storage = { version = "17.0.0", default-features = false }
sp-timestamp = { version = "23.0.0", default-features = false }
sp-tracing = { version = "14.0.0", default-features = false }
sp-trie = { version = "26.0.0", default-features = false }
sp-version = { version = "26.0.0", default-features = false }
sp-wasm-interface = { version = "18.0.0", default-features = false }
sp-weights = { version = "24.0.0", default-features = false }
xcm = { package = "staging-xcm", version = "4.0.0", default-features = false }
xcm-builder = { package = "staging-xcm-builder", version = "4.0.0", default-features = false }
xcm-executor = { package = "staging-xcm-executor", version = "4.0.0", default-features = false }

xcm-simulator = { version = "3.0.0" }
sc-client-api = { version = "24.0.0" }
sc-client-db = { version = "0.31.0" }
sc-executor = { version = "0.28.0" }
sc-executor-common = { version = "0.25.0" }
sc-utils = { version = "10.0.0" }
sc-client-api = { version = "25.0.0" }
sc-client-db = { version = "0.32.0" }
sc-executor = { version = "0.29.0" }
sc-executor-common = { version = "0.26.0" }
sc-utils = { version = "11.0.0" }
xcm-simulator = { version = "4.0.0" }
2 changes: 1 addition & 1 deletion asset-registry/src/migrations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mod v2 {

pub(crate) fn migrate<T: Config>() -> Weight {
let mut weight: Weight = Weight::zero();
let module_prefix = LocationToAssetId::<T>::module_prefix();
let module_prefix = LocationToAssetId::<T>::pallet_prefix();
let storage_prefix = LocationToAssetId::<T>::storage_prefix();

weight.saturating_accrue(T::DbWeight::get().reads(1));
Expand Down
12 changes: 12 additions & 0 deletions tokens/src/imbalances.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,12 @@ impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> Imbalance<T::Balance> for Pos
fn peek(&self) -> T::Balance {
self.0
}

fn extract(&mut self, amount: T::Balance) -> Self {
let new: T::Balance = self.0.min(amount);
self.0 = self.0 - new;
Self::new(new)
}
}

impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> TryDrop for NegativeImbalance<T, GetCurrencyId> {
Expand Down Expand Up @@ -157,6 +163,12 @@ impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> Imbalance<T::Balance> for Neg
fn peek(&self) -> T::Balance {
self.0
}

fn extract(&mut self, amount: T::Balance) -> Self {
let new: T::Balance = self.0.min(amount);
self.0 = self.0 - new;
Self::new(new)
}
}

impl<T: Config, GetCurrencyId: Get<T::CurrencyId>> Drop for PositiveImbalance<T, GetCurrencyId> {
Expand Down
4 changes: 2 additions & 2 deletions unknown-tokens/src/migrations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ mod v2 {
let mut weight: Weight = Weight::zero();

// ConcreteFungibleBalances
let module_prefix = ConcreteFungibleBalances::<T>::module_prefix();
let module_prefix = ConcreteFungibleBalances::<T>::pallet_prefix();
let storage_prefix = ConcreteFungibleBalances::<T>::storage_prefix();

weight.saturating_accrue(T::DbWeight::get().reads(1));
Expand Down Expand Up @@ -54,7 +54,7 @@ mod v2 {
}

// AbstractFungibleBalances
let module_prefix = AbstractFungibleBalances::<T>::module_prefix();
let module_prefix = AbstractFungibleBalances::<T>::pallet_prefix();
let storage_prefix = AbstractFungibleBalances::<T>::storage_prefix();

weight.saturating_accrue(T::DbWeight::get().reads(1));
Expand Down
2 changes: 1 addition & 1 deletion xcm-support/src/currency_adapter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ impl<
DepositFailureHandler,
>
{
fn deposit_asset(asset: &MultiAsset, location: &MultiLocation, _context: &XcmContext) -> Result {
fn deposit_asset(asset: &MultiAsset, location: &MultiLocation, _context: Option<&XcmContext>) -> Result {
match (
AccountIdConvert::convert_location(location),
CurrencyIdConvert::convert(asset.clone()),
Expand Down