Partial fills

.eslintrc.js

@@ -5,13 +5,12 @@ module.exports = {
   extends: ['eslint:recommended', 'plugin:@typescript-eslint/recommended'],
   rules: {
     'comma-spacing': ['error', { before: false, after: true }],
-    'prettier/prettier': 'error',
     'mocha-no-only/mocha-no-only': ['error'],
+    'prettier/prettier': [
+      'error',
+      {
+        endOfFile: 'auto',
+      },
+    ],
   },
-  'prettier/prettier': [
-    'errors',
-    {
-      endOfFile: 'auto',
-    },
-  ],
 };

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    "configurations": [
+        {
+            "args": [
+                "-u",
+                "tdd",
+                "--timeout",
+                "999999",
+                "--colors",
+                "${pkg/deployments/testprimary}/test"
+            ],
+            "internalConsoleOptions": "openOnSessionStart",
+            "name": "Mocha Tests",
+            "program": "${workspaceFolder}/node_modules/mocha/bin/_mocha",
+            "request": "launch",
+            "skipFiles": [
+                "<node_internals>/**"
+            ],
+            "type": "node"
+        }
+    ]
+}

pkg/deployments/ci/prepare-config.ts

@@ -1,6 +1,10 @@
 import path from 'path';
 import { homedir } from 'os';
 import { mkdirSync, writeFileSync } from 'fs';
+// import dotenv from 'dotenv';
+
+// dotenv.config();
+
 
 const HH_CONFIG_FILENAME = `${homedir()}/.hardhat/networks.json`;
 

pkg/deployments/package.json

@@ -28,7 +28,7 @@
     "lint": "eslint . --ext .ts --ignore-path ../../.eslintignore  --max-warnings 0",
     "prepack": "yarn build",
     "test": "hardhat test ./**/test/*.ts",
-    "testprimary" : "hardhat test ./tasks/20220415-primary-issue-pool/test/*.ts",
+    "testprimary": "hardhat test ./tasks/20220415-primary-issue-pool/test/*.ts",
     "ci:prepare-config": "ts-node ci/prepare-config.ts"
   },
   "devDependencies": {
@@ -37,25 +37,35 @@
     "@nomiclabs/hardhat-ethers": "^2.0.1",
     "@nomiclabs/hardhat-etherscan": "latest",
     "@solidity-parser/parser": "^0.14.0",
+    "@types/chai": "^4.2.12",
+    "@types/dotenv": "^8.2.0",
     "@types/lodash": "^4.14.181",
     "@types/lodash.range": "^3",
+    "@types/mocha": "^8.0.3",
     "@types/node": "^14.6.0",
     "@typescript-eslint/eslint-plugin": "^4.1.1",
     "@typescript-eslint/parser": "^4.1.1",
+    "chai": "^4.2.0",
     "chalk": "^4.1.1",
     "eslint": "^7.9.0",
     "eslint-plugin-prettier": "^3.1.4",
     "ethers": "^5.4.1",
-    "hardhat": "^2.8.3",
+    "hardhat": "v2.12.6",
     "hardhat-local-networks-config-plugin": "0.0.5",
     "lodash.range": "^3.2.0",
+    "mocha": "v10.0.0",
     "node-fetch": "^2.6.1",
-    "prettier": "^2.1.2",
+    "prettier": "^2.7.2",
     "ts-node": "^8.10.2",
     "typescript": "^4.0.2"
   },
   "peerDependencies": {
     "@nomiclabs/hardhat-ethers": "^2.0.1",
-    "hardhat": "^2.8.3"
+    "hardhat": "v2.12.6"
+  },
+  "dependencies": {
+    "@balancer-labs/v2-vault": "workspace:*",
+    "dotenv": "^16.3.1",
+    "ethereum-waffle": "^4.0.10"
   }
 }

pkg/deployments/tasks/20220415-primary-issue-pool/test/test.fork.ts

