Feature/refactor into libraries

buidler.compile.config.ts

@@ -1,6 +1,4 @@
-import { BuidlerConfig, usePlugin, task } from "@nomiclabs/buidler/config";
-
-usePlugin("buidler-typechain");
+import { BuidlerConfig } from "@nomiclabs/buidler/config";
 
 interface ExtendedBuidlerConfig extends BuidlerConfig {
     [x:string]: any
@@ -14,10 +12,6 @@ const config: ExtendedBuidlerConfig = {
         enabled: true,
       }
     },
-    typechain: {
-        outDir: "typechain",
-        target: "ethers"
-    },
 }
 
 export default config;

buidler.config.ts

@@ -1,20 +1,30 @@
+// tslint:disable-next-line:no-var-requires
 require("dotenv").config();
-import { BuidlerConfig, usePlugin, task } from "@nomiclabs/buidler/config";
-import { utils, constants, ContractTransaction } from "ethers";
+import { BuidlerConfig, usePlugin, task, internalTask } from "@nomiclabs/buidler/config";
+import { utils, constants, ContractTransaction, Wallet } from "ethers";
+import {deployContract, solidity} from "ethereum-waffle";
+import { parseUnits, parseEther, BigNumberish, BigNumber } from "ethers/utils";
 import { MockTokenFactory } from "@pie-dao/mock-contracts/dist/typechain/MockTokenFactory";
-import { PBasicSmartPoolFactory } from "./typechain/PBasicSmartPoolFactory";
-import { PCappedSmartPoolFactory } from "./typechain/PCappedSmartPoolFactory";
-import { IBFactoryFactory } from "./typechain/IBFactoryFactory";
-import { deployBalancerFactory } from "./utils";
-import { IBPoolFactory } from "./typechain/IBPoolFactory";
-import { IERC20Factory } from "./typechain/IERC20Factory";
+
+import { IbFactoryFactory } from "./typechain/IBFactoryFactory";
+import { deployBalancerFactory, deployAndGetLibObject, linkArtifact } from "./utils";
+import { IbPoolFactory } from "./typechain/IBPoolFactory";
+import { Ierc20Factory } from "./typechain/IERC20Factory";
 import { PProxiedFactoryFactory } from "./typechain/PProxiedFactoryFactory";
-import { parseUnits, parseEther, BigNumberish, BigNumber } from "ethers/utils";
-import { PCappedSmartPool } from "./typechain/PCappedSmartPool";
+
+import { Pv2SmartPool } from "./typechain/Pv2SmartPool";
+import { Pv2SmartPoolFactory } from "./typechain/Pv2SmartPoolFactory";
+import Pv2SmartPoolArtifact from "./artifacts/PV2SmartPool.json";
+
+import LibPoolEntryExitArtifact from "./artifacts/LibPoolEntryExit.json";
+import LibAddRemoveTokenArtifact from "./artifacts/LibAddRemoveToken.json";
+import LibWeightsArtifact from "./artifacts/LibWeights.json";
+import LibPoolMathArtifact from "./artifacts/LibPoolMath.json";
 
 usePlugin("@nomiclabs/buidler-waffle");
 usePlugin("@nomiclabs/buidler-etherscan");
 usePlugin("solidity-coverage");
+usePlugin("buidler-deploy");
 
 const INFURA_API_KEY = process.env.INFURA_API_KEY || "";
 const KOVAN_PRIVATE_KEY = process.env.KOVAN_PRIVATE_KEY || "";
