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

treasury / treasury handler / rescue tokens #112

Merged
merged 6 commits into from
Feb 1, 2022
Merged

Conversation

akileshtangella
Copy link
Contributor

@akileshtangella akileshtangella commented Jan 31, 2022

Description of PR:

  1. Adds feeRecipient to TokenWrapper.sol.
  2. In the wrapping methods in TokenWrapper.sol sends the fee to the feeRecipient instead of the TokenWrapper
  3. Adds a method setFeeRecipient to GovernedTokenWrapper.sol. This method can only be executed through the TokenWrapperHandler via the SignatureBridge
  4. Updates to the relevant TS classes
  5. Adds Treasury.sol, ITreasury.sol, and TreasuryHandler.sol.
  6. Adds a receive function to the Treasury so it can receive wrapping fees (and therefore act as a treasury)
  7. Adds rescueTokens method to Treasury.sol. rescueTokens can rescue both ERC20 tokens and native ETH
  8. Tests for rescueTokens method is in signatureBridgeSide.test.ts
  9. Updated existing tests that were breaking due to step 2) (sending the wrapping fee to the feeRecipient means that the balance of ERC20 tokens / ETH in theTokenWrapper is different now).

@drewstone
Copy link
Contributor

Tests not passing yet

@akileshtangella
Copy link
Contributor Author

Tests not passing yet

Yea, something is wrong, I'm trying to figure out what.

@drewstone drewstone merged commit fb09fb2 into main Feb 1, 2022
@drewstone drewstone deleted the akilesh/treasury branch February 1, 2022 21:43
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.

2 participants