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.

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

bump encointer protocol pallets to 6.1 #236

Merged
merged 8 commits into from
Mar 15, 2024
Merged

bump encointer protocol pallets to 6.1 #236

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
30c8a15
bump encointer pallets to 6.1 with patch
brenzi Mar 13, 2024
0a0a852
lift patches
brenzi Mar 13, 2024
08adb57
add mandatory migration
brenzi Mar 13, 2024
7e60699
Merge branch 'main' into ab/upgrade-encointer-to-6.1
brenzi Mar 13, 2024
5875fe4
Merge branch 'main' into ab/upgrade-encointer-to-6.1
brenzi Mar 13, 2024
31c24eb
increase meetup size target from 10 to 15
brenzi Mar 13, 2024
1f27f38
Merge branch 'main' into ab/upgrade-encointer-to-6.1
brenzi Mar 15, 2024
ed797f4
Merge branch 'main' into ab/upgrade-encointer-to-6.1
brenzi Mar 15, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Refund any leases that are not migrated to Coretime (have holes in them/have not yet started) ([polkadot-fellows/runtimes#206](https://github.com/polkadot-fellows/runtimes/pull/206))
- Enable Elastic Scaling node side feature for Kusama ([polkadot-fellows/runtimes#205](https://github.com/polkadot-fellows/runtimes/pull/205))
- Cancel Parachain Auctions ([polkadot-fellows/runtimes#215](https://github.com/polkadot-fellows/runtimes/pull/215))
- Upgrade encointer protocol to 6.1.0 ([polkadot-fellows/runtimes#236](https://github.com/polkadot-fellows/runtimes/pull/236))

### Changed

Expand Down
60 changes: 30 additions & 30 deletions Cargo.lock
View file
Open in desktop

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

26 changes: 13 additions & 13 deletions system-parachains/encointer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,19 @@ smallvec = "1.13.1"
# * encointer-* 6.1.x (must not be automatically updated from 6.0.x)
# * patch: ad-lib
#
encointer-balances-tx-payment = { default-features = false, version = "~6.0.0" }
encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
encointer-primitives = { default-features = false, version = "~6.0.2" }
pallet-encointer-balances = { default-features = false, version = "~6.0.0" }
pallet-encointer-bazaar = { default-features = false, version = "~6.0.0" }
pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
pallet-encointer-ceremonies = { default-features = false, version = "~6.0.0" }
pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
pallet-encointer-communities = { default-features = false, version = "~6.0.0" }
pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~6.0.0" }
pallet-encointer-faucet = { default-features = false, version = "~6.0.0" }
pallet-encointer-reputation-commitments = { default-features = false, version = "~6.0.0" }
pallet-encointer-scheduler = { default-features = false, version = "~6.0.0" }
encointer-balances-tx-payment = { default-features = false, version = "~6.1.0" }
encointer-balances-tx-payment-rpc-runtime-api = { default-features = false, version = "~6.1.0" }
encointer-primitives = { default-features = false, version = "~6.1.0" }
pallet-encointer-balances = { default-features = false, version = "~6.1.0" }
pallet-encointer-bazaar = { default-features = false, version = "~6.1.0" }
pallet-encointer-bazaar-rpc-runtime-api = { default-features = false, version = "~6.1.0" }
pallet-encointer-ceremonies = { default-features = false, version = "~6.1.0" }
pallet-encointer-ceremonies-rpc-runtime-api = { default-features = false, version = "~6.1.0" }
pallet-encointer-communities = { default-features = false, version = "~6.1.0" }
pallet-encointer-communities-rpc-runtime-api = { default-features = false, version = "~6.1.0" }
pallet-encointer-faucet = { default-features = false, version = "~6.1.0" }
pallet-encointer-reputation-commitments = { default-features = false, version = "~6.1.0" }
pallet-encointer-scheduler = { default-features = false, version = "~6.1.0" }


# Substrate
Expand Down
3 changes: 2 additions & 1 deletion system-parachains/encointer/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ parameter_types! {
pub const MomentsPerDay: Moment = 86_400_000; // [ms/d]
pub const DefaultDemurrage: Demurrage = Demurrage::from_bits(0x0000000000000000000001E3F0A8A973_i128);
pub const EncointerExistentialDeposit: BalanceType = BalanceType::from_bits(0x0000000000000000000053e2d6238da4_u128);
pub const MeetupSizeTarget: u64 = 10;
pub const MeetupSizeTarget: u64 = 15;
pub const MeetupMinSize: u64 = 3;
pub const MeetupNewbieLimitDivider: u64 = 2; // 2 means 1/3 of participants may be newbies
pub const FaucetPalletId: PalletId = PalletId(*b"ectrfct0");
Expand Down Expand Up @@ -717,6 +717,7 @@ pub type Migrations = (
//then apply the proper migration as we should have done earlier
pallet_balances::migration::MigrateToTrackInactive<Runtime, xcm_config::CheckingAccount>,
cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
pallet_encointer_ceremonies::migrations::v2::MigrateToV2<Runtime>,
// permanent
pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
);
Expand Down
Loading