@@ -53,14 +63,14 @@ const config: ExtendedBuidlerConfig = {
       accounts: [
         MAINNET_PRIVATE_KEY,
         MAINNET_PRIVATE_KEY_SECONDARY
-      ].filter((item) => item != "")
+      ].filter((item) => item !== "")
     },
     kovan: {
       url: `https://kovan.infura.io/v3/${INFURA_API_KEY}`,
       accounts: [
         KOVAN_PRIVATE_KEY,
         KOVAN_PRIVATE_KEY_SECONDARY
-      ].filter((item) => item != "")
+      ].filter((item) => item !== "")
     },
     rinkeby: {
       url: `https://rinkeby.infura.io/v3/${INFURA_API_KEY}`,
@@ -69,7 +79,7 @@ const config: ExtendedBuidlerConfig = {
       accounts: [
         RINKEBY_PRIVATE_KEY,
         RINKEBY_PRIVATE_KEY_SECONDARY
-      ].filter((item) => item != "")
+      ].filter((item) => item !== "")
     },
     coverage: {
       url: 'http://127.0.0.1:8555', // Coverage launches its own ganache-cli client
@@ -93,7 +103,7 @@ task("deploy-pie-smart-pool-factory", "deploys a pie smart pool factory")
     const factory = await (new PProxiedFactoryFactory(signers[0])).deploy();
     console.log(`Factory deployed at: ${factory.address}`);
 
-    const implementation = await run("deploy-pie-capped-smart-pool") as PCappedSmartPool;
+    const implementation = await run("deploy-pie-smart-pool") as Pv2SmartPool;
     await implementation.init(PLACE_HOLDER_ADDRESS, "IMPL", "IMPL", "1337");
 
     await factory.init(taskArgs.balancerFactory, implementation.address);
@@ -107,13 +117,13 @@ task("deploy-pool-from-factory", "deploys a pie smart pool from the factory")
     const signers = await ethers.getSigners();
     const factory = PProxiedFactoryFactory.connect(taskArgs.factory, signers[0]);
 
-    const config = require(taskArgs.allocation);
+    const allocation = require(taskArgs.allocation);
 
-    const name = config.name;
-    const symbol = config.symbol
-    const initialSupply = parseEther(config.initialSupply);
-    const cap = parseEther(config.cap);
-    const tokens = config.tokens;
+    const name = allocation.name;
+    const symbol = allocation.symbol
+    const initialSupply = parseEther(allocation.initialSupply);
+    const cap = parseEther(allocation.cap);
+    const tokens = allocation.tokens;
 
 
     const tokenAddresses: string[] = [];
@@ -125,10 +135,10 @@ task("deploy-pool-from-factory", "deploys a pie smart pool from the factory")
       tokenWeights.push(parseEther(token.weight).div(2));
 
       // Calc amount
-      const amount = new BigNumber(Math.floor((config.initialValue / token.value * token.weight / 100 * config.initialSupply * 10 ** token.decimals)).toString());
+      const amount = new BigNumber(Math.floor((allocation.initialValue / token.value * token.weight / 100 * allocation.initialSupply * 10 ** token.decimals)).toString());
 
       // Approve factory to spend token
-      const tokenContract = IERC20Factory.connect(token.address, signers[0]);
+      const tokenContract = Ierc20Factory.connect(token.address, signers[0]);
 
       const allowance = await tokenContract.allowance(await signers[0].getAddress(), factory.address);
       if(allowance.lt(amount)) {
@@ -139,29 +149,27 @@ task("deploy-pool-from-factory", "deploys a pie smart pool from the factory")
     }
 
     const tx = await factory.newProxiedSmartPool(name, symbol, initialSupply, tokenAddresses, tokenAmounts, tokenWeights, cap);
-    const receipt = await tx.wait(2); //wait for 2 confirmations
+    const receipt = await tx.wait(2); // wait for 2 confirmations
     const event = receipt.events.pop();
     console.log(`Deployed smart pool at : ${event.address}`);
     return event.address;
 });
 
 task("deploy-pie-smart-pool", "deploys a pie smart pool")
