Fix schedule fee #723
Merged
Fix schedule fee #723
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7eed5ad to
442b840
Compare
xlc
reviewed
Feb 5, 2021
.github/workflows/test.yml
Outdated
| @@ -25,6 +25,8 @@ jobs: | |||
| components: rustfmt | |||
| target: wasm32-unknown-unknown | |||
| default: true | |||
| - name: Checkout submodules | |||
| @@ -327,8 +376,27 @@ pub fn bob() -> H160 { | |||
| H160([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2]) | |||
| } | |||
|
|
|||
| pub const NETWORK_CONTRACT_INDEX: u64 = 2048; | |||
| pub fn evm_genesis() -> (BTreeMap<H160, module_evm::GenesisAccount<Balance, Nonce>>, u64) { | |||
| let contracts_json = &include_bytes!("../../../../../predeploy-contracts/resources/bytecodes.json")[..]; | |||
modules/support/src/lib.rs
Outdated
| @@ -321,3 +323,38 @@ pub trait EVMStateRentTrait<AccountId, Balance> { | |||
| /// Transfer the maintainer of the contract address. | |||
| fn transfer_maintainer(from: AccountId, contract: H160, new_maintainer: H160) -> DispatchResult; | |||
| } | |||
|
|
|||
| pub trait EnsureCanChargeFee<AccountId, Balance, NegativeImbalance> { | |||
There was a problem hiding this comment.
EnsureCanChargeFee is not very accurate, maybe make it TransactionPayment instead or ChargeTransactionPayment
modules/evm/src/lib.rs
Outdated
| let refund_gas = gas_limit.saturating_sub(used_gas); | ||
| if !refund_gas.is_zero() { | ||
| T::ChargeTransactionPayment::refund_fee(&from_account, T::GasToWeight::convert(refund_gas), imbalance) | ||
| .map_err(|_| Error::<T>::ChargeFeeFailed)?; |
There was a problem hiding this comment.
should just ignore the refund error here
| ) -> Result<(PalletBalanceOf<T>, Option<NegativeImbalanceOf<T>>), TransactionValidityError> { | ||
| let fee = Module::<T>::weight_to_fee(weight); | ||
| <T as Config>::Currency::unreserve(&who, fee); | ||
| Module::<T>::ensure_can_charge_fee(who, fee, WithdrawReasons::TRANSACTION_PAYMENT); |
There was a problem hiding this comment.
I don't think we want this again. The unreserve should make sure there is enough ACA and ensure_can_charge_fee could buy more ACA if the preferred token is not ACA
| fn unreserve_and_charge_fee( | ||
| who: &T::AccountId, | ||
| weight: Weight, | ||
| ) -> Result<(PalletBalanceOf<T>, Option<NegativeImbalanceOf<T>>), TransactionValidityError> { |
There was a problem hiding this comment.
Why Option<NegativeImbalanceOf<T>> not just NegativeImbalanceOf<T>?
| let actual_payment = match <T as Config>::Currency::deposit_into_existing(&who, refund) { | ||
| Ok(refund_imbalance) => { | ||
| // The refund cannot be larger than the up front payed max weight. | ||
| // `PostDispatchInfo::calc_unspent` guards against such a case. |
There was a problem hiding this comment.
I don't think this comment is accurate?
xlc
approved these changes
Feb 5, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes: #700