From ef0cab5178778d57025888461d04a0d3b17a3fab Mon Sep 17 00:00:00 2001 From: Shaun Wang <spxwang@gmail.com> Date: Wed, 12 May 2021 21:15:23 +1200 Subject: [PATCH] Bump dependencies. (#485) --- Cargo.dev.toml | 118 ++++++++++++++++++++++----------------------- tokens/Cargo.toml | 2 +- tokens/src/mock.rs | 2 + traits/src/lib.rs | 2 +- 4 files changed, 63 insertions(+), 61 deletions(-) diff --git a/Cargo.dev.toml b/Cargo.dev.toml index e9b842b..843649d 100644 --- a/Cargo.dev.toml +++ b/Cargo.dev.toml @@ -27,69 +27,69 @@ resolver = "2" split-debuginfo = "unpacked" [patch.'https://github.com/paritytech/substrate'] -frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -frame-support = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -frame-system = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-session = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-api = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-core = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-io = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-std = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-trie = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-version = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-staking = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-storage = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-npos-elections-compact = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sc-executor = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-session = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } -sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } +frame-benchmarking = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +frame-support = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +frame-system = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-balances = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-elections-phragmen = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-scheduler = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-treasury = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-authorship = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-vesting = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-timestamp = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-session = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-staking = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-offences = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +pallet-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-api = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-application-crypto = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-arithmetic = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-core = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-inherents = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-io = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-runtime = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-runtime-interface = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-std = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-trie = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-version = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-externalities = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-state-machine = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-wasm-interface = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-keystore = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-staking = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-storage = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-panic-handler = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-npos-elections = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-npos-elections-compact = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-debug-derive = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-allocator = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-authority-discovery = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sc-executor-common = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sc-executor-wasmi = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sc-executor = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sc-client-api = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-tasks = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-authorship = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-consensus = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-timestamp = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-session = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-blockchain = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } +sp-transaction-pool = { git = "https://github.com/paritytech//substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } # [patch.'https://github.com/paritytech/cumulus'] -# cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" } -# cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" } -# parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" } -# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech//cumulus", rev = "da4c3bac6e9584e65740ef5db4dbd2c31c1a91db" } +# cumulus-primitives-core = { git = "https://github.com/paritytech//cumulus", rev = "e7a5ce791e3f389f8026a9a850e324fb05fce0b8" } +# cumulus-pallet-parachain-system = { git = "https://github.com/paritytech//cumulus", rev = "e7a5ce791e3f389f8026a9a850e324fb05fce0b8" } +# parachain-info = { git = "https://github.com/paritytech//cumulus", rev = "e7a5ce791e3f389f8026a9a850e324fb05fce0b8" } +# cumulus-pallet-xcm-handler = { git = "https://github.com/paritytech//cumulus", rev = "e7a5ce791e3f389f8026a9a850e324fb05fce0b8" } # [patch.'https://github.com/paritytech/polkadot'] -# xcm = { git = "https://github.com/paritytech//polkadot", rev = "127eb17a25bbe2a9f2731ff11a65d7f8170f2373" } -# xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "127eb17a25bbe2a9f2731ff11a65d7f8170f2373" } -# xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "127eb17a25bbe2a9f2731ff11a65d7f8170f2373" } -# polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "127eb17a25bbe2a9f2731ff11a65d7f8170f2373" } -# polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "127eb17a25bbe2a9f2731ff11a65d7f8170f2373" } -# polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "127eb17a25bbe2a9f2731ff11a65d7f8170f2373" } -# polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "127eb17a25bbe2a9f2731ff11a65d7f8170f2373" } +# xcm = { git = "https://github.com/paritytech//polkadot", rev = "11d55446f306eb72c8239349e4803109a5d5fba0" } +# xcm-executor = { git = "https://github.com/paritytech//polkadot", rev = "11d55446f306eb72c8239349e4803109a5d5fba0" } +# xcm-builder = { git = "https://github.com/paritytech//polkadot", rev = "11d55446f306eb72c8239349e4803109a5d5fba0" } +# polkadot-core-primitives = { git = "https://github.com/paritytech//polkadot", rev = "11d55446f306eb72c8239349e4803109a5d5fba0" } +# polkadot-runtime-parachains = { git = "https://github.com/paritytech//polkadot", rev = "11d55446f306eb72c8239349e4803109a5d5fba0" } +# polkadot-parachain = { git = "https://github.com/paritytech//polkadot", rev = "11d55446f306eb72c8239349e4803109a5d5fba0" } +# polkadot-primitives = { git = "https://github.com/paritytech//polkadot", rev = "11d55446f306eb72c8239349e4803109a5d5fba0" } # [patch.'https://github.com/shaunxw/xcm-simulator'] # xcm-simulator = { git = "https://github.com/shaunxw//xcm-simulator", rev = "c52bd64a41a51d08bd5a1e27f32c47419b41f3e5" } diff --git a/tokens/Cargo.toml b/tokens/Cargo.toml index 538ae5d..628f1a0 100644 --- a/tokens/Cargo.toml +++ b/tokens/Cargo.toml @@ -22,7 +22,7 @@ sp-core = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1 pallet-treasury = { git = "https://github.com/paritytech/substrate", branch = "rococo-v1" } # Patch doesn't work as `pallet-elections-phragmen` is now 4.0.0 version. Revert `rev` to `rococo-v1` branch after # other `rococo-v1` dependencies upgraded. -pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "2be8fcc4236d32786c62f6f27a98e7fe7e550807" } +pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", rev = "ec180313e410915ed5e319358628260f9d1f3b53" } [features] default = ["std"] diff --git a/tokens/src/mock.rs b/tokens/src/mock.rs index 85229a7..6484659 100644 --- a/tokens/src/mock.rs +++ b/tokens/src/mock.rs @@ -98,6 +98,7 @@ parameter_types! { pub const Burn: Permill = Permill::from_percent(50); pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry"); pub const GetTokenId: CurrencyId = DOT; + pub const MaxApprovals: u32 = 100; } impl pallet_treasury::Config for Runtime { @@ -114,6 +115,7 @@ impl pallet_treasury::Config for Runtime { type BurnDestination = (); type SpendFunds = (); type WeightInfo = (); + type MaxApprovals = MaxApprovals; } thread_local! { diff --git a/traits/src/lib.rs b/traits/src/lib.rs index 7ec0efb..ff3c3b9 100644 --- a/traits/src/lib.rs +++ b/traits/src/lib.rs @@ -27,7 +27,7 @@ pub mod auction; pub mod currency; pub mod data_provider; pub mod get_by_key; -pub mod location; +// pub mod location; pub mod nft; pub mod price; pub mod rewards; -- GitLab