From fd0a6d387def9db43245091a3ae3acc28e93ccf2 Mon Sep 17 00:00:00 2001 From: Benoit Devos Date: Tue, 21 Nov 2023 18:33:38 +0100 Subject: [PATCH] feat: turn payout_collators into payout_legal_officers. logion-network/logion-internal#1066 --- Cargo.lock | 60 +++++++++++++++++++++++----------------------- runtime/src/lib.rs | 24 ++++++++----------- 2 files changed, 40 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 68ccb8c..ea88ace 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -985,9 +985,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36" +checksum = "e34637b3140142bdf929fb439e8aa4ebad7651ebf7b1080b3930aa16ac1459ff" dependencies = [ "serde", ] @@ -1508,9 +1508,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28f85c3514d2a6e64160359b45a3918c3b4178bcbf4ae5d03ab2d02e521c479a" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", @@ -2040,7 +2040,7 @@ checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der 0.7.8", "digest 0.10.7", - "elliptic-curve 0.13.7", + "elliptic-curve 0.13.8", "rfc6979 0.4.0", "signature 2.2.0", "spki 0.7.2", @@ -2115,12 +2115,12 @@ dependencies = [ [[package]] name = "elliptic-curve" -version = "0.13.7" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9775b22bc152ad86a0cf23f0f348b884b26add12bf741e7ffc4d4ab2ab4d205" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.4", + "crypto-bigint 0.5.5", "digest 0.10.7", "ff 0.13.0", "generic-array 0.14.7", @@ -2655,9 +2655,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.10.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb5fd9bcbe8b1087cbd395b51498c01bc997cef73e778a80b77a811af5e2d29f" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" dependencies = [ "autocfg", ] @@ -3443,7 +3443,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" dependencies = [ "hermit-abi 0.3.3", - "rustix 0.38.24", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -3632,7 +3632,7 @@ checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b" dependencies = [ "cfg-if", "ecdsa 0.16.9", - "elliptic-curve 0.13.7", + "elliptic-curve 0.13.8", "once_cell", "sha2 0.10.8", ] @@ -4387,7 +4387,7 @@ dependencies = [ [[package]] name = "logion-shared" version = "0.1.1" -source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#f76cdaf4237cdfbc134d99289666ba2ba33ef917" +source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#003e5d81c306752023af735513aa5c95008895bd" dependencies = [ "frame-support", "frame-system", @@ -4551,7 +4551,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.38.24", + "rustix 0.38.25", ] [[package]] @@ -5125,7 +5125,7 @@ dependencies = [ [[package]] name = "pallet-block-reward" version = "0.1.0" -source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#f76cdaf4237cdfbc134d99289666ba2ba33ef917" +source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#003e5d81c306752023af735513aa5c95008895bd" dependencies = [ "frame-support", "frame-system", @@ -5164,7 +5164,7 @@ dependencies = [ [[package]] name = "pallet-lo-authority-list" version = "0.1.1" -source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#f76cdaf4237cdfbc134d99289666ba2ba33ef917" +source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#003e5d81c306752023af735513aa5c95008895bd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5181,7 +5181,7 @@ dependencies = [ [[package]] name = "pallet-logion-loc" version = "0.4.0" -source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#f76cdaf4237cdfbc134d99289666ba2ba33ef917" +source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#003e5d81c306752023af735513aa5c95008895bd" dependencies = [ "frame-benchmarking", "frame-support", @@ -5199,7 +5199,7 @@ dependencies = [ [[package]] name = "pallet-logion-vault" version = "0.1.1" -source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#f76cdaf4237cdfbc134d99289666ba2ba33ef917" +source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#003e5d81c306752023af735513aa5c95008895bd" dependencies = [ "frame-support", "frame-system", @@ -5215,7 +5215,7 @@ dependencies = [ [[package]] name = "pallet-logion-vote" version = "0.1.0" -source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#f76cdaf4237cdfbc134d99289666ba2ba33ef917" +source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#003e5d81c306752023af735513aa5c95008895bd" dependencies = [ "frame-support", "frame-system", @@ -5379,7 +5379,7 @@ dependencies = [ [[package]] name = "pallet-verified-recovery" version = "0.1.1" -source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#f76cdaf4237cdfbc134d99289666ba2ba33ef917" +source = "git+https://github.com/logion-network/logion-pallets?branch=polkadot-v1.2.0#003e5d81c306752023af735513aa5c95008895bd" dependencies = [ "frame-support", "frame-system", @@ -6503,9 +6503,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.24" +version = "0.38.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234" +checksum = "dc99bc2d4f1fed22595588a013687477aedf3cdcfb26558c559edb67b4d9b22e" dependencies = [ "bitflags 2.4.1", "errno", @@ -7720,18 +7720,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001" +checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.192" +version = "1.0.193" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1" +checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" dependencies = [ "proc-macro2", "quote", @@ -8992,7 +8992,7 @@ dependencies = [ "cfg-if", "fastrand 2.0.1", "redox_syscall 0.4.1", - "rustix 0.38.24", + "rustix 0.38.25", "windows-sys 0.48.0", ] @@ -9664,9 +9664,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" [[package]] name = "uuid" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ "getrandom 0.2.11", ] @@ -10338,7 +10338,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.24", + "rustix 0.38.25", ] [[package]] diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs index ff4d265..5bd2f12 100644 --- a/runtime/src/lib.rs +++ b/runtime/src/lib.rs @@ -292,7 +292,7 @@ impl pallet_balances::Config for Runtime { parameter_types! { pub const InclusionFeesDistributionKey: DistributionKey = DistributionKey { - collators_percent: Percent::from_percent(35), + legal_officers_percent: Percent::from_percent(35), community_treasury_percent: Percent::from_percent(30), logion_treasury_percent: Percent::from_percent(35), loc_owner_percent: Percent::from_percent(0), @@ -305,7 +305,7 @@ parameter_types! { // We thus mint 10 LGNT every block pub const InflationAmount: Balance = 10 * LGNT; pub const InflationDistributionKey: DistributionKey = DistributionKey { - collators_percent: Percent::from_percent(35), + legal_officers_percent: Percent::from_percent(35), community_treasury_percent: Percent::from_percent(30), logion_treasury_percent: Percent::from_percent(35), loc_owner_percent: Percent::from_percent(0), @@ -314,7 +314,7 @@ parameter_types! { pub const FileStorageByteFee: Balance = 100 * NANO_LGNT; // 0.1 LGNT per MB pub const FileStorageEntryFee: Balance = 0; pub const FileStorageFeeDistributionKey: DistributionKey = DistributionKey { - collators_percent: Percent::from_percent(80), + legal_officers_percent: Percent::from_percent(80), community_treasury_percent: Percent::from_percent(20), logion_treasury_percent: Percent::from_percent(0), loc_owner_percent: Percent::from_percent(0), @@ -322,35 +322,35 @@ parameter_types! { pub const CertificateFee: Balance = 4 * MILLI_LGNT; // 0.004 LGNT pub const CertificateFeeDistributionKey: DistributionKey = DistributionKey { - collators_percent: Percent::from_percent(20), + legal_officers_percent: Percent::from_percent(20), community_treasury_percent: Percent::from_percent(80), logion_treasury_percent: Percent::from_percent(0), loc_owner_percent: Percent::from_percent(0), }; pub const ValueFeeDistributionKey: DistributionKey = DistributionKey { - collators_percent: Percent::from_percent(0), + legal_officers_percent: Percent::from_percent(0), community_treasury_percent: Percent::from_percent(0), logion_treasury_percent: Percent::from_percent(100), loc_owner_percent: Percent::from_percent(0), }; pub const RecurentFeeDistributionKey: DistributionKey = DistributionKey { - collators_percent: Percent::from_percent(0), + legal_officers_percent: Percent::from_percent(0), community_treasury_percent: Percent::from_percent(0), logion_treasury_percent: Percent::from_percent(95), loc_owner_percent: Percent::from_percent(5), }; pub const IdentityLocLegalFeeDistributionKey: DistributionKey = DistributionKey { - collators_percent: Percent::from_percent(0), + legal_officers_percent: Percent::from_percent(0), community_treasury_percent: Percent::from_percent(0), logion_treasury_percent: Percent::from_percent(100), loc_owner_percent: Percent::from_percent(0), }; pub const OtherLocLegalFeeDistributionKey: DistributionKey = DistributionKey { - collators_percent: Percent::from_percent(0), + legal_officers_percent: Percent::from_percent(0), community_treasury_percent: Percent::from_percent(0), logion_treasury_percent: Percent::from_percent(0), loc_owner_percent: Percent::from_percent(100), @@ -692,7 +692,7 @@ impl pallet_treasury::Config for Runtime { } pub struct RewardDistributor; -impl logion_shared::RewardDistributor +impl logion_shared::RewardDistributor for RewardDistributor { fn payout_community_treasury(reward: NegativeImbalance) { @@ -701,11 +701,6 @@ impl logion_shared::RewardDistributor } } - fn get_collators() -> Vec { - // On Standalone chain, there are no collators thus validators are rewarded instead - Session::validators() - } - fn payout_logion_treasury(reward: NegativeImbalance) { if reward != NegativeImbalance::zero() { Balances::resolve_creating(&LogionTreasuryPalletId::get().into_account_truncating(), reward); @@ -724,6 +719,7 @@ impl pallet_block_reward::Config for Runtime { type RewardAmount = InflationAmount; type RewardDistributor = RewardDistributor; type DistributionKey = InflationDistributionKey; + type IsLegalOfficer = LoAuthorityList; } // Create the runtime by composing the FRAME pallets that were previously configured.