Instadapp/dsa-connectors
1
0
Fork 0
mirror of https://github.com/Instadapp/dsa-connectors.git synced 2024-07-29 22:37:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add TokenFaucet and claim function

Browse Source
This commit is contained in:
eccheung4 2021-08-05 10:56:02 -07:00
parent 1de8b7d5b3
commit 8d9600b3b2
4 changed files with 105 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/mainnet/connectors/pooltogether/events.sol
View File

@ -3,4 +3,5 @@ pragma solidity ^0.7.0;
contract Events {
event LogDepositTo(address prizePool, address to, uint256 amount, address controlledToken, address referrer, uint256 getId, uint256 setId);
event LogWithdrawInstantlyFrom(address prizePool, address from, uint256 amount, address controlledToken, uint256 maximumExitFee, uint256 getId, uint256 setId);
event LogClaim(address tokenFaucet, address user);
}

6
contracts/mainnet/connectors/pooltogether/interface.sol
View File

@ -4,4 +4,8 @@ interface PrizePoolInterface {
function token() external view returns (address);
function depositTo( address to, uint256 amount, address controlledToken, address referrer) external;
function withdrawInstantlyFrom( address from, uint256 amount, address controlledToken, uint256 maximumExitFee) external returns (uint256);
}
}
interface TokenFaucetInterface {
function claim( address user) external returns (uint256);
}

21
contracts/mainnet/connectors/pooltogether/main.sol
View File