@@ -18,15 +18,16 @@ describeForkTest('PrimaryPoolFactory', 'goerli', 8586768, function () {
 
     let task: Task;
 
-    const VCUSD = '0xa6aa25115f23F3ADc4471133bbDC401b613DbF65';
+
+    const VCUSD = '0xaA0d06ed9CeFb0B26ef011363c9d7880feda8f08';
     const USDC = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48';
     const USDT = '0xdac17f958d2ee523a2206206994597c13d831ec7';
 
     const tokens = [USDC, VCUSD];
     const swapFeePercentage = fp(0.01);
-    const initialBalanceVCUSD = fp(1e18); //18 digits
     const initialBalanceUSDC = fp(1e6).div(1e12); // 6 digits
-    const initialBalances = [initialBalanceVCUSD, initialBalanceUSDC];
+    const initialBalanceVCUSD = fp(1e18); //18 digits
+    const initialBalances = [initialBalanceUSDC, initialBalanceVCUSD];
 
     const minimumPrice = fp(8);
     const minimumOrderSize = fp(1);
@@ -48,20 +49,30 @@ describeForkTest('PrimaryPoolFactory', 'goerli', 8586768, function () {
     before('setup contracts', async () => {
         vault = await new Task('20210418-vault', TaskMode.READ_ONLY, getForkedNetwork(hre)).deployedInstance('Vault');
         authorizer = await new Task('20210418-authorizer', TaskMode.READ_ONLY, getForkedNetwork(hre)).deployedInstance(
-        'Authorizer'
+            'Authorizer'
         );
 
-        vcusd = await task.instanceAt('IERC20', VCUSD);
+
+
         usdc = await task.instanceAt('IERC20', USDC);
+        vcusd = await task.instanceAt('IERC20', VCUSD);
         usdt = await task.instanceAt('IERC20', USDT);
+
+        // await usdc.connect(whale).approve(vault.address, MAX_UINT256);
+        // await vcusd.connect(whale).approve(vault.address, MAX_UINT256);
+
     });
 
     describe('create and swap', () => {
         let pool: Contract;
         let poolId: string;
 
-        it('deploy a primary issue pool', async () => {   
-            const tx = await factory.create({name: 'Verified Pool Token', symbol: 'VPT', security: usdc.address, currency: vcusd.address, minimumPrice: minimumPrice, minimumOrderSize: minimumOrderSize, maxAmountsIn: maxSecurityOffered, swapFeePercentage: swapFeePercentage, cutOffTime: issueCutoffTime, offeringDocs: offeringDocs});
+        it('deploy a primary issue pool', async () => {
+
+            const tx = await factory.create({
+                name: 'Verified Pool Token', symbol: 'VPT', security: usdc.address, currency: vcusd.address, minimumPrice: minimumPrice, minimumOrderSize: minimumOrderSize, maxAmountsIn: maxSecurityOffered, swapFeePercentage: swapFeePercentage, cutOffTime: issueCutoffTime, offeringDocs: offeringDocs,
+            });
+            // console.log(await tx.wait());
             const event = expectEvent.inReceipt(await tx.wait(), 'PoolCreated');
 
             pool = await task.instanceAt('PrimaryIssuePool', event.args.pool);
@@ -70,11 +81,14 @@ describeForkTest('PrimaryPoolFactory', 'goerli', 8586768, function () {
             poolId = await pool.getPoolId();
             const [registeredAddress] = await vault.getPool(poolId);
             expect(registeredAddress).to.equal(pool.address);
+
         });
 
-        it('initialize the pool', async () => {
+        it('Initialize the pool', async () => {
+            await usdc.connect(whale).approve(vault.address, MAX_UINT256)
             await vcusd.connect(whale).approve(vault.address, MAX_UINT256);
-            await usdc.connect(whale).approve(vault.address, MAX_UINT256);
+
+
 
             const userData = WeightedPoolEncoder.joinInit(initialBalances);
             await vault.connect(whale).joinPool(poolId, whale.address, owner.address, {
@@ -86,27 +100,39 @@ describeForkTest('PrimaryPoolFactory', 'goerli', 8586768, function () {
 
             const { balances } = await vault.getPoolTokens(poolId);
             expect(balances).to.deep.equal(initialBalances);
-
         });
 
+
         it('swap in the pool', async () => {
-            const amount = fp(500);
-            await vcusd.connect(whale).transfer(owner.address, amount);
-            await vcusd.connect(owner).approve(vault.address, amount);
-
-            await vault
-                .connect(owner)
-                .swap(
-                { kind: SwapKind.GivenIn, poolId, assetIn: VCUSD, assetOut: USDC, amount, userData: '0x' },
-                { sender: owner.address, recipient: owner.address, fromInternalBalance: false, toInternalBalance: false },
-                0,
-                MAX_UINT256
-                );
-
-            // Assert pool swap
-            const expectedUSDC = amount.div(1e12);
-            expectEqualWithError(await vcusd.balanceOf(owner.address), 0, 0.0001);
-            expectEqualWithError(await usdc.balanceOf(owner.address), expectedUSDC, 0.1);
+            try {
+                const amount = fp(500);
+
+                await usdc.connect(whale).transfer(owner.address, amount);
+                await usdc.connect(owner).approve(vault.address, amount);
+
+
+                await vault
+                    .connect(owner)
+                    .swap(
+                        { kind: SwapKind.GivenIn, poolId, assetIn: USDC, assetOut: VCUSD, amount, userData: '0x' },
+                        { sender: owner.address, recipient: owner.address, fromInternalBalance: false, toInternalBalance: false },
+                        0,
+                        MAX_UINT256
+                    );
+
+
+                // Assert pool swap
+                const expectedUSDC = amount.div(1e12);
+                expectEqualWithError(await vcusd.balanceOf(owner.address), 0, 0.0001);
+                expectEqualWithError(await usdc.balanceOf(owner.address), expectedUSDC, 0.1);
+
+            } catch (error) {
+                console.error('An error occurred:', error);
+                throw error; // 
+            }
+
         });
+
     });
+
 });

pkg/deployments/tsconfig.json

@@ -6,7 +6,18 @@
     "outDir": "dist",
     "resolveJsonModule": true
   },
-  "include": ["index.ts", "src", "tasks/**/abi/*.json", "tasks/**/bytecode/*.json", "tasks/**/output/*.json"],
-  "exclude": ["tasks/**/test", "tasks/**/output/test.json"],
-  "files": ["./hardhat.config.ts"]
-}
+  "include": [
+    "index.ts",
+    "src",
+    "tasks/**/abi/*.json",
+    "tasks/**/bytecode/*.json",
+    "tasks/**/output/*.json"
+  ],
+  "exclude": [
+    "tasks/**/test",
+    "tasks/**/output/test.json"
+  ],
+  "files": [
+    "./hardhat.config.ts"
+  ]
+}

pvt/helpers/src/models/types/TypesConverter.ts

@@ -148,7 +148,7 @@ export default {
     if (!pauseWindowDuration) pauseWindowDuration = 3 * MONTH;
     if (!bufferPeriodDuration) bufferPeriodDuration = MONTH;
     if (!offeringDocs) offeringDocs = '';
-    
+
     return {
       securityToken: params.securityToken,
       currencyToken: params.currencyToken,