Converted tokens to standard ERC20

pooltogether · Jun 23, 2020 · 301e150 · 301e150
1 parent e082ab3
commit 301e150
Show file tree

Hide file tree

Showing 16 changed files with 132 additions and 191 deletions.
diff --git a/contracts/builder/PrizePoolBuilder.sol b/contracts/builder/PrizePoolBuilder.sol
@@ -109,17 +109,15 @@ contract PrizePoolBuilder is Initializable {
     PeriodicPrizePool prizePool
   ) internal returns (ControlledToken) {
     ControlledToken credit = controlledTokenFactory.createControlledToken();
-    address[] memory defaultOperators;
-    credit.initialize("Ticket Credit", "TCRD", defaultOperators, trustedForwarder, prizePool);
+    credit.initialize("Ticket Credit", "TCRD", trustedForwarder, prizePool);
     return credit;
   }
 
   function createSponsorshipCredit(
     PeriodicPrizePool prizePool
   ) internal returns (ControlledToken) {
     ControlledToken credit = controlledTokenFactory.createControlledToken();
-    address[] memory defaultOperators;
-    credit.initialize("Sponsorship Credit", "SCRD", defaultOperators, trustedForwarder, prizePool);
+    credit.initialize("Sponsorship Credit", "SCRD", trustedForwarder, prizePool);
     return credit;
   }
 
@@ -129,8 +127,7 @@ contract PrizePoolBuilder is Initializable {
     string memory _ticketSymbol
   ) internal returns (Ticket) {
     Ticket ticket = ticketFactory.createTicket();
-    address[] memory defaultOperators;
-    ticket.initialize(_ticketName, _ticketSymbol, defaultOperators, trustedForwarder, prizePool);
+    ticket.initialize(_ticketName, _ticketSymbol, trustedForwarder, prizePool);
     return ticket;
   }
 
@@ -140,8 +137,7 @@ contract PrizePoolBuilder is Initializable {
     string memory _sponsorshipSymbol
   ) internal returns (ControlledToken) {
     ControlledToken sponsorship = controlledTokenFactory.createControlledToken();
-    address[] memory defaultOperators;
-    sponsorship.initialize(_sponsorshipName, _sponsorshipSymbol, defaultOperators, trustedForwarder, prizePool);
+    sponsorship.initialize(_sponsorshipName, _sponsorshipSymbol, trustedForwarder, prizePool);
     return sponsorship;
   }
 }
diff --git a/contracts/counterfactual-action/CounterfactualAction.sol b/contracts/counterfactual-action/CounterfactualAction.sol
@@ -4,11 +4,11 @@ import "../periodic-prize-pool/PeriodicPrizePoolInterface.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/IERC20.sol";
 
 contract CounterfactualAction {
-  function mintTickets(address payable user, PeriodicPrizePoolInterface prizePool, bytes calldata data) external {
+  function mintTickets(address payable user, PeriodicPrizePoolInterface prizePool) external {
     IERC20 token = prizePool.token();
     uint256 amount = token.balanceOf(address(this));
     token.approve(address(prizePool), amount);
-    prizePool.mintTickets(user, amount, data);
+    prizePool.mintTickets(user, amount);
     selfdestruct(user);
   }
 

diff --git a/contracts/counterfactual-action/CounterfactualActionFactory.sol b/contracts/counterfactual-action/CounterfactualActionFactory.sol
@@ -19,9 +19,9 @@ contract CounterfactualActionFactory {
     return Create2.computeAddress(salt(user), keccak256(MinimalProxyLibrary.minimalProxy(address(depositor))));
   }
 
-  function mintTickets(address payable user, bytes calldata data) external {
+  function mintTickets(address payable user) external {
     CounterfactualAction d = newAction(user);
-    d.mintTickets(user, prizePool, data);
+    d.mintTickets(user, prizePool);
   }
 
   function cancel(address payable user) external {