Skip to content
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.

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

Feature/plmc-377-update-to-polkadot-100 #123

Merged
merged 96 commits into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
e7cf200
feat(287): parachain information discovery and channel opening
JuaniRios Oct 9, 2023
b0e0258
first commit
JuaniRios Oct 26, 2023
01fbe0a
save
JuaniRios Oct 27, 2023
396e1c8
penpal local fork
JuaniRios Oct 30, 2023
8549be2
save
JuaniRios Oct 30, 2023
3fd4ee0
save
JuaniRios Oct 31, 2023
b272479
save
JuaniRios Nov 7, 2023
4aeb55e
HRMP establishment successfully mocked!
JuaniRios Nov 7, 2023
223c4cd
pallet-funding tests fixed
JuaniRios Nov 7, 2023
f96b048
migration check working
JuaniRios Nov 8, 2023
5713267
Merge branch 'main' into feature/plmc-288-receiver-pallet
JuaniRios Nov 8, 2023
3782ac6
fixes
JuaniRios Nov 8, 2023
85e817f
add cargo lock
JuaniRios Nov 8, 2023
f76ad0e
dmp fix
JuaniRios Nov 9, 2023
373345e
formatting
JuaniRios Nov 9, 2023
94f4229
small fixed
JuaniRios Nov 9, 2023
6801c51
fixes
JuaniRios Nov 9, 2023
25d5919
Merge branch 'main' into feature/plmc-290-xcm-instruction-that-reveal…
JuaniRios Nov 9, 2023
258746f
save
JuaniRios Nov 10, 2023
483dd10
compiling, unit converion to map
JuaniRios Nov 10, 2023
3c22eda
revert staking changes
JuaniRios Nov 13, 2023
308b955
saving now evaluation reward and move to u64 for migration
JuaniRios Nov 13, 2023
f1bae11
save
JuaniRios Nov 13, 2023
154ee8a
save
JuaniRios Nov 13, 2023
79adcc9
migration is successfully sent and reflected in the system
JuaniRios Nov 14, 2023
88eeb2a
vesting scheduling working in polimec-receiver
JuaniRios Nov 14, 2023
62adc46
save: starting to implement transact response, but we need to store a…
JuaniRios Nov 14, 2023
85bdfb9
save
JuaniRios Nov 15, 2023
1b4d8bb
Migration for a single user working fully and tested
JuaniRios Nov 15, 2023
7d27c36
Everything works!
JuaniRios Nov 15, 2023
26ae34e
pallet_funding test broken currently
JuaniRios Nov 15, 2023
5275f2f
bug found in evaluation unbonding by cleaner. Still an infinite loop …
JuaniRios Nov 16, 2023
41a3465
all bugs squashed B)
JuaniRios Nov 16, 2023
1888e79
Merge branch 'main' into feature/plmc-290-xcm-instruction-that-reveal…
JuaniRios Nov 16, 2023
a8e5dff
Merge branch 'feature/plmc-290-xcm-instruction-that-reveals-polimecs-…
JuaniRios Nov 16, 2023
0095a22
need to find a way to generate function from a new macro
JuaniRios Nov 16, 2023
f1c8bfa
need to find a way to generate function from a new macro
JuaniRios Nov 17, 2023
a87cff2
e2e tests successfully adapted to the xcm emulator
JuaniRios Nov 21, 2023
a65814a
Testnet now using Oracle, and e2e successfully passing.
JuaniRios Nov 21, 2023
9c0b29b
not all xcmp messages being received
JuaniRios Nov 21, 2023
bd07a48
save
JuaniRios Nov 22, 2023
901d741
cleanup
JuaniRios Nov 23, 2023
9c627a8
fmt
JuaniRios Nov 23, 2023
251882b
Merge branch 'main' into feature/plmc-291-extrinsic-that-does-one-mig…
JuaniRios Nov 23, 2023
d0b1827
fixes
JuaniRios Nov 23, 2023
1d72b75
Merge branch 'feature/plmc-291-extrinsic-that-does-one-migration' int…
JuaniRios Nov 23, 2023
c10f4d6
save
JuaniRios Nov 24, 2023
c0d2451
limiting 5 migrations per block works
JuaniRios Nov 28, 2023
899c258
Merge branch 'main' into feature/plmc-359-migrations-being-put-into-o…
JuaniRios Nov 28, 2023
c698ce8
fmt
JuaniRios Nov 28, 2023
5cb739f
save
JuaniRios Nov 28, 2023
4e0a6c3
back to normal migration without bundling per block, now works for so…
JuaniRios Nov 28, 2023
ad0bdc0
final commit
JuaniRios Nov 29, 2023
0780656
first commit
JuaniRios Nov 29, 2023
8a098bd
ct migration tests refactor
JuaniRios Nov 29, 2023
90558f0
stable
JuaniRios Nov 29, 2023
6b03214
using generate_accounts! macro in all integration tests
JuaniRios Nov 30, 2023
6401c3c
wip
JuaniRios Nov 30, 2023
e5a27e2
big refactor
JuaniRios Nov 30, 2023
18ec093
almost there
JuaniRios Nov 30, 2023
968c6e1
working
JuaniRios Dec 1, 2023
f5c51f3
Merge branch 'main' into feature/plmc-365-disallow-duplicated-migrati…
JuaniRios Dec 4, 2023
7c37160
final changes
JuaniRios Dec 4, 2023
76b36b3
fix: add try-runtime feature
lrazovic Dec 6, 2023
1e90ae1
fix: align the workspace features
lrazovic Dec 6, 2023
feb5e89
wip: initial dependencies bump
lrazovic Dec 6, 2023
34f07e0
feat: executor bump
lrazovic Dec 6, 2023
829bfb7
feat: linear-release bump
lrazovic Dec 6, 2023
d833462
feta: use the new GenesisBuild implementation
lrazovic Dec 6, 2023
2c133b7
feat: funding bump
lrazovic Dec 6, 2023
236ee43
feat: staking bump
lrazovic Dec 6, 2023
ba56bef
chore: re-enable integration tests
lrazovic Dec 6, 2023
e1ccda1
chore: runtime bump
lrazovic Dec 6, 2023
bb4165d
fix: xcm config update. Thank you Just!
lrazovic Dec 6, 2023
8b9312e
chore: fmt
lrazovic Dec 6, 2023
e59dbd2
chore: bump node
lrazovic Dec 6, 2023
0b62c25
chore: bump integration-tests
lrazovic Dec 6, 2023
a0b0641
fix: testing-node now uses BuildGenesisConfig
lrazovic Dec 6, 2023
fb1065d
fix: benchmarks are now working again
lrazovic Dec 6, 2023
0d70077
chore: upgrade lock
lrazovic Dec 7, 2023
6bdb2a6
deat: use Debian 12 as base image
lrazovic Dec 7, 2023
40dbbad
Update base chain spec for Rococo
lrazovic Dec 7, 2023
45e10c1
feat: add rolimec genesis
lrazovic Dec 7, 2023
585944d
feat: remove unused imports
lrazovic Dec 7, 2023
0e239db
save
JuaniRios Dec 7, 2023
f44012f
new migration generator from eval/bid/contr
JuaniRios Dec 7, 2023
168c9dc
Merge branch 'feature/plmc-365-disallow-duplicated-migrations-on-poli…
lrazovic Dec 7, 2023
2859f82
fix warnings
JuaniRios Dec 7, 2023
283f1fb
remove clone from known type that implements `Copy`
JuaniRios Dec 7, 2023
5447d8d
Merge branch 'feature/plmc-365-disallow-duplicated-migrations-on-poli…
lrazovic Dec 7, 2023
7cce090
Merge branch 'main' into feature/plmc-377-update-to-polkadot-100
lrazovic Dec 7, 2023
1b19f86
chore: fix after the online merge
lrazovic Dec 7, 2023
5712ae4
chore: run srtool
lrazovic Dec 7, 2023
b7e8320
chore: fix benchmarks
lrazovic Dec 7, 2023
9deab1c
chore: add integration tests to the justfile
lrazovic Dec 7, 2023
b7612e7
fix: update CLI and runtime imports
lrazovic Dec 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
2,974 changes: 1,072 additions & 1,902 deletions Cargo.lock

