Unwrap NEAR on Aurora->NEAR transfers #750
Merged
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
|
Why treat WNEAR differently than every other ERC-20 bridged token? |
|
@joshuajbouw this is because $NEAR is a native token in NEAR, and not NEP-141. So this change could allow users to create and/or top-up NEAR accounts easier and in more convenient way (it doesn't require a separate NEAR transaction and thus NEAR gas to unwrap wNEAR from the user). Also, on NEAR->Aurora transfers of $NEAR we automatically wrap them so users receive wNEAR on Aurora. This PR will allow unwrapping on the way back. |
mrLSD
approved these changes
May 11, 2023
joshuajbouw
suggested changes
May 11, 2023
aleksuss
reviewed
May 18, 2023
aleksuss
reviewed
May 18, 2023
aleksuss
reviewed
May 19, 2023
aleksuss
reviewed
May 19, 2023
aleksuss
reviewed
May 19, 2023
|
Looks like CI is still failing. |
|
Can you resolve conflicts please? Thanks. |
mrLSD
approved these changes
Jul 19, 2023
# Conflicts: # engine/src/lib.rs
birchmd
requested changes
Sep 22, 2023
birchmd
approved these changes
Sep 22, 2023
aleksuss
added a commit
that referenced
this pull request
Sep 25, 2023
<!-- Thanks for submitting a pull request! Here are some helpful tips: * Always create branches on and target the `develop` branch. * Run all the tests locally and ensure that they are passing. * Run `make format` to ensure that the code is formatted. * Run `make check` to ensure that all checks passed successfully. * Small commits and contributions that attempt one single goal is preferable. * If the idea changes or adds anything functional which will affect users, an AIP discussion is required first on the Aurora forum: https://forum.aurora.dev/discussions/AIPs%20(Aurora%20Improvement%20Proposals). * Avoid breaking the public API (namely in engine/src/lib.rs) unless required. * If your PR is a WIP, ensure that you enable "draft" mode. * Your first PRs won't use the CI automatically unless a maintainer starts. If this is not your first PR, please do NOT abuse the CI resources. Checklist: - [ ] I have performed a self-review of my code - [ ] I have documented my code, particularly in the hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] I have added tests to prove my fix or new feature is effective and works - [ ] Any dependent changes have been merged - [ ] The PR is targeting the `develop` branch and not `master` - [ ] I have pre-squashed my commits into a single commit and rebased. --> ## Description NEAR instead of wNEAR on AuroraStoring native NEAR tokens on aurora account on NEAR - issues: * This creates issues for accounting and monitoring - need to verify which part of `aurora` balance is used for storage, which is used for bridged NEAR, and which is free and available. * Could create a lack of NEAR collateral for the bridged wNEAR - some users may not be able to withdraw their wNEAR from Aurora. The solution: * Keep holding wNEAR on `aurora` balance on NEAR side. * This way, each time the user bridges NEAR to Aurora, it's being wrapped to wNEAR and sent to Aurora. * We preserve the same ERC-20 address of wNEAR on Aurora without any additional steps. * When withdrawing wNEAR from Aurora, make unwrap in wNEAR (call `wrap.near near_withdraw()`) and then send native NEAR tokens for users. * Use optional suffix `{}:unwrap` so it won't break the cross-chain swaps for [Ref.Finance](http://ref.finance/). Implementation: Modify the `ExitToNear` precompile: * Call `near_withdraw` instead of `ft_transfer` if the `erc20_address` is a `wnear_address` and the `recipient` end with the suffix `{}:unwrap`. * Rename `refund_on_error` callback to `exit_to_near_precompile_callback`. * Pass to it args with optional `TransferNearCallArgs` and an already existing `RefundCallArgs` but make it optional. * In the `exit_to_near_precompile_callback` transfer near on successful promise result and refund on the failed result. ## Performance / NEAR gas cost considerations The gas consumption increased a little bit due to a callback call. <!-- Performance regressions are not ideal, though we welcome performance improvements. Any PR must be completely mindful of any gas cost increases. The CI will fail if the gas costs change at all. Do update these tests to accommodate for the new gas changes. It is good to explain this change, if necessary. --> ## Testing Integration tests are added <!-- Please describe the tests that you ran to verify your changes. --> ## How should this be reviewed The reviewer should focus on the changed components that are described in the `implementation` section, and verify that the implementation is backward compatible and doesn't break any other components like `XCC` and `refund` logic. --------- Co-authored-by: Oleksandr Anyshchenko <oleksandr.anyshchenko@aurora.dev> Co-authored-by: Michael Birch <michael.birch@aurora.dev>
Merged
aleksuss
added a commit
that referenced
this pull request
Sep 25, 2023
- Added the possibility to use native NEAR instead of wNEAR on Aurora by [@karim-en]. ([#750]) - Added hashchain integration by [@birchmd]. ([#831]) - Added functions for setting and getting metadata of ERC-20 contracts deployed with `deploy_erc20_token` transaction by [@aleksuss]. ([#837]) --------- Co-authored-by: Michael Birch <michael.birch@aurora.dev> Co-authored-by: Evgeny Ukhanov <evgeny@aurora.dev> Co-authored-by: Karim <karim@aurora.dev>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Nov 17, 2023
## Description Since #750 has been merged, the ERC-20 connector is able to unwrap wrapped Near tokens into Near native tokens. This logic was duplicated by the XCC router, but in this PR we remove the logic from XCC and use the bridge's unwrapping instead. This has a nice side-effect of saving us 20 Tgas from the XCC overhead. ## Performance / NEAR gas cost considerations No impact on regular transactions, 20 Tgas improvement to XCC transactions. ## Testing Existing tests. Specifically this relies heavily on the upgrade test introduced in #866
aleksuss
pushed a commit
that referenced
this pull request
Nov 28, 2023
## Description Since #750 has been merged, the ERC-20 connector is able to unwrap wrapped Near tokens into Near native tokens. This logic was duplicated by the XCC router, but in this PR we remove the logic from XCC and use the bridge's unwrapping instead. This has a nice side-effect of saving us 20 Tgas from the XCC overhead. ## Performance / NEAR gas cost considerations No impact on regular transactions, 20 Tgas improvement to XCC transactions. ## Testing Existing tests. Specifically this relies heavily on the upgrade test introduced in #866
mrLSD
approved these changes
Dec 17, 2023
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.
Description
NEAR instead of wNEAR on AuroraStoring native NEAR tokens on aurora account on NEAR - issues:
aurorabalance is used for storage, which is used for bridged NEAR, and which is free and available.The solution:
aurorabalance on NEAR side.wrap.near near_withdraw()) and then send native NEAR tokens for users.{}:unwrapso it won't break the cross-chain swaps for Ref.Finance.Implementation:
Modify the
ExitToNearprecompile:near_withdrawinstead offt_transferif theerc20_addressis awnear_addressand therecipientend with the suffix{}:unwrap.refund_on_errorcallback toexit_to_near_precompile_callback.TransferNearCallArgsand an already existingRefundCallArgsbut make it optional.exit_to_near_precompile_callbacktransfer near on successful promise result and refund on the failed result.Performance / NEAR gas cost considerations
The gas consumption increased a little bit due to a callback call.
Testing
Integration tests are added
How should this be reviewed
The reviewer should focus on the changed components that are described in the
implementationsection, and verify that the implementation is backward compatible and doesn't break any other components likeXCCandrefundlogic.