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

Control the flow of wrapped NAM over the Ethereum bridge #1781

Merged
merged 44 commits into from
Sep 6, 2023

Conversation

sug0
Copy link
Contributor

@sug0 sug0 commented Aug 2, 2023

Describe your changes

Closes #1722

The PR is configured to merge into the base (tiago/token-whitelist) to make reviewing easier. It should be changed back to main, once the base is upstreamed.

Indicate on which release or other PRs this topic is based on

Based on #1755

Checklist before merging to draft

  • I have added a changelog
  • Git history is in acceptable state

@sug0 sug0 changed the base branch from main to tiago/token-whitelist August 2, 2023 13:00
@sug0 sug0 marked this pull request as ready for review August 3, 2023 12:27
@sug0 sug0 marked this pull request as draft August 3, 2023 12:29
@sug0 sug0 marked this pull request as ready for review August 3, 2023 12:43
sug0 added a commit that referenced this pull request Aug 3, 2023
@sug0 sug0 added has-a-pr The issue has been solved by a PR that has yet to be merged and removed has-a-pr The issue has been solved by a PR that has yet to be merged labels Aug 3, 2023
tzemanovic
tzemanovic previously approved these changes Aug 4, 2023
Fraccaman
Fraccaman previously approved these changes Aug 7, 2023
batconjurer
batconjurer previously approved these changes Aug 17, 2023
Copy link
Member

@batconjurer batconjurer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Some small nits. Otherwise fine.

@sug0 sug0 marked this pull request as draft August 17, 2023 14:59
@sug0 sug0 marked this pull request as ready for review August 28, 2023 14:45
@sug0 sug0 mentioned this pull request Aug 28, 2023
@sug0 sug0 changed the base branch from tiago/token-whitelist to main August 28, 2023 14:54
@sug0 sug0 dismissed stale reviews from batconjurer, Fraccaman, and tzemanovic August 28, 2023 14:54

The base branch was changed.

sug0 added a commit that referenced this pull request Aug 30, 2023
Fraccaman added a commit that referenced this pull request Sep 6, 2023
* origin/tiago/cap-wnam:
  Add changelog for #1781
  Add invalidate_wnam_over_cap_tx() unit test
  Fix wNAM edge cases in Bridge pool VP unit tests
  New Bridge pool VP unit tests for wrapped NAM
  Add `asset` field to Balance
  Refactor Bridge pool tests to allow modifying pending transfer
  Fix test_act_on_changes_storage_for_transfers_to_eth() unit test
  Test that wrapped NAM is never minted
  Fix test_redeem_native_token() unit test
  Fix test_wrapped_nam_not_burned() unit test
  Add test_wnam_doesnt_mint_nuts() unit test
  Refactor get_erc20_flow_control to use EthBridgeQueries
  Replace ERC20 supply RPC query with atomic read of all flow control data
  Flow control of NAM transferred to Ethereum
  Allow null pre-balances during Bridge pool escrow checks
  Update wNAM supplies when acting on Ethereum events
  Harden Bridge pool VP against wNAM NUT transfers
  Vet Ethereum bridge config of the native token
  Refactor redeem_native_token to use update::amount
  Use EthAssetMint helper methods
  Add helper methods to EthAssetMint
Fraccaman added a commit that referenced this pull request Sep 6, 2023
* origin/tiago/cap-wnam:
  Add changelog for #1781
  Add invalidate_wnam_over_cap_tx() unit test
  Fix wNAM edge cases in Bridge pool VP unit tests
  New Bridge pool VP unit tests for wrapped NAM
  Add `asset` field to Balance
  Refactor Bridge pool tests to allow modifying pending transfer
  Fix test_act_on_changes_storage_for_transfers_to_eth() unit test
  Test that wrapped NAM is never minted
  Fix test_redeem_native_token() unit test
  Fix test_wrapped_nam_not_burned() unit test
  Add test_wnam_doesnt_mint_nuts() unit test
  Refactor get_erc20_flow_control to use EthBridgeQueries
  Replace ERC20 supply RPC query with atomic read of all flow control data
  Flow control of NAM transferred to Ethereum
  Allow null pre-balances during Bridge pool escrow checks
  Update wNAM supplies when acting on Ethereum events
  Harden Bridge pool VP against wNAM NUT transfers
  Vet Ethereum bridge config of the native token
  Refactor redeem_native_token to use update::amount
  Use EthAssetMint helper methods
  Add helper methods to EthAssetMint
@Fraccaman Fraccaman merged commit 85a4fca into main Sep 6, 2023
4 checks passed
@Fraccaman Fraccaman deleted the tiago/cap-wnam branch September 6, 2023 21:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Keep track of wNAM tokens that have been minted on Ethereum
4 participants