Skip to content
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
42df3b6
assets xcm
girazoki Dec 8, 2023
b1fda83
assets for xcm
girazoki Dec 8, 2023
33c2d7b
adapt to moonkit branches
girazoki Jan 9, 2024
32ce09d
FMT
girazoki Jan 9, 2024
5842f0d
Merge remote-tracking branch 'origin/master' into girazoki-assets-xcm
girazoki Jan 9, 2024
8d2abd0
asset-rate pallet
girazoki Jan 9, 2024
d50e9dc
add first tests
girazoki Jan 9, 2024
c0463bc
first test working
girazoki Jan 10, 2024
b63647f
first test where we also test that we charge the correct amount
girazoki Jan 10, 2024
dcb3e5c
add todo
girazoki Jan 10, 2024
5c86527
fix a few things
girazoki Jan 10, 2024
5399e2e
zepter and toml maid
girazoki Jan 10, 2024
ae15c8d
fmt
girazoki Jan 10, 2024
edd44a7
benchmark helper
girazoki Jan 10, 2024
1797e81
xcm
girazoki Jan 10, 2024
a0caf51
clean unused imports
girazoki Jan 10, 2024
637e102
fmt and api
girazoki Jan 10, 2024
90821c0
more tests
girazoki Jan 10, 2024
9ae6a16
first steps into accepting tokens from containers too
girazoki Jan 11, 2024
6317a32
fmt
girazoki Jan 11, 2024
c8ba12e
add some more test
girazoki Jan 11, 2024
d5a0f0e
todoS
girazoki Jan 11, 2024
97c8d4c
fmt
girazoki Jan 11, 2024
ed7c15e
more checks
girazoki Jan 11, 2024
19a17a3
FMT
girazoki Jan 12, 2024
bd8e8ab
a more complete test
girazoki Jan 12, 2024
536431f
overflow accounting
girazoki Jan 12, 2024
8612f13
first test proving reception
girazoki Jan 12, 2024
976fdea
without asset-rate, tokens are not received
girazoki Jan 12, 2024
ed77208
new hrmp test
girazoki Jan 12, 2024
a041352
lint
girazoki Jan 12, 2024
d97a0d3
additional tests
girazoki Jan 15, 2024
c4b7e07
add additional test
girazoki Jan 15, 2024
b7189a5
remove spaces in tests
girazoki Jan 17, 2024
a9c3f42
interfaces
girazoki Jan 17, 2024
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
45 changes: 34 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ pallet-evm-precompile-balances-erc20 = { git = "https://github.com/moondance-lab
pallet-evm-precompile-batch = { git = "https://github.com/moondance-labs/moonkit", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-evm-precompile-call-permit = { git = "https://github.com/moondance-labs/moonkit", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-evm-precompile-xcm-utils = { git = "https://github.com/moondance-labs/moonkit", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-foreign-asset-creator = { git = "https://github.com/moondance-labs/moonkit", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-maintenance-mode = { git = "https://github.com/moondance-labs/moonkit", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-migrations = { git = "https://github.com/moondance-labs/moonkit", branch = "tanssi-polkadot-v1.3.0", default-features = false }
xcm-primitives = { git = "https://github.com/moondance-labs/moonkit", branch = "tanssi-polkadot-v1.3.0", default-features = false }
Expand All @@ -83,6 +84,8 @@ frame-system = { git = "https://github.com/moondance-labs/polkadot-sdk.git", bra
frame-system-benchmarking = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
frame-system-rpc-runtime-api = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
frame-try-runtime = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-asset-rate = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-assets = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-balances = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-identity = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
pallet-im-online = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
Expand Down Expand Up @@ -192,6 +195,7 @@ cumulus-primitives-core = { git = "https://github.com/moondance-labs/polkadot-sd
cumulus-primitives-timestamp = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
cumulus-primitives-utility = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
parachain-info = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
parachains-common = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }

# Cumulus (client)
cumulus-client-cli = { git = "https://github.com/moondance-labs/polkadot-sdk", branch = "tanssi-polkadot-v1.3.0", default-features = false }
Expand Down
18 changes: 18 additions & 0 deletions runtime/dancebox/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ pallet-services-payment = { workspace = true }
nimbus-primitives = { workspace = true }
pallet-async-backing = { workspace = true }
pallet-author-inherent = { workspace = true }
pallet-foreign-asset-creator = { workspace = true }
pallet-maintenance-mode = { workspace = true, features = [ "xcm-support" ] }
pallet-migrations = { workspace = true }
xcm-primitives = { workspace = true }
Expand All @@ -48,6 +49,8 @@ frame-executive = { workspace = true }
frame-support = { workspace = true }
frame-system = { workspace = true }
frame-system-rpc-runtime-api = { workspace = true }
pallet-asset-rate = { workspace = true }
pallet-assets = { workspace = true }
pallet-balances = { workspace = true }
pallet-identity = { workspace = true }
pallet-root-testing = { workspace = true }
Expand Down Expand Up @@ -98,6 +101,7 @@ cumulus-primitives-timestamp = { workspace = true }
cumulus-primitives-utility = { workspace = true }
pallet-invulnerables = { workspace = true }
parachain-info = { workspace = true }
parachains-common = { workspace = true }

# Benchmarking
frame-benchmarking = { workspace = true, optional = true }
Expand Down Expand Up @@ -153,6 +157,8 @@ std = [
"frame-try-runtime/std",
"log/std",
"nimbus-primitives/std",
"pallet-asset-rate/std",
"pallet-assets/std",
"pallet-async-backing/std",
"pallet-author-inherent/std",
"pallet-author-noting-runtime-api/std",
Expand All @@ -164,6 +170,7 @@ std = [
"pallet-collator-assignment/std",
"pallet-configuration/std",
"pallet-data-preservers/std",
"pallet-foreign-asset-creator/std",
"pallet-identity/std",
"pallet-im-online/std",
"pallet-inflation-rewards/std",
Expand All @@ -189,6 +196,7 @@ std = [
"pallet-xcm-benchmarks?/std",
"pallet-xcm/std",
"parachain-info/std",
"parachains-common/std",
"parity-scale-codec/std",
"polkadot-parachain-primitives/std",
"polkadot-runtime-common/std",
Expand Down Expand Up @@ -243,12 +251,15 @@ runtime-benchmarks = [
"frame-system-benchmarking/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"nimbus-primitives/runtime-benchmarks",
"pallet-asset-rate/runtime-benchmarks",
"pallet-assets/runtime-benchmarks",
"pallet-author-inherent/runtime-benchmarks",
"pallet-author-noting/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-collator-assignment/runtime-benchmarks",
"pallet-configuration/runtime-benchmarks",
"pallet-data-preservers/runtime-benchmarks",
"pallet-foreign-asset-creator/runtime-benchmarks",
"pallet-identity/runtime-benchmarks",
"pallet-im-online/runtime-benchmarks",
"pallet-inflation-rewards/runtime-benchmarks",
Expand All @@ -266,6 +277,7 @@ runtime-benchmarks = [
"pallet-utility/runtime-benchmarks",
"pallet-xcm-benchmarks/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"parachains-common/runtime-benchmarks",
"polkadot-parachain-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
Expand All @@ -290,6 +302,10 @@ try-runtime = [
"frame-system/try-runtime",
"frame-try-runtime/try-runtime",
"nimbus-primitives/try-runtime",
"pallet-asset-rate/try-runtime",
"pallet-asset-rate/try-runtime",
"pallet-assets/try-runtime",
"pallet-assets/try-runtime",
"pallet-author-inherent/try-runtime",
"pallet-author-noting/try-runtime",
"pallet-authority-assignment/try-runtime",
Expand All @@ -298,6 +314,8 @@ try-runtime = [
"pallet-collator-assignment/try-runtime",
"pallet-configuration/try-runtime",
"pallet-data-preservers/try-runtime",
"pallet-foreign-asset-creator/try-runtime",
"pallet-foreign-asset-creator/try-runtime",
"pallet-identity/try-runtime",
"pallet-im-online/try-runtime",
"pallet-inflation-rewards/try-runtime",
Expand Down
4 changes: 4 additions & 0 deletions runtime/dancebox/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1413,6 +1413,9 @@ construct_runtime!(
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 51,
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 52,
PolkadotXcm: pallet_xcm::{Pallet, Call, Storage, Event<T>, Origin, Config<T>} = 53,
ForeignAssets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>} = 54,
ForeignAssetsCreator: pallet_foreign_asset_creator::{Pallet, Call, Storage, Event<T>} = 55,
AssetRate: pallet_asset_rate::{Pallet, Call, Storage, Event<T>} = 56,

RootTesting: pallet_root_testing = 100,
AsyncBacking: pallet_async_backing::{Pallet, Storage} = 110,
Expand All @@ -1430,6 +1433,7 @@ mod benches {
[pallet_invulnerables, Invulnerables]
[pallet_pooled_staking, PooledStaking]
[pallet_services_payment, ServicesPayment]
[pallet_foreign_asset_creator, ForeignAssetsCreator]
[pallet_data_preservers, DataPreservers]
[pallet_xcm_benchmarks::generic, pallet_xcm_benchmarks::generic::Pallet::<Runtime>]
);
Expand Down
Loading