feat: Migrate for another account that has approved (SC-4915) (#6)

* feat: Migrate for another account that has approved

* formatting: move allowance assertions

Co-authored-by: Lucas Manuel <[email protected]>

contracts/Migrator.sol

@@ -14,10 +14,14 @@ contract Migrator {
  }
 
  function migrate(uint256 amount_) external {
+ migrate(msg.sender, amount_);
+ }
+
+ function migrate(address owner, uint256 amount_) public {
  require(amount_ > 0, "M:M:ZERO_AMOUNT");
 
- 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");
+ require(ERC20Helper.transferFrom(oldToken, owner, address(this), amount_), "M:M:TRANSFER_FROM_FAILED");
+ require(ERC20Helper.transfer(newToken, owner, amount_), "M:M:TRANSFER_FAILED");
  }
 
 }

contracts/interfaces/IMigrator.sol

@@ -4,20 +4,20 @@ pragma solidity 0.8.7;
 interface IMigrator {
 
  /**
- * @dev Get address of oldToken. 
+ * @dev Get address of oldToken.
  * @return oldToken_ The address of new token.
  */
  function oldToken() external view returns (address oldToken_);
 
  /**
- * @dev Get address of newToken. 
+ * @dev Get address of newToken.
  * @return newToken_ The address of new token.
  */
  function newToken() external view returns (address newToken_);
 
  /**
- * @dev  Exchange the oldToken for the same amount of newToken.
- * @param  amount_ The amount of oldToken to swap for newToken.
+ * @dev Exchange the oldToken for the same amount of newToken.
+ * @param amount_ The amount of oldToken to swap for newToken.
  */
  function migrate(uint256 amount_) external;
 

contracts/test/Migrator.t.sol

@@ -1,12 +1,21 @@
 // SPDX-License-Identifier: AGPL-3.0-or-later
 pragma solidity 0.8.7;
 
-import { TestUtils } from "../../modules/contract-test-utils/contracts/test.sol";
+import { IERC20 } from "../../modules/erc20/contracts/interfaces/IERC20.sol";
 
+import { TestUtils } from "../../modules/contract-test-utils/contracts/test.sol";
 import { MockERC20 } from "../../modules/erc20/contracts/test/mocks/MockERC20.sol";
 
 import { Migrator } from "../Migrator.sol";
 
+contract SomeAccount {
+
+ function approve(address token_, address spender_, uint256 amount_) external {
+ IERC20(token_).approve(spender_, amount_);
+ }
+
+}
+
 contract MigratorTest is TestUtils {
 
  uint256 public constant OLD_SUPPLY = 10_000_000 ether;
@@ -34,21 +43,51 @@ contract MigratorTest is TestUtils {
  // Approve
  oldToken.approve(address(migrator), amount_);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), amount_);
+
  assertEq(oldToken.balanceOf(address(this)), amount_);
  assertEq(oldToken.balanceOf(address(migrator)), 0);
- assertEq(oldToken.allowance(address(this), address(migrator)), amount_);
  assertEq(newToken.balanceOf(address(this)), 0);
  assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY);
 
  migrator.migrate(amount_);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), 0);
+
  assertEq(oldToken.balanceOf(address(this)), 0);
  assertEq(oldToken.balanceOf(address(migrator)), amount_);
- assertEq(oldToken.allowance(address(this), address(migrator)), 0);
  assertEq(newToken.balanceOf(address(this)), amount_);
  assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY - amount_);
  }
 