-  .setAction(async(taskArgs, { ethers }) => {
+  .setAction(async(taskArgs, { ethers, run }) => {
     const signers = await ethers.getSigners();
-    const factory = new PBasicSmartPoolFactory(signers[0]);
-    const smartpool = await factory.deploy();
 
-    console.log(`PBasicSmartPool deployed at: ${smartpool.address}`);
-});
+    console.log("deploying libraries");
+    const libraries = await run("deploy-libraries");
+    console.log("libraries deployed");
+    console.table(libraries);
+    const linkedArtifact = linkArtifact(Pv2SmartPoolArtifact, libraries);
 
-task("deploy-pie-capped-smart-pool", "deploys a capped pie smart pool")
-  .setAction(async(taskArgs, { ethers }) => {
-    const signers = await ethers.getSigners();
-    const factory = new PCappedSmartPoolFactory(signers[0]);
-    const smartpool = await factory.deploy();
+    const smartpool = (await deployContract(signers[0] as Wallet, linkedArtifact, [], {
+      gasLimit: 100000000,
+    })) as Pv2SmartPool;
 
-    console.log(`PCappedSmartPool deployed at: ${smartpool.address}`);
-    return smartpool;
+    console.log(`Pv2SmartPool deployed at: ${smartpool.address}`);
 });
 
 task("init-smart-pool", "initialises a smart pool")
@@ -172,7 +180,7 @@ task("init-smart-pool", "initialises a smart pool")
   .addParam("initialSupply", "Initial supply of the token")
   .setAction(async(taskArgs, { ethers }) => {
     const signers = await ethers.getSigners();
-    const smartpool = PBasicSmartPoolFactory.connect(taskArgs.smartPool, signers[0]);
+    const smartpool = Pv2SmartPoolFactory.connect(taskArgs.smartPool, signers[0]);
     const tx = await smartpool.init(taskArgs.pool, taskArgs.name, taskArgs.symbol, utils.parseEther(taskArgs.initialSupply));
     const receipt = await tx.wait(1);
 
@@ -183,10 +191,9 @@ task("deploy-smart-pool-implementation-complete")
   .addParam("implName")
   .setAction(async(taskArgs, { ethers, run }) => {
     const signers = await ethers.getSigners();
-    const factory = new PCappedSmartPoolFactory(signers[0]);
 
     // Deploy capped pool
-    const implementation = await run("deploy-pie-capped-smart-pool");
+    const implementation = await run("deploy-pie-smart-pool");
     // Init capped smart pool
     await run("init-smart-pool", {
       smartPool: implementation.address,
@@ -212,7 +219,7 @@ task("set-cap", "Sets the cap on a capped pool")
   .addParam("cap")
   .setAction(async(taskArgs, { ethers }) => {
     const signers = await ethers.getSigners();
-    const smartpool = PCappedSmartPoolFactory.connect(taskArgs.pool, signers[0]);
+    const smartpool = Pv2SmartPoolFactory.connect(taskArgs.pool, signers[0]);
     const tx = await smartpool.setCap(parseEther(taskArgs.cap), {gasLimit: 2000000});
 
     console.log(`Cap set tx: ${tx.hash}`);
@@ -224,13 +231,13 @@ task("join-smart-pool")
   .addParam("amount")
   .setAction(async(taskArgs, { ethers }) => {
     const signers = await ethers.getSigners();
-    const smartpool = PBasicSmartPoolFactory.connect(taskArgs.pool, signers[0]);
+    const smartpool = Pv2SmartPoolFactory.connect(taskArgs.pool, signers[0]);
 
     // TODO fix this confusing line
-    const tokens = await IBPoolFactory.connect(await smartpool.getBPool(), signers[0]).getCurrentTokens();
+    const tokens = await IbPoolFactory.connect(await smartpool.getBPool(), signers[0]).getCurrentTokens();
 
     for(const tokenAddress of tokens) {
-      const token = IERC20Factory.connect(tokenAddress, signers[0]);
+      const token = Ierc20Factory.connect(tokenAddress, signers[0]);
       // TODO make below more readable
       console.log("approving tokens");
       await (await token.approve(smartpool.address, constants.MaxUint256)).wait(1);
@@ -245,13 +252,13 @@ task("approve-smart-pool")
   .addParam("pool")
   .setAction(async(taskArgs, { ethers }) => {
     const signers = await ethers.getSigners();
-    const smartpool = PBasicSmartPoolFactory.connect(taskArgs.pool, signers[0]);
+    const smartpool = Pv2SmartPoolFactory.connect(taskArgs.pool, signers[0]);
 
     // TODO fix this confusing line
-    const tokens = await IBPoolFactory.connect(await smartpool.bPool(), signers[0]).getCurrentTokens();
+    const tokens = await IbPoolFactory.connect(await smartpool.bPool(), signers[0]).getCurrentTokens();
 
     for(const tokenAddress of tokens) {
-      const token = IERC20Factory.connect(tokenAddress, signers[0]);
+      const token = Ierc20Factory.connect(tokenAddress, signers[0]);
       // TODO make below more readable
       const receipt = await (await token.approve(smartpool.address, constants.MaxUint256)).wait(1);
       console.log(`${tokenAddress} approved tx: ${receipt.transactionHash}`);
@@ -281,9 +288,9 @@ task("deploy-balancer-pool", "deploys a balancer pool from a factory")
   .addParam("factory", "Address of the balancer pool address")
   .setAction(async(taskArgs, { ethers }) => {
     const signers = await ethers.getSigners();
-    const factory = await IBFactoryFactory.connect(taskArgs.factory, signers[0]);
+    const factory = await IbFactoryFactory.connect(taskArgs.factory, signers[0]);
     const tx = await factory.newBPool();
-    const receipt = await tx.wait(2); //wait for 2 confirmations
+    const receipt = await tx.wait(2); // wait for 2 confirmations
     const event = receipt.events.pop();
     console.log(`Deployed balancer pool at : ${event.address}`);
 });
@@ -298,11 +305,12 @@ task("balancer-bind-token", "binds a token to a balancer pool")
     // Approve token
     const signers = await ethers.getSigners();
     const account = await signers[0].getAddress();
-    const pool = IBPoolFactory.connect(taskArgs.pool, signers[0]);
+    const pool = IbPoolFactory.connect(taskArgs.pool, signers[0]);
 
     const weight = parseUnits(taskArgs.weight, 18);
+    // tslint:disable-next-line:radix
     const balance = utils.parseUnits(taskArgs.balance, parseInt(taskArgs.decimals));
-    const token = await IERC20Factory.connect(taskArgs.token, signers[0]);
+    const token = await Ierc20Factory.connect(taskArgs.token, signers[0]);
 
     const allowance = await token.allowance(account, pool.address);
 
@@ -322,7 +330,7 @@ task("balancer-unbind-token", "removed a balancer token from a pool")
   .setAction(async(taskArgs, { ethers }) => {
     const signers = await ethers.getSigners();
     const account = await signers[0].getAddress();
-    const pool = IBPoolFactory.connect(taskArgs.pool, signers[0]);
+    const pool = IbPoolFactory.connect(taskArgs.pool, signers[0]);
 
     const tx = await pool.unbind(taskArgs.token);
     const receipt = await tx.wait(1);
@@ -335,7 +343,7 @@ task("balancer-set-controller")
   .addParam("controller")
   .setAction(async(taskArgs, { ethers }) => {
     const signers = await ethers.getSigners();
-    const pool = IBPoolFactory.connect(taskArgs.pool, signers[0]);
+    const pool = IbPoolFactory.connect(taskArgs.pool, signers[0]);
 
     const tx = await pool.setController(taskArgs.controller);
     const receipt = await tx.wait(1);
@@ -344,4 +352,44 @@ task("balancer-set-controller")
 });
 
 
+task("deploy-libraries", "deploys all external libraries")
+  .setAction(async(taskArgs, { ethers, deployments }) => {
+    const signers = await ethers.getSigners();
+    const {deploy} = deployments;
+    const libraries: any[] = [];
+
+    libraries.push(await deployAndGetLibObject(LibAddRemoveTokenArtifact, signers[0]));
+    libraries.push(await deployAndGetLibObject(LibPoolEntryExitArtifact, signers[0]));
+    libraries.push(await deployAndGetLibObject(LibWeightsArtifact, signers[0]));
+    libraries.push(await deployAndGetLibObject(LibPoolMathArtifact, signers[0]));
+
+    return libraries;
+  });
+
+task("deploy-libraries-and-get-object")
+  .setAction(async(taskArgs, { ethers, run }) => {
+    const libraries = await run("deploy-libraries");
+
+    const libObject: any = {};
+
+    for (const lib of libraries) {
+      libObject[lib.name] = lib.address;
+    }
+
+    return libObject;
+
+  });
+
+// Use only in testing!
+internalTask("deploy-libraries-and-smartpool")
+  .setAction(async(taskArgs, { ethers, run, deployments}) => {
+    const {deploy} = deployments;
+    const signers = await ethers.getSigners();
+    const libraries = await run("deploy-libraries-and-get-object");
+
+    const contract = (await deploy("PV2SmartPool", {contractName: "PV2SmartPool", from: await signers[0].getAddress(), libraries}));
+    return Pv2SmartPoolFactory.connect(contract.address, signers[0]);
+  });
+
+
 export default config;