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.

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

fix origin of erc20 xtokens transfer #2180

Merged
merged 15 commits into from
Jun 8, 2022
Merged

fix origin of erc20 xtokens transfer #2180

merged 15 commits into from
Jun 8, 2022

Conversation

zqhxuyuan
Copy link
Contributor

@zqhxuyuan zqhxuyuan commented Jun 2, 2022

relates to: #2167 (comment)

Notice: current when transfer back ERC20 back to our chain, we should make sure there're enough native token for sibling parachain account to charge storage fee.

@zqhxuyuan zqhxuyuan requested review from zjb0807 and xlc June 2, 2022 15:53
modules/evm/src/lib.rs Outdated Show resolved Hide resolved
modules/currencies/src/lib.rs Outdated Show resolved Hide resolved
modules/currencies/src/lib.rs Outdated Show resolved Hide resolved
modules/currencies/src/lib.rs Show resolved Hide resolved
modules/currencies/src/lib.rs Outdated Show resolved Hide resolved
@zqhxuyuan zqhxuyuan marked this pull request as ready for review June 6, 2022 15:37
modules/currencies/src/lib.rs Outdated Show resolved Hide resolved
@xlc xlc merged commit 1250467 into master Jun 8, 2022
@xlc xlc deleted the fix_erc20_origin branch June 8, 2022 03:45
syan095 pushed a commit that referenced this pull request Jun 16, 2022
…a into fee_distribution

* 'fee_distribution' of ssh://github.com/AcalaNetwork/Acala: (31 commits)
  update polkadot-v0.9.23 (#2183)
  make sure acala precompiles are called only from other contracts (#2202)
  remove AccountId from XcmFeeToTreasury
  Acala XcmFeeToTreasury
  fix precompile array encode & other improvements (#2196)
  move HomaTreasuryPalletId to common
  update loan proxy type (#2200)
  Add bifrost (#2199)
  fix benchmark
  build_pool_percents helper method
  benchmark
  update to v0.9.22
  refactor weight trader (#2178)
  fix with_fee_currency (#2194)
  Support arm64 (#2107)
  add Homa to ProxyType (#2191)
  disable with_fee_paid_by (#2187)
  Convert rebase token amount when calculate swap amount for StableAsset (#2169)
  2.7.0 (#2186)
  fix origin of erc20 xtokens transfer (#2180)
  ...

# Conflicts:
#	modules/cdp-engine/src/lib.rs
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants