Skip to content

fix: fixed relaychain and parachain has different token decimals #152

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

Open
toints wants to merge 19 commits into
base: main-develop
Choose a base branch
from
Open

fix: fixed relaychain and parachain has different token decimals #152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
9d37284
Fixed: excessive deductions
toints Jul 31, 2024
40f8d04
Merge pull request #134 from toints/Magnet-Stack
toints Jul 31, 2024
83e175a
Update rust.yml
toints Jul 31, 2024
f9d7bfe
Merge branch 'refs/heads/main-develop' into Magnet-Stack
toints Jul 31, 2024
c743e0a
Merge branch 'Magnet-Stack-toints' into Magnet-Stack
toints Jul 31, 2024
da068d2
Merge pull request #138 from toints/Magnet-Stack
toints Jul 31, 2024
90c2361
Merge pull request #42 from Magport/Magnet-Stack-toints
toints Jul 31, 2024
529cf8b
optimism the asset-bridge
Acaishiba Aug 1, 2024
6b439f1
Revert "optimism the asset-bridge"
Acaishiba Aug 1, 2024
fa8a543
Update rust.yml
zachary0809 Aug 1, 2024
a223fcd
Merge pull request #140 from zachary0809/Magnet-release-v0.7.2
Acaishiba Aug 1, 2024
5d07e5f
Merge pull request #139 from Magport/Magnet-release-0.7.2
wd30130 Aug 2, 2024
3d01897
Merge branch 'Magport:main' into Magnet-Stack
toints Aug 9, 2024
5135ad0
Merge pull request #150 from Magport/main-develop
toints Sep 5, 2024
a47caa1
Merge pull request #43 from Magport/Magnet-Stack-toints
toints Sep 5, 2024
896b4a1
fix: fixed relychain and parachain has different token decimals
toints Sep 5, 2024
e99734b
Merge pull request #151 from toints/Magnet-Stack
toints Sep 5, 2024
ba0f70c
style: format code with rustc-1.81.0
toints Sep 10, 2024
62cc00b
Merge pull request #153 from toints/Magnet-Stack
toints Sep 10, 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
13 changes: 7 additions & 6 deletions client/coretime/bulk/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,13 @@ where
let constant_query =
subxt::dynamic::constant("Broker", "TimeslicePeriod");

let time_slice =
api.constants()
.at(&constant_query)?
.to_value()?
.as_u128()
.expect("coretime parachain time slice none") as u32;
let time_slice = api
.constants()
.at(&constant_query)?
.to_value()?
.as_u128()
.expect("coretime parachain time slice none")
as u32;

item.end_relaychain_height =
ev.when + item.duration * time_slice;
Expand Down
8 changes: 6 additions & 2 deletions pallets/liquidation/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,10 @@ pub mod pallet {

let (collator, real_gas_cost) = match T::OrderGasCost::gas_cost(n) {
Ok(cost) => match cost {
Some((collator, real_gas_cost)) => (collator, real_gas_cost),
Some((collator, real_gas_cost)) => {
let adjusted_gas_cost = real_gas_cost * PARACHAIN_TO_RELAYCHAIN_UNIT;
(collator, adjusted_gas_cost)
},
None => return,
},
Err(_) => {
Expand Down Expand Up @@ -670,7 +673,8 @@ pub mod pallet {
let total_existing_operation_ratio: u32 =
OperationRatios::<T>::iter().map(|(_, r)| r).sum();
let total_ratio = system_ratio
+ treasury_ratio + collator_ratio
+ treasury_ratio
+ collator_ratio
+ total_existing_operation_ratio
+ ratio;
log::info!("3 -+-+-+-+-+ set operation ratio, total ratio:{:?}, system_ratio:{:?}, treasury_ratio:{:?}, collator_ratio:{:?}, operation account:{:?}, op_ratio:{:?}",
Expand Down
1 change: 1 addition & 0 deletions runtime/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1418,6 +1418,7 @@ impl_runtime_apis! {

fn account_basic(address: H160) -> EVMAccount {
let account_id = <Runtime as pallet_evm::Config>::AddressMapping::into_account_id(address);

let nonce = frame_system::Pallet::<Runtime>::account_nonce(&account_id);
let balance_free =
<Runtime as pallet_evm::Config>::Currency::free_balance(account_id.clone());
Expand Down
3 changes: 2 additions & 1 deletion runtime/src/xcms/xcm_weight.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ impl<
AccountId,
Currency: CurrencyT<AccountId>,
OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
> WeightTrader for UsingComponentsEx<WeightToFee, AssetIdValue, AccountId, Currency, OnUnbalanced>
> WeightTrader
for UsingComponentsEx<WeightToFee, AssetIdValue, AccountId, Currency, OnUnbalanced>
{
fn new() -> Self {
Self(Weight::zero(), Zero::zero(), PhantomData)
Expand Down