@ -7,7 +7,7 @@ pragma solidity ^0.7.0;
import { SafeERC20 } from "@openzeppelin/contracts/token/ERC20/SafeERC20.sol";
import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
import { PrizePoolInterface } from "./interface.sol";
import { PrizePoolInterface, TokenFaucetInterface} from "./interface.sol";
import { TokenInterface } from "../../common/interfaces.sol";
import { Events } from "./events.sol";
@ -87,6 +87,25 @@ abstract contract PoolTogetherResolver is Events, DSMath, Basic {
_eventName = "LogWithdrawInstantlyFrom(address,address,uint256,address,uint256,uint256,uint256)";
_eventParam = abi.encode(address(prizePool), address(from), _amount, address(controlledToken), maximumExitFee, getId, setId);
}
/**
* @dev Claim token from a Token Faucet
* @notice Claim token from a Token Faucet
* @param tokenFaucet TokenFaucet address
* @param user The user to claim tokens for
*/
function claim (
address tokenFaucet,
address user
) external returns (string memory _eventName, bytes memory _eventParam) {
TokenFaucetInterface tokenFaucetContract = TokenFaucetInterface(tokenFaucet);
tokenFaucetContract.claim(user);
_eventName = "LogClaim(address,address)";
_eventParam = abi.encode(address(tokenFaucet), address(user));
}
}
contract ConnectV2PoolTogether is PoolTogetherResolver {

91
test/pooltogether/pooltogether.test.js
View File

@ -19,6 +19,9 @@ const connectV2PoolTogetherArtifacts = require("../../artifacts/contracts/mainne
const token = tokens.dai.address // DAI Token
const prizePool = "0xEBfb47A7ad0FD6e57323C8A42B2E5A6a4F68fc1a" // DAI Prize Pool
const controlledToken = "0x334cBb5858417Aee161B53Ee0D5349cCF54514CF" // PT DAI Ticket
const daiPoolFaucet = "0xF362ce295F2A4eaE4348fFC8cDBCe8d729ccb8Eb" // DAI POOL Faucet
const poolTokenAddress = "0x0cEC1A9154Ff802e7934Fc916Ed7Ca50bDE6844e"
const tokenFaucetProxyFactory = "0xE4E9cDB3E139D7E8a41172C20b6Ed17b6750f117" // TokenFaucetProxyFactory for claimAll
describe("PoolTogether", function () {
const connectorName = "COMPOUND-TEST-A"
@ -75,7 +78,7 @@ describe("PoolTogether", function () {
});
});
describe("Main", function () {
describe("Main - DAI Prize Pool Test", function () {
it("Should deposit ETH in Compound", async function () {
const amount = ethers.utils.parseEther("1") // 1 ETH
@ -112,13 +115,13 @@ describe("PoolTogether", function () {
let daiToken = await ethers.getContractAt(abis.basic.erc20, token)
let daiBalance = await daiToken.balanceOf(dsaWallet0.address);
console.log("Before spell:");
console.log("\tDAI balance before: ", daiBalance.toString());
console.log("\tBalance before: ", daiBalance.toString(), tokens.dai.symbol);
// PT DAI Ticket balance is 0
let cToken = await ethers.getContractAt(abis.basic.erc20, controlledToken)
const balance = await cToken.balanceOf(dsaWallet0.address)
const tokenName = await cToken.name()
console.log("\tPTDAI balance before: ", balance.toString(), tokenName)
console.log("\tBalance before: ", balance.toString(), tokenName)
// Run spell transaction
const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address)
@ -128,18 +131,18 @@ describe("PoolTogether", function () {
// Expect DAI balance to equal 0
daiBalance = await daiToken.balanceOf(dsaWallet0.address);
console.log("After spell:");
console.log("\tDAI balance after: ", daiBalance.toString());
console.log("\tBalance after: ", daiBalance.toString(), tokens.dai.symbol);
expect(daiBalance).to.be.eq(ethers.utils.parseEther("0"));
// Expect PT DAI Ticket to equal 100
const balanceAfter = await cToken.balanceOf(dsaWallet0.address)
console.log("\tPTDAI balance after: ", balanceAfter.toString(), tokenName)
console.log("\tBalance after: ", balanceAfter.toString(), tokenName)
expect(balanceAfter.toString()).to.be.eq(ethers.utils.parseEther("100"));
expect(await ethers.provider.getBalance(dsaWallet0.address)).to.be.lte(ethers.utils.parseEther("9"));
});
it("Should withdraw all PrizePool", async function () {
it("Should withdraw all PrizePool and get back 100 DAI", async function () {
const amount = ethers.utils.parseEther("100") // 100 DAI
const spells = [
{
@ -154,29 +157,93 @@ describe("PoolTogether", function () {
let daiToken = await ethers.getContractAt(abis.basic.erc20, token)
let daiBalance = await daiToken.balanceOf(dsaWallet0.address);
console.log("Before Spell:")
console.log("\tDAI balance before: ", daiBalance.toString());
console.log("\tBalance before: ", daiBalance.toString(), tokens.dai.symbol);
// PT Dai Ticket is 100
let cToken = await ethers.getContractAt(abis.basic.erc20, controlledToken)
const balance = await cToken.balanceOf(dsaWallet0.address)
const tokenName = await cToken.name()
console.log("\tPTDAI balance before: ", balance.toString(), tokenName)
console.log("\tBalance before: ", balance.toString(), tokenName)
// Increase time by 11 days so we get back all DAI without early withdrawal fee
await ethers.provider.send("evm_increaseTime", [11*24*60*60]);
// Run spell transaction
const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address)
const receipt = await tx.wait()
// After spell
// Expect DAI balance to be greater than 90, because of early withdrawal fee
// Expect DAI balance to be equal to 100, because of no early withdrawal fee
daiBalance = await daiToken.balanceOf(dsaWallet0.address);
console.log("After spell: ");
console.log("\tDAI balance after: ", daiBalance.toString());
expect(daiBalance).to.be.gt(ethers.utils.parseEther("90"));
console.log("\tBalance after: ", daiBalance.toString(), tokens.dai.symbol);
expect(daiBalance).to.be.eq(ethers.utils.parseEther("100"));
// Expect PT Dai Ticket to equal 0
const balanceAfter = await cToken.balanceOf(dsaWallet0.address)
console.log("\tPTDAI balance after: ", balanceAfter.toString(), tokenName)
console.log("\tBalance after: ", balanceAfter.toString(), tokenName)
expect(balanceAfter.toNumber()).to.be.eq(0);
});
it("Should deposit and withdraw all PrizePool, get back less than 100 DAI, and claim POOL", async function() {
const amount = ethers.utils.parseEther("100") // 100 DAI
const spells = [
{
connector: ptConnectorName,
method: "depositTo",
args: [prizePool, dsaWallet0.address, amount, controlledToken, constants.address_zero, 0, 0]
},
{
connector: ptConnectorName,
method: "withdrawInstantlyFrom",
args: [prizePool, dsaWallet0.address, amount, controlledToken, amount, 0, 0]
},
{
connector: ptConnectorName,
method: "claim",
args: [daiPoolFaucet, dsaWallet0.address]
}
]
// Before spell
// DAI balance is 0
let daiToken = await ethers.getContractAt(abis.basic.erc20, token)
let daiBalance = await daiToken.balanceOf(dsaWallet0.address);
console.log("Before Spell:")
console.log("\tBalance before: ", daiBalance.toString(), tokens.dai.symbol);
// PT Dai Ticket is 100
let cToken = await ethers.getContractAt(abis.basic.erc20, controlledToken)
const balance = await cToken.balanceOf(dsaWallet0.address)
const tokenName = await cToken.name()
console.log("\tBalance before: ", balance.toString(), tokenName)
// PoolToken is 0
let poolToken = await ethers.getContractAt(abis.basic.erc20, poolTokenAddress)
const poolBalance = await poolToken.balanceOf(dsaWallet0.address)
const poolTokenName = await poolToken.name()
console.log("\tBalance before: ", poolBalance.toString(), poolTokenName)
// Run spell transaction
const tx = await dsaWallet0.connect(wallet0).cast(...encodeSpells(spells), wallet1.address)
const receipt = await tx.wait()
// After spell
// Expect DAI balance to be less than 100, because of early withdrawal fee
daiBalance = await daiToken.balanceOf(dsaWallet0.address);
console.log("After spell: ");
console.log("\tBalance after: ", daiBalance.toString(), tokens.dai.symbol);
expect(daiBalance).to.be.lt(ethers.utils.parseEther("100"));
// Expect PT Dai Ticket to equal 0
const balanceAfter = await cToken.balanceOf(dsaWallet0.address)
console.log("\tBalance after: ", balanceAfter.toString(), tokenName)
expect(balanceAfter.toNumber()).to.be.eq(0);
// Expect Pool Token Balance to be greate than 0
const poolBalanceAfter = await poolToken.balanceOf(dsaWallet0.address)
console.log("\tBalance after: ", poolBalanceAfter.toString(), poolTokenName)
expect(poolBalanceAfter).to.be.gt(ethers.utils.parseEther("0"));
});
})
})