Skip to content
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

Jump to bottom

fix: evm txs must deal with fees the same way that substrate txs #732

Merged
merged 13 commits into from
Sep 1, 2021
Merged

fix: evm txs must deal with fees the same way that substrate txs #732

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
e9bda88
fix: evm txs must deal with fees the same way that substrate txs
librelois Aug 25, 2021
9f55a4f
Merge remote-tracking branch 'origin/master' into elois-evm-deal-with…
librelois Aug 26, 2021
32663c0
Replace pc/trsry by py/trsry to be compatible with polkadotjs
librelois Aug 26, 2021
f5ec3eb
wip
librelois Aug 26, 2021
a68fe63
Handle 'on_unbalanced' calls from pallet_evm @ DealWithFees
notlesh Aug 26, 2021
c37a422
finalize test deal with fees
librelois Aug 27, 2021
a4f1a73
prettier
librelois Aug 30, 2021
60a1b03
Merge branch 'master' into elois-evm-deal-with-fees
librelois Aug 31, 2021
fd00be0
fix test balance extrinsic: take care about treasury events
librelois Aug 31, 2021
e5b0ef9
remove console.log
librelois Aug 31, 2021
726b790
revert treasury account change on moonbase
librelois Aug 31, 2021
c842152
update treasury account for tests
librelois Aug 31, 2021
977adea
Merge branch 'master' into elois-evm-deal-with-fees
librelois Aug 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions runtime/moonbase/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ impl pallet_evm::Config for Runtime {
type Runner = pallet_evm::runner::stack::Runner<Self>;
type Precompiles = MoonbasePrecompiles<Self>;
type ChainId = EthereumChainId;
type OnChargeTransaction = ();
type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<Balances, DealWithFees<Runtime>>;
type BlockGasLimit = BlockGasLimit;
type FindAuthor = AuthorInherent;
}
Expand Down Expand Up @@ -486,7 +486,7 @@ parameter_types! {
pub const ProposalBond: Permill = Permill::from_percent(5);
pub const ProposalBondMinimum: Balance = 1 * currency::UNIT;
pub const SpendPeriod: BlockNumber = 6 * DAYS;
pub const TreasuryId: PalletId = PalletId(*b"pc/trsry");
pub const TreasuryId: PalletId = PalletId(*b"py/trsry");
librelois marked this conversation as resolved.
Show resolved Hide resolved
pub const MaxApprovals: u32 = 100;
}

Expand Down
4 changes: 2 additions & 2 deletions runtime/moonbeam/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ impl pallet_evm::Config for Runtime {
type Runner = pallet_evm::runner::stack::Runner<Self>;
type Precompiles = MoonbeamPrecompiles<Self>;
type ChainId = EthereumChainId;
type OnChargeTransaction = ();
type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<Balances, DealWithFees<Runtime>>;
type BlockGasLimit = BlockGasLimit;
type FindAuthor = AuthorInherent;
}
Expand Down Expand Up @@ -502,7 +502,7 @@ parameter_types! {
pub const ProposalBond: Permill = Permill::from_percent(5);
pub const ProposalBondMinimum: Balance = 1 * currency::GLMR;
pub const SpendPeriod: BlockNumber = 6 * DAYS;
pub const TreasuryId: PalletId = PalletId(*b"pc/trsry");
pub const TreasuryId: PalletId = PalletId(*b"py/trsry");
pub const MaxApprovals: u32 = 100;
}

Expand Down
2 changes: 1 addition & 1 deletion runtime/moonriver/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ impl pallet_evm::Config for Runtime {
type Runner = pallet_evm::runner::stack::Runner<Self>;
type Precompiles = MoonriverPrecompiles<Self>;
type ChainId = EthereumChainId;
type OnChargeTransaction = ();
type OnChargeTransaction = pallet_evm::EVMCurrencyAdapter<Balances, DealWithFees<Runtime>>;
type BlockGasLimit = BlockGasLimit;
type FindAuthor = AuthorInherent;
}
Expand Down