Large diffs are not rendered by default.

249 changes: 125 additions & 124 deletions Cargo.toml

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ COPY . /polimec
RUN cargo build --locked --release -p $PACKAGE

# This is the 2nd stage: a very small image where we copy the Polkadot binary."
FROM gcr.io/distroless/cc
FROM debian:bookworm-slim
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change is necessary in order to build an image compatible with Debian 12 that still uses glibc 2.36 when the latest version is 2.38

ARG PACKAGE
COPY --from=builder /polimec/target/release/$PACKAGE /usr/local/bin/polimec

EXPOSE 30333 9933 9944 9615
VOLUME ["/data"]

ENTRYPOINT ["/usr/local/bin/polimec"]
ENTRYPOINT ["/usr/bin/bash"]
33 changes: 16 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
### Step 1: Compile the relay chain and add it to $PATH

- Clone the [Polkadot Repository](https://github.com/paritytech/polkadot)
- Checkout the `release-v0.9.43` branch
- Checkout the `release-v1.0.0` branch
- Compile it using `cargo b -r -p polkadot`
- Add the binary to your $PATH, e.g.
`cp target/release/polkadot ~/.local/bin/polkadot`
Expand Down Expand Up @@ -42,29 +42,28 @@ $ cargo run --release -- --dev

You can use [srtool](https://github.com/paritytech/srtool) to compile the
runtime and generate the WASM blob.
> TODO: Rust 1.69.0 broke `srtool` and `polkadot-v0.9.43` - we need to wait `polkadot-v0.9.43`. [src](https://github.com/paritytech/srtool/issues/62)

```
== Compact
Version : polimec-node-1 (polimec-node-0.tx1.au1)
Version : polimec-mainnet-2 (polimec-mainnet-0.tx1.au1)
Metadata : V14
Size : 3.04 MB (3192701 bytes)
setCode : 0x58fe8e8e8a2f18ada059ec4be28e9ae9e587c9d9030d131fd1490642430e210d
authorizeUpgrade : 0x652e9ff841af94b66059ea5e824b707b143afd133059f3e668445ceef0d0adde
IPFS : QmV9JDMFT96ir1mWVXbTYsNRTGffzEpN7NtDBVsoCMDYhe
BLAKE2_256 : 0x5a3305ff9dd3e1cee8686e6f2deacf8e4e44d8b09f8f37be91bdeb01b6a75d5f
Wasm : runtimes/testnet//target/srtool/production/wbuild/polimec-parachain-runtime/polimec_parachain_runtime.compact.wasm
Size : 5.95 MB (6238415 bytes)
setCode : 0x0582b7c4d42bb46593ac2788d17c3d083eedfbc9d8ef3fb0c912378189d44f94
authorizeUpgrade : 0xe8d26589c2c5257c3f52e21ba420eb0c6fd25fa5cee0878bc183ca0256dee9bc
IPFS : Qmbi9ymmCdJVJCLsBAmYKWGYgYjGuHJLRdCPj9fvXQ3X9U
BLAKE2_256 : 0x7ac6016ddf9179bb2d6d0284df4d60323519f20016647ba887057756d131b51e
Wasm : runtimes/testnet/target/srtool/release/wbuild/polimec-parachain-runtime/polimec_parachain_runtime.compact.wasm

== Compressed
Version : polimec-node-1 (polimec-node-0.tx1.au1)
Version : polimec-mainnet-2 (polimec-mainnet-0.tx1.au1)
Metadata : V14
Size : 761.35 KB (779620 bytes)
Compression : 75.59%
setCode : 0x552b913183ee59beca9bc1181dfeee1df8d7d0f3957d26a5dc0a0b3be51aeb22
authorizeUpgrade : 0x17a8fb876f0762636da732a5675f8b2e8e45b2360e1706dc74e74e8efa0a43e1
IPFS : QmRSgzykaEhC5ADgtqVPHn1sUn1XXN2CmdDEopL4gw9LDe
BLAKE2_256 : 0xe0b45ff9c7afaff573df61f5424f392ca1bb1e397d091424f5bf7b5b16fde16b
Wasm : runtimes/testnet//target/srtool/production/wbuild/polimec-parachain-runtime/polimec_parachain_runtime.compact.compressed.wasm
Size : 1.20 MB (1255405 bytes)
Compression : 79.88%
setCode : 0x84730f2715acaba69361390edf28cc788e0ebdf491380d02764f78f0c702ecb9
authorizeUpgrade : 0x8dcd2827b4c86be23da13a93a8d63a38ad4952c1450738ed8471982bcb4fc714
IPFS : QmPFr7QRFKM5jSuYfBNAg21dfiKEpvMxXMydLDZuW9yLFH
BLAKE2_256 : 0x7341cc921de52eaea99af5865c3e36562cf49158dcb961daef3c2e06f531ae00
Wasm : runtimes/testnet/target/srtool/release/wbuild/polimec-parachain-runtime/polimec_parachain_runtime.compact.compressed.wasm
```

- A collection of useful scripts are available in the `scripts` folder, there is
Expand Down
108 changes: 108 additions & 0 deletions chain-specs/rococo/plain-rolimec.json

Large diffs are not rendered by default.

83 changes: 83 additions & 0 deletions chain-specs/rococo/rawlimec.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions chain-specs/rococo/rolimec-3344.state
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0x00000000000000000000000000000000000000000000000000000000000000000048cf7e50ba3cfb63c155ec38da34bd43ab020b5492f737deed5a9fc96c4b50bd03170a2e7597b7b7e3d84c05391d139a62b157e78786d8c082f29dcf4c11131400
1 change: 1 addition & 0 deletions chain-specs/rococo/rolimec-3344.wasm

Large diffs are not rendered by default.

18 changes: 14 additions & 4 deletions integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ pallet-vesting.workspace = true

# Runtimes
polkadot-runtime.workspace = true
statemint-runtime.workspace = true
asset-hub-polkadot-runtime.workspace = true
polimec-parachain-runtime.workspace = true
penpal-runtime = { path = "./penpal", default-features = false }
itertools.workspace = true
Expand All @@ -72,11 +72,13 @@ itertools.workspace = true
default = [ "std" ]

std = [
"asset-hub-polkadot-runtime/std",
"cumulus-pallet-xcm/std",
"cumulus-pallet-xcmp-queue/std",
"cumulus-primitives-core/std",
"frame-support/std",
"frame-system/std",
"itertools/use_std",
"orml-oracle/std",
"pallet-assets/std",
"pallet-balances/std",
Expand All @@ -93,6 +95,7 @@ std = [
"penpal-runtime/std",
"polimec-parachain-runtime/std",
"polimec-receiver/std",
"polimec-traits/std",
"polkadot-core-primitives/std",
"polkadot-parachain/std",
"polkadot-primitives/std",
Expand All @@ -107,17 +110,18 @@ std = [
"sp-io/std",
"sp-runtime/std",
"sp-std/std",
"statemint-runtime/std",
"xcm-builder/std",
"xcm-executor/std",
"xcm/std",
"itertools/use_std"
]

runtime-benchmarks = [
"asset-hub-polkadot-runtime/runtime-benchmarks",
"cumulus-pallet-xcmp-queue/runtime-benchmarks",
"frame-support/runtime-benchmarks",
"frame-system/runtime-benchmarks",
"itertools/use_alloc",
"pallet-assets/runtime-benchmarks",
"pallet-balances/runtime-benchmarks",
"pallet-funding/runtime-benchmarks",
Expand All @@ -130,13 +134,13 @@ runtime-benchmarks = [
"penpal-runtime/runtime-benchmarks",
"polimec-parachain-runtime/runtime-benchmarks",
"polimec-receiver/runtime-benchmarks",
"polimec-traits/runtime-benchmarks",
"polkadot-parachain/runtime-benchmarks",
"polkadot-primitives/runtime-benchmarks",
"polkadot-runtime-parachains/runtime-benchmarks",
"polkadot-runtime/runtime-benchmarks",
"polkadot-service/runtime-benchmarks",
"sp-runtime/runtime-benchmarks",
"statemint-runtime/runtime-benchmarks",
"xcm-builder/runtime-benchmarks",
"xcm-executor/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
Expand All @@ -146,6 +150,12 @@ testing-node = [
"pallet-funding/testing-node",
"polimec-parachain-runtime/testing-node",
]
try-runtime = []
try-runtime = [
"pallet-funding/try-runtime",
"penpal-runtime/try-runtime",
"polimec-parachain-runtime/try-runtime",
"polimec-receiver/try-runtime",
"polimec-traits/try-runtime",
]
fast-gov = [ "polimec-parachain-runtime/fast-gov" ]

5 changes: 4 additions & 1 deletion integration-tests/penpal/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2021"
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
substrate-wasm-builder = { git = "https://github.com/paritytech/substrate", optional = true , branch = "polkadot-v0.9.43" }
substrate-wasm-builder = { optional = true , workspace = true}

[dependencies]
codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive"] }
Expand Down Expand Up @@ -117,6 +117,7 @@ std = [
"parachain-info/std",
"parachains-common/std",
"polimec-receiver/std",
"polimec-traits/std",
"polkadot-parachain/std",
"polkadot-primitives/std",
"polkadot-runtime-common/std",
Expand Down Expand Up @@ -157,6 +158,7 @@ runtime-benchmarks = [
"pallet-vesting/runtime-benchmarks",
"pallet-xcm/runtime-benchmarks",
"polimec-receiver/runtime-benchmarks",
"polimec-traits/runtime-benchmarks",
"polkadot-parachain/runtime-benchmarks",
"polkadot-primitives/runtime-benchmarks",
"polkadot-runtime-common/runtime-benchmarks",
Expand Down Expand Up @@ -190,6 +192,7 @@ try-runtime = [
"pallet-xcm/try-runtime",
"parachain-info/try-runtime",
"polimec-receiver/try-runtime",
"polimec-traits/try-runtime",
"polkadot-runtime-common/try-runtime",
"polkadot-runtime-parachains/try-runtime",
"sp-runtime/try-runtime",
Expand Down
37 changes: 16 additions & 21 deletions integration-tests/penpal/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ use xcm_executor::XcmExecutor;
pub type Balance = u128;

/// Index of a transaction in the chain.
pub type Index = u32;
pub type Nonce = u32;

/// A hash of some data used by the chain.
pub type Hash = sp_core::H256;
Expand Down Expand Up @@ -316,12 +316,12 @@ impl frame_system::Config for Runtime {
type AccountId = AccountId;
/// The basic call filter to use in dispatchable.
type BaseCallFilter = Everything;
/// The block type.
type Block = Block;
/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
type BlockHashCount = BlockHashCount;
/// The maximum length of a block (in bytes).
type BlockLength = RuntimeBlockLength;
/// The index type for blocks.
type BlockNumber = BlockNumber;
/// Block & extrinsics weights: base values and limits.
type BlockWeights = RuntimeBlockWeights;
/// The weight of database operations that the runtime can invoke.
Expand All @@ -330,13 +330,11 @@ impl frame_system::Config for Runtime {
type Hash = Hash;
/// The hashing algorithm used.
type Hashing = BlakeTwo256;
/// The header type.
type Header = generic::Header<BlockNumber, BlakeTwo256>;
/// The index type for storing how many extrinsics an account has signed.
type Index = Index;
/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
type Lookup = AccountIdLookup<AccountId, ()>;
type MaxConsumers = frame_support::traits::ConstU32<16>;
/// The index type for storing how many extrinsics an account has signed.
type Nonce = Nonce;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Index is now Nonce

/// What to do if an account is fully reaped from the system.
type OnKilledAccount = ();
/// What to do if a new account is created.
Expand Down Expand Up @@ -383,14 +381,14 @@ impl pallet_balances::Config for Runtime {
type DustRemoval = ();
type ExistentialDeposit = ExistentialDeposit;
type FreezeIdentifier = ();
type HoldIdentifier = ();
type MaxFreezes = ConstU32<0>;
type MaxHolds = ConstU32<0>;
type MaxLocks = ConstU32<50>;
type MaxReserves = ConstU32<50>;
type ReserveIdentifier = [u8; 8];
/// The ubiquitous event type.
type RuntimeEvent = RuntimeEvent;
type RuntimeHoldReason = ();
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

HoldIdentifier is now RuntimeHoldReason

type WeightInfo = pallet_balances::weights::SubstrateWeight<Runtime>;
}

Expand Down Expand Up @@ -503,6 +501,7 @@ impl pallet_session::Config for Runtime {
}

impl pallet_aura::Config for Runtime {
type AllowMultipleBlocksPerSlot = frame_support::traits::ConstBool<false>;
type AuthorityId = AuraId;
type DisabledValidators = ();
type MaxAuthorities = ConstU32<100_000>;
Expand All @@ -511,7 +510,6 @@ impl pallet_aura::Config for Runtime {
parameter_types! {
pub const PotId: PalletId = PalletId(*b"PotStake");
pub const MaxCandidates: u32 = 1000;
pub const MinCandidates: u32 = 5;
pub const SessionLength: BlockNumber = 6 * HOURS;
pub const MaxInvulnerables: u32 = 100;
pub const ExecutiveBody: BodyId = BodyId::Executive;
Expand All @@ -526,7 +524,7 @@ impl pallet_collator_selection::Config for Runtime {
type KickThreshold = Period;
type MaxCandidates = MaxCandidates;
type MaxInvulnerables = MaxInvulnerables;
type MinCandidates = MinCandidates;
type MinEligibleCollators = frame_support::traits::ConstU32<1>;
type PotId = PotId;
type RuntimeEvent = RuntimeEvent;
type UpdateOrigin = CollatorSelectionUpdateOrigin;
Expand Down Expand Up @@ -602,18 +600,15 @@ impl polkadot_runtime_parachains::origin::Config for Runtime {}

// Create the runtime by composing the FRAME pallets that were previously configured.
construct_runtime!(
pub enum Runtime where
Block = Block,
NodeBlock = opaque::Block,
UncheckedExtrinsic = UncheckedExtrinsic,
pub enum Runtime
{
// System support stuff.
System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
ParachainSystem: cumulus_pallet_parachain_system::{
Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned,
Pallet, Call, Config<T>, Storage, Inherent, Event<T>, ValidateUnsigned,
} = 1,
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 2,
ParachainInfo: parachain_info::{Pallet, Storage, Config} = 3,
ParachainInfo: parachain_info::{Pallet, Storage, Config<T>} = 3,
ParachainOrigin: polkadot_runtime_parachains::origin = 4,

// Monetary stuff.
Expand All @@ -626,11 +621,11 @@ construct_runtime!(
CollatorSelection: pallet_collator_selection::{Pallet, Call, Storage, Event<T>, Config<T>} = 21,
Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>} = 22,
Aura: pallet_aura::{Pallet, Storage, Config<T>} = 23,
AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config} = 24,
AuraExt: cumulus_pallet_aura_ext::{Pallet, Storage, Config<T>} = 24,

// XCM helpers.
XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 30,
PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config} = 31,
PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin, Config<T>} = 31,
CumulusXcm: cumulus_pallet_xcm::{Pallet, Event<T>, Origin} = 32,
DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 33,

Expand Down Expand Up @@ -748,8 +743,8 @@ impl_runtime_apis! {
}
}

impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
fn account_nonce(account: AccountId) -> Index {
impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Nonce> for Runtime {
fn account_nonce(account: AccountId) -> Nonce {
System::account_nonce(account)
}
}
Expand Down
11 changes: 6 additions & 5 deletions integration-tests/penpal/src/xcm_config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@ use frame_support::{
use frame_system::EnsureRoot;
use pallet_asset_tx_payment::HandleCredit;
use pallet_xcm::XcmPassthrough;
use parachains_common::xcm_config::{DenyReserveTransferToRelayChain, DenyThenTry};
use polkadot_parachain::primitives::Sibling;
use polkadot_runtime_common::impls::ToAuthor;
use sp_runtime::traits::Zero;
use xcm::latest::prelude::*;
use xcm_builder::{
AccountId32Aliases, AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, CurrencyAdapter, EnsureXcmOrigin,
FixedWeightBounds, FungiblesAdapter, IsConcrete, LocalMint, NativeAsset, ParentIsPreset, RelayChainAsNative,
SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32,
SovereignSignedViaLocation, TakeWeightCredit, UsingComponents, WithComputedOrigin,
AllowTopLevelPaidExecutionFrom, AsPrefixedGeneralIndex, ConvertedConcreteId, CurrencyAdapter,
DenyReserveTransferToRelayChain, DenyThenTry, EnsureXcmOrigin, FixedWeightBounds, FungiblesAdapter, IsConcrete,
LocalMint, NativeAsset, ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, UsingComponents,
WithComputedOrigin,
};
use xcm_executor::{traits::JustTry, XcmExecutor};

Expand Down Expand Up @@ -269,6 +269,7 @@ pub type Reserves = (NativeAsset, AssetsFrom<CommonGoodAssetsLocation>);

pub struct XcmConfig;
impl xcm_executor::Config for XcmConfig {
type Aliasers = Nothing;
type AssetClaims = PolkadotXcm;
type AssetExchanger = ();
type AssetLocker = ();
Expand Down
Loading