Skip to content

rework fee payment #1687

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

Merged
zqhxuyuan merged 41 commits into from
Dec 28, 2021
Merged

rework fee payment #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
7cabc5e
fee payment first commit
zqhxuyuan Dec 8, 2021
45f7479
swap with treasury
zqhxuyuan Dec 13, 2021
315782d
tests
zqhxuyuan Dec 13, 2021
9fe257c
swap dex tests
zqhxuyuan Dec 13, 2021
2ac65d1
treasury sub accounts
zqhxuyuan Dec 13, 2021
4a93980
fix old test
zqhxuyuan Dec 14, 2021
5eaa44a
fmt
zqhxuyuan Dec 14, 2021
aa00cfb
fix build err
zqhxuyuan Dec 14, 2021
32e61cf
remove switch
zqhxuyuan Dec 14, 2021
08471dd
clippy
zqhxuyuan Dec 14, 2021
feb3d2d
fix benchmark err
zqhxuyuan Dec 14, 2021
a0a9ff2
fix beanchmark and set trigger weight
zqhxuyuan Dec 14, 2021
8d522df
fix PR review
zqhxuyuan Dec 15, 2021
8f25c53
update Mandala/Acala runtime upgrade
zqhxuyuan Dec 15, 2021
5184608
merge master and fix PR review
zqhxuyuan Dec 15, 2021
5e5ba93
change config of runtime order and rename variant
zqhxuyuan Dec 15, 2021
88eccdb
swap_from_treasury_or_dex some err case
zqhxuyuan Dec 15, 2021
530b55e
fix runtime upgrade result
zqhxuyuan Dec 15, 2021
cfd1008
refactor testcase use common builder
zqhxuyuan Dec 15, 2021
264d316
fix PR and add integration test
zqhxuyuan Dec 16, 2021
30d00b1
foregn asset ed when init_pool
zqhxuyuan Dec 19, 2021
accba58
fix typo
zqhxuyuan Dec 19, 2021
6a2ddca
merge master fix conflict
zqhxuyuan Dec 19, 2021
8a614b0
fix fmt
zqhxuyuan Dec 19, 2021
de765c2
benchmark and fix tests
zqhxuyuan Dec 22, 2021
26ea85e
Merge remote-tracking branch 'origin/master' into fee_management_rework
Dec 22, 2021
8e56fa7
cargo run --release --color=never --bin=acala --features=runtime-benc…
Dec 22, 2021
926da55
cargo run --release --color=never --bin=acala --features=runtime-benc…
Dec 22, 2021
9c7bb7b
cargo run --release --color=never --bin=acala --features=runtime-benc…
Dec 22, 2021
ab4c515
minior
zqhxuyuan Dec 23, 2021
c753d9e
Apply suggestions from code review
zqhxuyuan Dec 23, 2021
ebc64b7
initial rate use dex
zqhxuyuan Dec 23, 2021
7cc7fc2
drop for TransactionFeePoolTrader
zqhxuyuan Dec 23, 2021
63fca29
minor fix
zqhxuyuan Dec 24, 2021
253517a
Merge branch 'master' into fee_management_rework
zqhxuyuan Dec 24, 2021
18f2eb4
fix fmt
zqhxuyuan Dec 24, 2021
43abd8d
Merge branch 'master' into fee_management_rework
zqhxuyuan Dec 27, 2021
ad5bf8f
fix test
zqhxuyuan Dec 27, 2021
29fdff7
cargo run --release --color=never --bin=acala --features=runtime-benc…
Dec 27, 2021
5e9a3ef
cargo run --release --color=never --bin=acala --features=runtime-benc…
Dec 27, 2021
47d01a2
cargo run --release --color=never --bin=acala --features=runtime-benc…
Dec 27, 2021
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
3 changes: 3 additions & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion modules/transaction-payment/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@ pallet-transaction-payment = { git = "https://github.com/paritytech/substrate",
pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13", default-features = false }
primitives = { package = "acala-primitives", path = "../../primitives", default-features = false }
support = { package = "module-support", path = "../support", default-features = false }

orml-traits = { path = "../../orml/traits", default-features = false }
xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }
xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.13", default-features = false }

[dev-dependencies]
sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.13" }
Expand All @@ -43,5 +47,8 @@ std = [
"primitives/std",
"support/std",
"orml-traits/std",
"xcm/std",
"xcm-builder/std",
"xcm-executor/std",
]
try-runtime = ["frame-support/try-runtime"]
try-runtime = ["frame-support/try-runtime"]
Loading