Network fee distribution and Incentive Pools #2153

zqhxuyuan · 2022-05-23T08:13:55Z

relates to: #2139

Introduce OnFeeDeposit trait

modules:

transaciton payment
- DealWithTxFees used to deal with OnUnbalanced, and distribution fee to treasury pool account.
xcm execution fee
homa staking reward fee
honzon stability fee
honzon liquidation fee (Honzon Liquidation penalty goes to OnFeeDeposit #2250)
~~dex swap fee~~

integrations:

migration existing Treasury Accounts to Treasury Pool Accounts?
- we can provide a dispatch call to manual transfer token to new treasury pool accounts if need.
genesis initialize configuration
dex swap if none native token when allocation from treasury pool to incentive pools.

xlc · 2022-06-10T04:53:09Z

swap fee is not yet implemented so leave it for now
xcm execution fee are charged by relaychain so we don't actually have those fees and we can also ignore it

zqhxuyuan · 2022-06-10T05:19:38Z

swap fee is not yet implemented so leave it for now
xcm execution fee are charged by relaychain so we don't actually have those fees and we can also ignore it

xcm fee here means buy_weight revenue, and it go to our treasury account, so it can also refactored with fee distribution strategy:

Acala/runtime/karura/src/xcm_config.rs

Lines 100 to 116 in 7727abe

    
           pub struct ToTreasury; 
        
           impl TakeRevenue for ToTreasury { 
        
           	fn take_revenue(revenue: MultiAsset) { 
        
           		if let MultiAsset { 
        
           			id: Concrete(location), 
        
           			fun: Fungible(amount), 
        
           		} = revenue 
        
           		{ 
        
           			if let Some(currency_id) = CurrencyIdConvert::convert(location) { 
        
           				// Ensure KaruraTreasuryAccount have ed requirement for native asset, but don't need 
        
           				// ed requirement for cross-chain asset because it's one of whitelist accounts. 
        
           				// Ignore the result. 
        
           				let _ = Currencies::deposit(currency_id, &KaruraTreasuryAccount::get(), amount); 
        
           			} 
        
           		} 
        
           	} 
        
           }

…d by module_fees instead. Added a unit test in module homa to test this. Added module_fees to Acala runtime Updated tests accordingly.

zqhxuyuan · 2022-06-17T01:53:03Z

@syan095 can you confirm that honzon stability fee is still working on bad debit case. I think current is not working, i.e.:

cdp_engine on_initialize deposit fee to a new treasury account instead of CDPTreasuryAccount

cdp_treasury on_finalize: when bad debit happened, ~~surplus_pool is zero, because CDPTreasuryAccount got no balance on_initialize now, so the DebitPool would't decreased anymore(offset_amount is zero in this case)~~.

Acala/modules/cdp-treasury/src/lib.rs

Lines 292 to 301 in d19ca54

    
           let offset_amount = sp_std::cmp::min(Self::debit_pool(), Self::surplus_pool()); 
        
           // Burn the amount that is equal to offset amount of stable currency. 
        
           if !offset_amount.is_zero() { 
        
           	let res = T::Currency::withdraw(T::GetStableCurrencyId::get(), &Self::account_id(), offset_amount); 
        
           	match res { 
        
           		Ok(_) => { 
        
           			DebitPool::<T>::mutate(|debit| { 
        
           				*debit = debit 
        
           					.checked_sub(offset_amount)

and also should consider a case that when stability fee go to treasury account, it'll be allocation to incentive pool, so it'll will make balance of treasury account zero. My first thougth is maybe we could add a whitlelist to stop allocation to incentive pools?

into fee_distribution

zqhxuyuan · 2022-06-20T07:58:40Z

/bench runtime mandala module_fees

ghost · 2022-06-20T07:58:42Z

Finished benchmark for branch: fee_distribution

Benchmark: Benchmark Runtime Mandala Module

cargo run --profile production --color=never --bin=acala --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 --pallet=module_fees --extrinsic="*" --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/mandala/src/weights/

Results

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees IncomeToTreasuries (r:1 w:1)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 16.07
µs

Reads = 2
Writes = 2

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 16.07
µs

Reads = 2
Writes = 2

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees TreasuryToIncentives (r:1 w:1)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 16.82
µs

Reads = 2
Writes = 2

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 16.82
µs

Reads = 2
Writes = 2

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees TreasuryTokens (r:1 w:0)
Storage: Fees TreasuryToIncentives (r:1 w:0)
Storage: System Account (r:2 w:2)
Storage: EvmAccounts EvmAddresses (r:1 w:0)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 47.11
µs

Reads = 6
Writes = 3

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 47.11
µs

Reads = 6
Writes = 3

…untime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 --pallet=module_fees --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/mandala/src/weights/

into fee_distribution

zqhxuyuan · 2022-06-20T09:07:20Z

/bench runtime karura module_fees

ghost · 2022-06-20T09:07:22Z

Finished benchmark for branch: fee_distribution

Benchmark: Benchmark Runtime Karura Module

cargo run --profile production --color=never --bin=acala --features=runtime-benchmarks --features=with-karura-runtime -- benchmark pallet --chain=karura-dev --steps=50 --repeat=20 --pallet=module_fees --extrinsic="*" --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/karura/src/weights/

Results

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees IncomeToTreasuries (r:1 w:1)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 14.98
µs

Reads = 2
Writes = 2

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 14.98
µs

Reads = 2
Writes = 2

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees TreasuryToIncentives (r:1 w:1)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 15.91
µs

Reads = 2
Writes = 2

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 15.91
µs

Reads = 2
Writes = 2

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees TreasuryTokens (r:1 w:0)
Storage: Fees TreasuryToIncentives (r:1 w:0)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 8.493
µs

Reads = 3
Writes = 1

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 8.493
µs

Reads = 3
Writes = 1

…untime-benchmarks --features=with-karura-runtime -- benchmark pallet --chain=karura-dev --steps=50 --repeat=20 --pallet=module_fees --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/karura/src/weights/

zqhxuyuan · 2022-06-20T10:31:03Z

/bench runtime acala module_fees

ghost · 2022-06-20T10:31:06Z

Finished benchmark for branch: fee_distribution

Benchmark: Benchmark Runtime Acala Module

cargo run --profile production --color=never --bin=acala --features=runtime-benchmarks --features=with-acala-runtime -- benchmark pallet --chain=acala-dev --steps=50 --repeat=20 --pallet=module_fees --extrinsic="*" --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/acala/src/weights/

Results

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees IncomeToTreasuries (r:1 w:1)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 15.45
µs

Reads = 2
Writes = 2

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 15.45
µs

Reads = 2
Writes = 2

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees TreasuryToIncentives (r:1 w:1)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 17.62
µs

Reads = 2
Writes = 2

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 17.62
µs

Reads = 2
Writes = 2

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees TreasuryTokens (r:1 w:0)
Storage: Fees TreasuryToIncentives (r:1 w:0)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 15.32
µs

Reads = 3
Writes = 1

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 15.32
µs

Reads = 3
Writes = 1

…untime-benchmarks --features=with-acala-runtime -- benchmark pallet --chain=acala-dev --steps=50 --repeat=20 --pallet=module_fees --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=./templates/runtime-weight-template.hbs --output=./runtime/acala/src/weights/

zqhxuyuan · 2022-06-20T12:44:22Z

/bench runtime module module_fees

ghost · 2022-06-20T12:44:24Z

Finished benchmark for branch: fee_distribution

Benchmark: Benchmark Runtime Module

cargo run --release --color=never --bin=acala --features=runtime-benchmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 --pallet=module_fees --extrinsic="*" --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./modules/fees/src/weights.rs --template=./templates/module-weight-template.hbs

Results

Wrote dot graph to /app/git/Acala/target/release/build/orchestra-proc-macro-7191253e5cd10c8b/out/overseer-subsystem-messaging.dot
Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees IncomeToTreasuries (r:1 w:1)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 24.04
µs

Reads = 2
Writes = 2

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 24.04
µs

Reads = 2
Writes = 2

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees TreasuryToIncentives (r:1 w:1)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 24.27
µs

Reads = 2
Writes = 2

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 24.27
µs

Reads = 2
Writes = 2

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Storage: unknown [0x3a7472616e73616374696f6e5f6c6576656c3a] (r:1 w:1)
Storage: Fees TreasuryTokens (r:1 w:0)
Storage: Fees TreasuryToIncentives (r:1 w:0)
Storage: System Account (r:2 w:2)
Storage: EvmAccounts EvmAddresses (r:1 w:0)

Median Slopes Analysis

-- Extrinsic Time --

Model:
Time ~= 69.85
µs

Reads = 6
Writes = 3

Min Squares Analysis

-- Extrinsic Time --

Model:
Time ~= 69.85
µs

Reads = 6
Writes = 3

…hmarks --features=with-mandala-runtime -- benchmark pallet --chain=dev --steps=50 --repeat=20 --pallet=module_fees --extrinsic=* --execution=wasm --wasm-execution=compiled --heap-pages=4096 --output=./modules/fees/src/weights.rs --template=./templates/module-weight-template.hbs

…debit is added to the Treasury. When liquidation is complete, the debit should be fully paid off. Updated tests accordingly.

…ount of debit is added to the Treasury. When liquidation is complete, the debit should be fully paid off." This reverts commit d0e6454.

fee distributionn framework

979cc54

zqhxuyuan changed the title ~~fee distributionn framework~~ Network fee distribution and Incentive Pools May 23, 2022

zqhxuyuan added 12 commits May 24, 2022 10:18

do_set_rate

5e67844

xcm fee

143de0a

income source as paramter

f9fcd8c

mandala tx fee to collator

bac9f23

mandala init genesis fees

e93bde1

fees mock test

9d27a84

merge master

e82485f

dispatch call test

8538d0c

use PoolPercent as parameters

149a2f5

fix clippy

cede726

check rate

74c45c2

tx fee allocation refactor

cb22815

zqhxuyuan and others added 11 commits June 10, 2022 15:51

fix clippy and genesis use u32 tuple

b034472

fix test

c98a4cf

rename on_fee_deposit

7d81546

add DealTxFeesWithAccount

e6eb9bd

extract distribution_fees

6558c9e

add dex for distribution treasury to incentive

eec6dc9

distribution fee test

2eb5e13

distribut incentive dex test

388a759

add threshold and Period

92eef59

rename to AllocationPeriod

9d9faa8

Changed Homa momdule's staking reward to go to OnFeeDeposit configure…

0226b92

…d by module_fees instead. Added a unit test in module homa to test this. Added module_fees to Acala runtime Updated tests accordingly.

zqhxuyuan requested review from xlc and shaunxw June 14, 2022 07:46

merge master

d72d8d5

Fixed acala integration test build problem

a45260c

Roy Yang and others added 8 commits June 17, 2022 17:08

Updated a unit test

679a97b

add some comments

ca5f62c

Merge branch 'fee_distribution' of https://github.com/AcalaNetwork/Acala

49aa1d6

into fee_distribution

dev genesis config to Karura/Acala

19877f1

FeesConfig

e4c4923

fix clippy

0a4aa80

Merge remote-tracking branch 'origin/master' into fee_distribution

b2c50f6

merge master

30122aa

Acala Benchmarking Bot and others added 3 commits June 20, 2022 08:56

runtime upgrade

af7347a

Merge branch 'fee_distribution' of https://github.com/AcalaNetwork/Acala

c89715c

into fee_distribution

Acala Benchmarking Bot and others added 7 commits June 20, 2022 12:44

Merge remote-tracking branch 'origin/master' into fee_distribution

74b5b6f

update runtime WeightInfo

db24f7e

add DistributeTxFees to Karura/Acala

c17c11f

add post_upgrade assert

117f791

Liquidation penalty now goes to OnFeeDeposit, and the same amount of …

d0e6454

…debit is added to the Treasury. When liquidation is complete, the debit should be fully paid off. Updated tests accordingly.

Revert "Liquidation penalty now goes to OnFeeDeposit, and the same am…

d5707e5

…ount of debit is added to the Treasury. When liquidation is complete, the debit should be fully paid off." This reverts commit d0e6454.

Network fee distribution and Incentive Pools #2153

Are you sure you want to change the base?

Network fee distribution and Incentive Pools #2153

Conversation

zqhxuyuan commented May 23, 2022 • edited by syan095 Loading

xlc commented Jun 10, 2022

zqhxuyuan commented Jun 10, 2022 • edited Loading

zqhxuyuan commented Jun 17, 2022 • edited Loading

zqhxuyuan commented Jun 20, 2022

ghost commented Jun 20, 2022 • edited by ghost Loading

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

zqhxuyuan commented Jun 20, 2022

ghost commented Jun 20, 2022 • edited by ghost Loading

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

zqhxuyuan commented Jun 20, 2022

ghost commented Jun 20, 2022 • edited by ghost Loading

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

zqhxuyuan commented Jun 20, 2022

ghost commented Jun 20, 2022 • edited by ghost Loading

Wrote dot graph to /app/git/Acala/target/release/build/orchestra-proc-macro-7191253e5cd10c8b/out/overseer-subsystem-messaging.dot Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20 Raw Storage Info

Median Slopes Analysis

Min Squares Analysis

zqhxuyuan commented May 23, 2022 •

edited by syan095

Loading

zqhxuyuan commented Jun 10, 2022 •

edited

Loading

zqhxuyuan commented Jun 17, 2022 •

edited

Loading

ghost commented Jun 20, 2022 •

edited by ghost

Loading

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

ghost commented Jun 20, 2022 •

edited by ghost

Loading

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

ghost commented Jun 20, 2022 •

edited by ghost

Loading

Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

ghost commented Jun 20, 2022 •

edited by ghost

Loading

Wrote dot graph to /app/git/Acala/target/release/build/orchestra-proc-macro-7191253e5cd10c8b/out/overseer-subsystem-messaging.dot
Pallet: "module_fees", Extrinsic: "set_income_fee", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Pallet: "module_fees", Extrinsic: "set_treasury_pool", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info

Pallet: "module_fees", Extrinsic: "force_transfer_to_incentive", Lowest values: [], Highest values: [], Steps: 50, Repeat: 20
Raw Storage Info