CSUB-1379: Make danger check more robust #528
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
TEST RESULTS:
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index f0950475..461ff812 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -39,11 +39,12 @@ use frame_support::weights::{constants::ParityDbWeight as RuntimeDbWeight, Weigh
use frame_support::{
construct_runtime, parameter_types,
traits::{
- ConstU128, ConstU32, ConstU8, FindAuthor, InstanceFilter, KeyOwnerProofSystem, OnFinalize,
+ ConstU32, ConstU8, FindAuthor, InstanceFilter, KeyOwnerProofSystem, OnFinalize,
OnTimestampSet,
},
weights::{
- constants::WEIGHT_REF_TIME_PER_MILLIS, ConstantMultiplier, Weight, WeightToFeeCoefficient,
+ constants::WEIGHT_REF_TIME_PER_MILLIS, constants::WEIGHT_REF_TIME_PER_NANOS,
+ ConstantMultiplier, Weight, WeightToFeeCoefficient,
},
PalletId,
};
@@ -149,6 +150,8 @@ pub const MILLISECS_PER_BLOCK: u64 = prod_or_fast!(15_000, 5_000);
pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
+pub const CENTS: u128 = CTC / 100;
+
// WARNING: the next should be defined on a single line b/c of
// the assertions made in .github/check-for-changes-in-epoch-duration.sh
#[rustfmt::skip]
@@ -326,33 +329,34 @@ impl pallet_balances::Config for Runtime {
type MaxFreezes = ();
}
-pub const TARGET_FEE_CREDO: Balance = 10_000_000_000_000_000;
+parameter_types! {
+ /// Executing a NO-OP `System::remarks` Extrinsic.
+ pub const ExtrinsicBaseWeight: Weight =
+ Weight::from_parts(WEIGHT_REF_TIME_PER_NANOS.saturating_mul(125_000), 0);
+}
+
pub struct WeightToCtcFee<T>(PhantomData<T>);
impl<T: frame_system::Config> WeightToFeePolynomial for WeightToCtcFee<T> {
type Balance = Balance;
fn polynomial() -> frame_support::weights::WeightToFeeCoefficients<Self::Balance> {
- // Copied from the weights for the lock deal order extrinsic which is what is referenced in cc2
- let deal_order_weight = Weight::from_parts(30_601_000, 0)
- .saturating_add(Weight::from_parts(0, 4089))
- .saturating_add(T::DbWeight::get().reads(1))
- .saturating_add(T::DbWeight::get().writes(1));
-
- let base = Balance::from(deal_order_weight.ref_time());
- let ratio = TARGET_FEE_CREDO / base;
- let rem = TARGET_FEE_CREDO % base;
- smallvec::smallvec!(WeightToFeeCoefficient {
- coeff_integer: ratio,
- coeff_frac: Perbill::from_rational(rem, base),
- negative: false,
+ let p = CENTS;
+ let q = 10 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
+ smallvec::smallvec![WeightToFeeCoefficient {
degree: 1,
- })
+ negative: false,
+ coeff_frac: Perbill::from_rational(p % q, q),
+ coeff_integer: p / q,
+ }]
}
}
+pub const TRANSACTION_BYTE_FEE: Balance = 10 * CENTS / 1_000;
+
parameter_types! {
pub FeeMultiplier: Multiplier = Multiplier::one();
+ pub const TransactionByteFee: Balance = TRANSACTION_BYTE_FEE;
}
impl pallet_transaction_payment::Config for Runtime {
@@ -360,7 +364,7 @@ impl pallet_transaction_payment::Config for Runtime {
type OnChargeTransaction = CurrencyAdapter<Balances, ()>;
type OperationalFeeMultiplier = ConstU8<1u8>;
type WeightToFee = WeightToCtcFee<Runtime>;
- type LengthToFee = ConstantMultiplier<u128, ConstU128<1_500_000_000u128>>;
+ type LengthToFee = ConstantMultiplier<u128, TransactionByteFee>;
type FeeMultiplierUpdate = ConstFeeMultiplier<FeeMultiplier>;
}
diff --git a/runtime/src/version.rs b/runtime/src/version.rs
index f428a161..9ce651f3 100644
--- a/runtime/src/version.rs
+++ b/runtime/src/version.rs
@@ -7,7 +7,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("creditcoin3"),
impl_name: create_runtime_str!("creditcoin3"),
authoring_version: 3,
- spec_version: 37,
+ spec_version: 39,
impl_version: 0,
apis: RUNTIME_API_VERSIONS,
transaction_version: 2,
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 461ff812..07cd4a70 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -146,7 +146,7 @@ macro_rules! prod_or_fast {
};
}
-pub const MILLISECS_PER_BLOCK: u64 = prod_or_fast!(15_000, 5_000);
+pub const MILLISECS_PER_BLOCK: u64 = prod_or_fast!(15_000, 6_000);
pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 461ff812..ff301de8 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -155,7 +155,7 @@ pub const CENTS: u128 = CTC / 100;
// WARNING: the next should be defined on a single line b/c of
// the assertions made in .github/check-for-changes-in-epoch-duration.sh
#[rustfmt::skip]
-const BLOCKS_FOR_FASTER_EPOCH: u32 = if cfg!(feature = "devnet") { 2 * HOURS } else { 15 };
+const BLOCKS_FOR_FASTER_EPOCH: u32 = if cfg!(feature = "devnet") { 2 * HOURS } else { 10 };
pub const EPOCH_DURATION_IN_BLOCKS: u32 = prod_or_fast!(12 * HOURS, BLOCKS_FOR_FASTER_EPOCH);
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 461ff812..ed2e2b28 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -157,7 +157,7 @@ pub const CENTS: u128 = CTC / 100;
#[rustfmt::skip]
const BLOCKS_FOR_FASTER_EPOCH: u32 = if cfg!(feature = "devnet") { 2 * HOURS } else { 15 };
-pub const EPOCH_DURATION_IN_BLOCKS: u32 = prod_or_fast!(12 * HOURS, BLOCKS_FOR_FASTER_EPOCH);
+pub const EPOCH_DURATION_IN_BLOCKS: u32 = prod_or_fast!(12 * HOURS, 20);
parameter_types! {
pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64; // Q: how long to make an epoch
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 461ff812..9f3dab10 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -160,7 +160,7 @@ const BLOCKS_FOR_FASTER_EPOCH: u32 = if cfg!(feature = "devnet") { 2 * HOURS } e
pub const EPOCH_DURATION_IN_BLOCKS: u32 = prod_or_fast!(12 * HOURS, BLOCKS_FOR_FASTER_EPOCH);
parameter_types! {
- pub const EpochDuration: u64 = EPOCH_DURATION_IN_BLOCKS as u64; // Q: how long to make an epoch
+ pub const EpochDuration: u64 = 6 * HOURS; // Q: how long to make an epoch
pub const ExpectedBlockTime: u64 = MILLISECS_PER_BLOCK; // Q: block time
}
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 461ff812..13c7bafb 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -148,7 +148,7 @@ macro_rules! prod_or_fast {
pub const MILLISECS_PER_BLOCK: u64 = prod_or_fast!(15_000, 5_000);
-pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
+pub const SLOT_DURATION: u64 = 2 * MILLISECS_PER_BLOCK;
pub const CENTS: u128 = CTC / 100; |
atodorov
force-pushed
the
testing/CSUB-1379-make-danger-check-more-robust
branch
5 times, most recently
from
6684bf3
to
6696f2d
Compare
this will print only the messages that we want, not execution of every command in the script, which should make it easier to read the output!
- update wording to be more precise wrt what this script is doing - introduce colors for visual separation
- exclude unmodified lines from the diff context by searching for lines which explicitly start with + or -, meaning added/removed lines. This will prevent the script to trigger when adding/modifying other constants in the vicinity of the ones that we check for! - as an extra measure search only for modified lines which also contain the word "const" inside of them! This will prevent the script to trigger when modifying function calls which merely use the value of the constants that we check for! - as more extra measure examine diff only on the runtime/ directory to avoid triggering by changes in this script itself or other files which may be referencing a constant name, e.g. text documentation. NOTE: the script can still trigger with a false positive if for example you modify a definition for a different constant, whose value is an expression consuming the constants we check for. For example: -const CTC_REWARD_PER_BLOCK: Balance = 2 * CTC; +const CTC_REWARD_PER_BLOCK: Balance = 2 * CTC * EPOCH_DURATION_IN_BLOCKS; will trigger the script! Improve by diffing only runtime/
atodorov
changed the base branch from
testing/CSUB-1379-bogus-base-branch
to
dev
atodorov
force-pushed
the
testing/CSUB-1379-make-danger-check-more-robust
branch
from
6696f2d
to
8c6bd21
Compare
atodorov
requested review from
DylanVerstraete,
BradleyOlson64,
beqaabu and
rustlang-dev
|
For full LLVM coverage report click here! |
rustlang-dev
approved these changes
Nov 20, 2024
BradleyOlson64
approved these changes
Nov 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Make the
check-for-changes-in-epoch-duration.shmore robust so that it doesn't cause so much false positives.They are still possible (see commit log & the examples below) however the more common case where we're adding something extra in the vicinity of the constants that we check for will no longer trigger.
Notes:
dev