Skip to content

Commit

Permalink
Take revenue (#1228)
Browse files Browse the repository at this point in the history 
* treasury take revenue xcm fee

* Apply review suggestions

* use Currencies instead of Tokens

* add treasury_should_take_xcm_execution_revenue
  • Loading branch information
@zjb0807
zjb0807 authored Jul 22, 2021
1 parent 2032407 commit 9ca456e
Show file tree
Hide file tree
Showing 4 changed files with 119 additions and 19 deletions.
2 changes: 1 addition & 1 deletion runtime/acala/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1459,7 +1459,7 @@ impl cumulus_pallet_aura_ext::Config for Runtime {}
// );

// pub struct XcmConfig;
// impl Config for XcmConfig {
// impl xcm_executor::Config for XcmConfig {
// type Call = Call;
// type XcmSender = XcmHandler;
// type AssetTransactor = LocalAssetTransactor;
Expand Down
24 changes: 19 additions & 5 deletions runtime/karura/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ use module_evm::{CallInfo, CreateInfo};
use module_evm_accounts::EvmAddressMapping;
use module_evm_manager::EvmCurrencyIdMapping;
use module_transaction_payment::{Multiplier, TargetedFeeAdjustment};
use orml_traits::{create_median_value_data_provider, parameter_type_with_key, DataFeeder, DataProviderExtended};
use orml_traits::{
create_median_value_data_provider, parameter_type_with_key, DataFeeder, DataProviderExtended, MultiCurrency,
};
use pallet_transaction_payment::RuntimeDispatchInfo;

pub use cumulus_primitives_core::ParaId;
Expand All @@ -73,7 +75,7 @@ pub use xcm_builder::{
AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, EnsureXcmOrigin,
FixedRateOfConcreteFungible, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser,
ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit,
};
pub use xcm_executor::{Config, XcmExecutor};

Expand Down Expand Up @@ -1340,8 +1342,21 @@ parameter_types! {

pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom<All<MultiLocation>>);

pub struct ToTreasury;
impl TakeRevenue for ToTreasury {
fn take_revenue(revenue: MultiAsset) {
if let MultiAsset::ConcreteFungible { id, amount } = revenue {
if let Some(currency_id) = CurrencyIdConvert::convert(id) {
// ensure KaruraTreasuryAccount have ed for all of the cross-chain asset.
// Ignore the result.
let _ = Currencies::deposit(currency_id, &KaruraTreasuryAccount::get(), amount);
}
}
}
}

pub struct XcmConfig;
impl Config for XcmConfig {
impl xcm_executor::Config for XcmConfig {
type Call = Call;
type XcmSender = XcmRouter;
// How to withdraw and deposit an asset.
Expand All @@ -1354,8 +1369,7 @@ impl Config for XcmConfig {
type Barrier = Barrier;
type Weigher = FixedWeightBounds<UnitWeightCost, Call>;
// Only receiving KSM is handled, and all fees must be paid in KSM.
//TODO: make treasury take revenue
type Trader = FixedRateOfConcreteFungible<KsmPerSecond, ()>;
type Trader = FixedRateOfConcreteFungible<KsmPerSecond, ToTreasury>;
type ResponseHandler = (); // Don't handle responses for now.
}

Expand Down
24 changes: 19 additions & 5 deletions runtime/mandala/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@ use module_evm_accounts::EvmAddressMapping;
pub use module_evm_manager::EvmCurrencyIdMapping;
use module_transaction_payment::{Multiplier, TargetedFeeAdjustment};
use orml_tokens::CurrencyAdapter;
use orml_traits::{create_median_value_data_provider, parameter_type_with_key, DataFeeder, DataProviderExtended};
use orml_traits::{
create_median_value_data_provider, parameter_type_with_key, DataFeeder, DataProviderExtended, MultiCurrency,
};
use pallet_transaction_payment::{FeeDetails, RuntimeDispatchInfo};
use sp_api::impl_runtime_apis;
use sp_consensus_aura::sr25519::AuthorityId as AuraId;
Expand Down Expand Up @@ -87,7 +89,7 @@ pub use xcm_builder::{
AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, EnsureXcmOrigin,
FixedRateOfConcreteFungible, FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser,
ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit,
SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit,
};
pub use xcm_executor::{Config, XcmExecutor};

Expand Down Expand Up @@ -1641,8 +1643,21 @@ parameter_types! {

pub type Barrier = (TakeWeightCredit, AllowTopLevelPaidExecutionFrom<All<MultiLocation>>);

pub struct ToTreasury;
impl TakeRevenue for ToTreasury {
fn take_revenue(revenue: MultiAsset) {
if let MultiAsset::ConcreteFungible { id, amount } = revenue {
if let Some(currency_id) = CurrencyIdConvert::convert(id) {
// ensure KaruraTreasuryAccount have ed for all of the cross-chain asset.
// Ignore the result.
let _ = Currencies::deposit(currency_id, &TreasuryAccount::get(), amount);
}
}
}
}

pub struct XcmConfig;
impl Config for XcmConfig {
impl xcm_executor::Config for XcmConfig {
type Call = Call;
type XcmSender = XcmRouter;
// How to withdraw and deposit an asset.
Expand All @@ -1655,8 +1670,7 @@ impl Config for XcmConfig {
type Barrier = Barrier;
type Weigher = FixedWeightBounds<UnitWeightCost, Call>;
// Only receiving DOT is handled, and all fees must be paid in DOT.
//TODO: make treasury take revenue
type Trader = FixedRateOfConcreteFungible<DotPerSecond, ()>;
type Trader = FixedRateOfConcreteFungible<DotPerSecond, ToTreasury>;
type ResponseHandler = (); // Don't handle responses for now.
}

Expand Down
88 changes: 80 additions & 8 deletions runtime/mandala/tests/integration_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,11 @@

#![cfg(test)]

use acala_service::chain_spec::evm_genesis;
use codec::Encode;
// use cumulus_primitives_core::{DownwardMessageHandler, InboundDownwardMessage,
// XcmpMessageHandler};
use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
use frame_support::{
assert_noop, assert_ok,
traits::{schedule::DispatchTime, Currency, GenesisBuild, OnFinalize, OnInitialize, OriginTrait, ValidatorSet},
Expand All @@ -30,10 +32,11 @@ use mandala_runtime::{
dollar, get_all_module_accounts, AcalaOracle, AccountId, AuctionManager, Authority, AuthoritysOriginId, Balance,
Balances, BlockNumber, Call, CdpEngine, CdpTreasury, CreateClassDeposit, CreateTokenDeposit, Currencies,
CurrencyId, CurrencyIdConvert, DataDepositPerByte, Dex, EVMBridge, EmergencyShutdown, EnabledTradingPairs, Event,
EvmAccounts, EvmCurrencyIdMapping, Get, GetNativeCurrencyId, Loans, NativeTokenExistentialDeposit, NftPalletId,
Origin, OriginCaller, ParachainInfo, ParachainSystem, Perbill, Proxy, Runtime, Scheduler, Session, SessionManager,
SevenDays, System, TokenSymbol, TreasuryPalletId, TreasuryReservePalletId, Vesting, ACA, AUSD, DOT, EVM, LDOT, NFT,
RENBTC,
EvmAccounts, EvmCurrencyIdMapping, ExistentialDeposits, Get, GetNativeCurrencyId, Loans, MultiLocation,
NativeTokenExistentialDeposit, NetworkId, NftPalletId, Origin, OriginCaller, ParachainInfo, ParachainSystem,
Perbill, Proxy, Runtime, Scheduler, Session, SessionManager, SevenDays, System, TokenSymbol, Tokens,
TreasuryAccount, TreasuryPalletId, TreasuryReservePalletId, Vesting, XcmConfig, XcmExecutor, ACA, AUSD, DOT, EVM,
LDOT, NFT, RENBTC,
};
use module_cdp_engine::LiquidationStrategy;
use module_evm_accounts::EvmAddressMapping;
Expand All @@ -42,11 +45,9 @@ use module_support::{
Price, Rate, Ratio, RiskManager, EVM as EVMTrait,
};
use orml_authority::DelayedOrigin;
use orml_traits::{Change, MultiCurrency};
use orml_traits::{Change, GetByKey, MultiCurrency};
use orml_vesting::VestingSchedule;
// use polkadot_parachain::primitives::Sibling;
use acala_service::chain_spec::evm_genesis;
use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
pub use primitives::{evm::EvmAddress, DexShare, TradingPair};
use sp_core::{bytes::from_hex, H160};
use sp_io::hashing::keccak_256;
Expand All @@ -55,7 +56,16 @@ use sp_runtime::{
DispatchError, DispatchResult, FixedPointNumber, MultiAddress,
};
use std::str::FromStr;
use xcm::v0::{Junction::*, MultiAsset, MultiLocation::*};
use xcm::{
opaque::v0::prelude::{BuyExecution, DepositAsset},
v0::{
ExecuteXcm,
Junction::{self, *},
MultiAsset,
MultiLocation::*,
Outcome, Xcm,
},
};

use primitives::currency::*;

Expand Down Expand Up @@ -1650,6 +1660,68 @@ fn test_session_manager_module() {
});
}

#[test]
fn treasury_should_take_xcm_execution_revenue() {
ExtBuilder::default().build().execute_with(|| {
let dot_amount = 1000 * dollar(DOT);
let actual_amount = 9999999760000;
let shallow_weight = 3000000;
let origin = MultiLocation::X1(Junction::Parent);

// receive relay chain token
let mut msg = Xcm::<Call>::ReserveAssetDeposit {
assets: vec![MultiAsset::ConcreteFungible {
id: MultiLocation::X1(Junction::Parent),
amount: dot_amount,
}],
effects: vec![
BuyExecution {
fees: MultiAsset::All,
weight: 0,
debt: shallow_weight,
halt_on_error: true,
xcm: vec![],
},
DepositAsset {
assets: vec![MultiAsset::All],
dest: MultiLocation::X1(Junction::AccountId32 {
network: NetworkId::Any,
id: ALICE,
}),
},
],
};
use xcm_executor::traits::WeightBounds;
let debt = <XcmConfig as xcm_executor::Config>::Weigher::shallow(&mut msg).unwrap_or_default();
let deep = <XcmConfig as xcm_executor::Config>::Weigher::deep(&mut msg).unwrap_or_default();
// println!("debt = {:?}, deep = {:?}", debt, deep);
assert_eq!(debt, shallow_weight);

assert_eq!(Tokens::free_balance(DOT, &ALICE.into()), 0);
assert_ok!(Currencies::deposit(
DOT,
&TreasuryAccount::get(),
ExistentialDeposits::get(&DOT)
));
assert_eq!(
Tokens::free_balance(DOT, &TreasuryAccount::get()),
ExistentialDeposits::get(&DOT)
);

let weight_limit = debt + deep + 1;
assert_eq!(
XcmExecutor::<XcmConfig>::execute_xcm(origin, msg, weight_limit),
Outcome::Complete(shallow_weight)
);

assert_eq!(Tokens::free_balance(DOT, &ALICE.into()), actual_amount);
assert_eq!(
Tokens::free_balance(DOT, &TreasuryAccount::get()),
ExistentialDeposits::get(&DOT) + dot_amount - actual_amount
);
});
}

// #[test]
// fn receive_cross_chain_assets() {
// ExtBuilder::default().build().execute_with(|| {
Expand Down

0 comments on commit 9ca456e

Please sign in to comment.