+ function test_migrationForSpecifiedOwner(uint256 amount_) external {
+ amount_ = constrictToRange(amount_, 1, OLD_SUPPLY);
+
+ SomeAccount someAccount = new SomeAccount();
+
+ // Mint amount of old token
+ oldToken.mint(address(someAccount), amount_);
+
+ // Approve
+ someAccount.approve(address(oldToken), address(migrator), amount_);
+
+ assertEq(oldToken.allowance(address(someAccount), address(migrator)), amount_);
+
+ assertEq(oldToken.balanceOf(address(someAccount)), amount_);
+ assertEq(oldToken.balanceOf(address(migrator)), 0);
+ assertEq(newToken.balanceOf(address(someAccount)), 0);
+ assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY);
+
+ migrator.migrate(address(someAccount), amount_);
+
+ assertEq(oldToken.allowance(address(someAccount), address(migrator)), 0);
+
+ assertEq(oldToken.balanceOf(address(someAccount)), 0);
+ assertEq(oldToken.balanceOf(address(migrator)), amount_);
+ assertEq(newToken.balanceOf(address(someAccount)), amount_);
+ assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY - amount_);
+ }
+
  function test_partialMigration(uint256 amount_, uint256 partialAmount_) external {
  amount_ = constrictToRange(amount_, 2, OLD_SUPPLY);
  partialAmount_ = constrictToRange(partialAmount_, 1, amount_ - 1);
@@ -59,17 +98,19 @@ contract MigratorTest is TestUtils {
  // Approve partial
  oldToken.approve(address(migrator), partialAmount_);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), partialAmount_);
+
  assertEq(oldToken.balanceOf(address(this)), amount_);
  assertEq(oldToken.balanceOf(address(migrator)), 0);
- assertEq(oldToken.allowance(address(this), address(migrator)), partialAmount_);
  assertEq(newToken.balanceOf(address(this)), 0);
  assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY);
 
  migrator.migrate(partialAmount_);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), 0);
+
  assertEq(oldToken.balanceOf(address(this)), amount_ - partialAmount_);
  assertEq(oldToken.balanceOf(address(migrator)), partialAmount_);
- assertEq(oldToken.allowance(address(this), address(migrator)), 0);
  assertEq(newToken.balanceOf(address(this)), partialAmount_);
  assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY - partialAmount_);
 
@@ -79,9 +120,10 @@ contract MigratorTest is TestUtils {
 
  migrator.migrate(remaining);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), 0);
+
  assertEq(oldToken.balanceOf(address(this)), 0);
  assertEq(oldToken.balanceOf(address(migrator)), amount_);
- assertEq(oldToken.allowance(address(this), address(migrator)), 0);
  assertEq(newToken.balanceOf(address(this)), amount_);
  assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY - amount_);
  }
@@ -99,9 +141,10 @@ contract MigratorTest is TestUtils {
 
  migrator.migrate(amount_);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), 0);
+
  assertEq(oldToken.balanceOf(address(this)), 0);
  assertEq(oldToken.balanceOf(address(migrator)), amount_);
- assertEq(oldToken.allowance(address(this), address(migrator)), 0);
  assertEq(newToken.balanceOf(address(this)), amount_);
  assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY - amount_);
  }
@@ -120,9 +163,10 @@ contract MigratorTest is TestUtils {
 
  migrator.migrate(amount_);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), 0);
+
  assertEq(oldToken.balanceOf(address(this)), 0);
  assertEq(oldToken.balanceOf(address(migrator)), amount_);
- assertEq(oldToken.allowance(address(this), address(migrator)), 0);
  assertEq(newToken.balanceOf(address(this)), amount_);
  assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY - amount_);
  }
@@ -142,9 +186,10 @@ contract MigratorTest is TestUtils {
 
  migrator.migrate(amount_);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), 0);
+
  assertEq(oldToken.balanceOf(address(this)), 0);
  assertEq(oldToken.balanceOf(address(migrator)), amount_);
- assertEq(oldToken.allowance(address(this), address(migrator)), 0);
  assertEq(newToken.balanceOf(address(this)), amount_);
  assertEq(newToken.balanceOf(address(migrator)), OLD_SUPPLY - amount_);
  }
@@ -168,9 +213,10 @@ contract MigratorTest is TestUtils {
 
  migrator.migrate(amount_);
 
+ assertEq(oldToken.allowance(address(this), address(migrator)), 0);
+
  assertEq(oldToken.balanceOf(address(this)), 0);
  assertEq(oldToken.balanceOf(address(migrator)), amount_);
- assertEq(oldToken.allowance(address(this), address(migrator)), 0);
  assertEq(newToken.balanceOf(address(this)), amount_);
  assertEq(newToken.balanceOf(address(migrator)), 0);
  }