feat: Added migrator contract and tests (SC-4769) #1
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
|
This pull request has been linked to Shortcut Story #4769: [mpl-migration] Create repo for MPL token migration. |
lucas-manuel
suggested changes
Feb 16, 2022
contracts/Migrator.sol
Outdated
| require(ERC20Helper.transfer(newToken, msg.sender, amount_), "M:M:TRANSFER_FAILED"); | ||
| } | ||
|
|
||
| } |
contracts/Migrator.sol
Outdated
Comment on lines
19
to
20
| require(ERC20Helper.transferFrom(oldToken, msg.sender, address(this), amount_), "M:M:TRANSFER_FROM_FAILED"); | ||
| require(ERC20Helper.transfer(newToken, msg.sender, amount_), "M:M:TRANSFER_FAILED"); |
There was a problem hiding this comment.
require(ERC20Helper.transferFrom(oldToken, msg.sender, address(this), amount_), "M:M:TRANSFER_FROM_FAILED");
require(ERC20Helper.transfer(newToken, msg.sender, amount_), "M:M:TRANSFER_FAILED");
contracts/Migrator.sol
Outdated
| address immutable oldToken; | ||
| address immutable newToken; | ||
|
|
||
| constructor(address old_, address new_) { |
contracts/test/Migrator.t.sol
Outdated
| function test_migration(uint256 amount_) external { | ||
| amount_ = constrictToRange(amount_, 1, OLD_SUPPLY); | ||
|
|
||
| //Mint new token to migrator |
contracts/test/Migrator.t.sol
Outdated
| amount_ = constrictToRange(amount_, 1, OLD_SUPPLY); | ||
|
|
||
| //Mint new token to migrator | ||
| newToken.mint(address(migrator), OLD_SUPPLY); |
There was a problem hiding this comment.
This step should be in the setUp I think
contracts/test/Migrator.t.sol
Outdated
Comment on lines
168
to
172
| try migrator.migrate(amount_) { | ||
| assertTrue(false, "Able to migrate without new token"); | ||
| } catch Error(string memory reason) { | ||
| assertEq(reason, "M:M:TRANSFER_FAILED"); | ||
| } |
contracts/test/Migrator.t.sol
Outdated
|
|
||
|
|
||
|
|
||
| } |
contracts/test/Migrator.t.sol
Outdated
Comment on lines
185
to
187
|
|
||
|
|
||
|
|
contracts/test/Migrator.t.sol
Outdated
Comment on lines
174
to
175
| //Mint new token to migrator | ||
| newToken.mint(address(migrator), OLD_SUPPLY); |
There was a problem hiding this comment.
Lets move this to the setup block and then burn OLD_SUPPLY - amount_ + 1, and then mint 1 for the success case
test.sh
Outdated
| forge test --match "$match" -vvv --lib-paths "modules" --contracts "contracts" |
There was a problem hiding this comment.
Dont need --contracts flag
There was a problem hiding this comment.
Also lets try removing --lib-paths and see what happens, last time it didn't work for me but maybe new forge works
lucas-manuel
force-pushed
the
sc-4769-mpl-migration
branch
from
7c6acd8
to
14ba45a
Compare
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.
No description provided.