Partial fills #26
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| import hre from 'hardhat'; | ||
| import { ethers } from 'ethers'; | ||
| import { expect } from 'chai'; | ||
| import { Contract, BigNumber } from 'ethers'; | ||
| import { WeightedPoolEncoder, SwapKind } from '@balancer-labs/balancer-js'; | ||
|
|
@@ -12,21 +13,22 @@ import { getSigner, impersonate, impersonateWhale } from '../../../src/signers'; | |
| import { MAX_UINT256 } from '@balancer-labs/v2-helpers/src/constants'; | ||
| import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/dist/src/signer-with-address'; | ||
|
|
||
| describeForkTest('PrimaryPoolFactory', 'mainnet', 8586768, function () { | ||
| let owner: SignerWithAddress, whale: SignerWithAddress; | ||
| let factory: Contract, vault: Contract, authorizer: Contract, usdc: Contract, vcusd: Contract, usdt: Contract; | ||
|
|
||
| let task: Task; | ||
|
|
||
| const USDC = '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48'; | ||
| const VCUSD = '0xa6aa25115f23F3ADc4471133bbDC401b613DbF65'; | ||
| const USDT = '0xdac17f958d2ee523a2206206994597c13d831ec7'; | ||
|
|
||
| const tokens = [USDC, VCUSD]; | ||
| const swapFeePercentage = fp(0.01); | ||
| const initialBalanceUSDC = fp(1e6).div(1e12); // 6 digits | ||
| const initialBalanceVCUSD = fp(1e18); //18 digits | ||
|
|
||
| const initialBalances = [, initialBalanceUSDC, initialBalanceVCUSD]; | ||
|
|
||
| const minimumPrice = fp(8); | ||
| const minimumOrderSize = fp(1); | ||
|
|
@@ -48,33 +50,53 @@ 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' | ||
| ); | ||
|
|
||
| `` | ||
|
|
||
| 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); | ||
| await usdt.connect(whale).approve(vault.address, MAX_UINT256); | ||
|
|
||
|
|
||
| }); | ||
|
|
||
| describe('create and swap', () => { | ||
| let pool: Contract; | ||
| let poolId: string; | ||
|
|
||
| it('deploy a primary issue pool', async () => { | ||
| try { | ||
| 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, initialBalances: initialBalances, | ||
| }); | ||
| console.log(await tx.wait()); | ||
| const event = await expectEvent.inReceipt(await tx.wait(), 'PoolCreated'); | ||
|
|
||
| const pool = await task.instanceAt('PrimaryIssuePool', event.args.pool); | ||
| expect(await factory.isPoolFromFactory(pool.address)).to.be.true; | ||
|
|
||
| poolId = await pool.getPoolId(); | ||
| const [registeredAddress] = await vault.getPool(poolId); | ||
| expect(registeredAddress).to.equal(pool.address); | ||
| } catch (error: any) { | ||
| console.error('Error deploying primary issue pool:', error.message); | ||
| throw error; | ||
| } | ||
| }); | ||
|
|
||
|
|
||
|
|
||
| it('Initialize the pool', async () => { | ||
| await usdc.connect(whale).approve(vault.address, MAX_UINT256); | ||
| await usdc.connect(whale).approve(vault.address, MAX_UINT256); | ||
|
There was a problem hiding this comment. @vinaykumar0103 should this approval be for VCUSD ? We already have given approval for USDC in the above line. |
||
|
|
||
|
|
||
|
|
||
| const userData = WeightedPoolEncoder.joinInit(initialBalances); | ||
| await vault.connect(whale).joinPool(poolId, whale.address, owner.address, { | ||
|
|
@@ -86,27 +108,150 @@ describeForkTest('PrimaryPoolFactory', 'goerli', 8586768, function () { | |
|
|
||
| const { balances } = await vault.getPoolTokens(poolId); | ||
| expect(balances).to.deep.equal(initialBalances); | ||
| }); | ||
|
|
||
|
|
||
| it('swap in the pool', async () => { | ||
| try { | ||
| const amount = fp(500); | ||
|
|
||
|
|
||
| // const balance = await vcusd.balanceOf(owner.address); | ||
| // console.log("Owner's VCUSD balance: ", balance.toString()); | ||
|
|
||
| // if (balance.lt(amount)) { | ||
| // throw new Error('Insufficient VCUSD balance for the swap'); | ||
| // } | ||
|
|
||
| // if ((await vcusd.balanceOf(owner.address)).lt(amount)) { | ||
| // throw new Error('Insufficient VCUSD balance for the swap'); | ||
| // } | ||
|
|
||
|
|
||
| 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: usdc, amount, userData: '0x' }, | ||
|
There was a problem hiding this comment. @vinaykumar0103 swap assetIn and assetOut are the same ? They should be different. And 'amount' of assets swapped in should be there in balance. |
||
| { sender: owner.address, recipient: owner.address, fromInternalBalance: false, toInternalBalance: false }, | ||
| 0, | ||
| MAX_UINT256 | ||
| ); | ||
|
|
||
| // owner's VCUSD balance | ||
| // console.log("Owner's VCUSD balance: ", (await vcusd.balanceOf(owner.address)).toString()); | ||
|
|
||
| // Assert pool swap | ||
| const expectedUSDC = amount.div(1e12); | ||
| expectEqualWithError(await usdc.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; // | ||
| } | ||
| }); | ||
|
|
||
| it('check owner balance', async () => { | ||
| try { | ||
| const ownerAddress = owner.address; | ||
|
|
||
| const provider = new ethers.providers.JsonRpcProvider(); | ||
| const ownerBalance = await provider.getBalance(ownerAddress); | ||
| console.log("Owner's ETH balance: ", ownerBalance.toString()); | ||
|
There was a problem hiding this comment. @vinaykumar0103 why are you checking ETH balance ? You should check if swapped in asset balance is available. assetIn and assetOut (ie, USDC and VCUSD) are ERC20 tokens. |
||
| } catch (error) { | ||
| console.error('An error occurred while checking owner balance:', error); | ||
| throw error; | ||
| } | ||
| }); | ||
| }); | ||
|
|
||
|
|
||
| // it('should allow swapping tokens with fees distributed to the pool', async () => { | ||
| // const amount = fp(500); | ||
| // const feePercentage = fp(0.01); // 1% fee | ||
| // const initialPoolTokenBalance = await pool.balanceOf(owner.address); | ||
|
|
||
| // // Transfer tokens to the owner's address | ||
| // await vcusd.connect(whale).transfer(owner.address, amount); | ||
| // await vcusd.connect(owner).approve(vault.address, amount); | ||
|
|
||
| // // Execute a swap with fees | ||
| // 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 | ||
| // ); | ||
|
|
||
| // // Calculate the expected fee amount | ||
| // const expectedFee = amount.mul(feePercentage); | ||
|
|
||
| // // Check the updated balances | ||
| // const finalPoolTokenBalance = await pool.balanceOf(owner.address); | ||
| // const finalUSDCBalance = await usdc.balanceOf(owner.address); | ||
|
|
||
| // // The pool token balance should have increased by the fee amount | ||
| // expect(finalPoolTokenBalance).to.equal(initialPoolTokenBalance.add(expectedFee)); | ||
|
|
||
| // // The USDC balance should have decreased by the swapped amount | ||
| // expectEqualWithError(await vcusd.balanceOf(owner.address), 0, 0.0001); | ||
| // expectEqualWithError(await usdc.balanceOf(owner.address), expectedFee, 0.1); | ||
| // }); | ||
|
|
||
|
|
||
|
|
||
| // describe('should swapSecurityIn', function () { | ||
| // it('swap security tokens for currency tokens', async function () { | ||
| // await TokenSwap(pool, owner, 'Security', 'Currency'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // describe('swapSecurityOut', function () { | ||
| // it('should swap security tokens out for currency tokens', async function () { | ||
| // await TokenSwap(pool, owner, 'Currency', 'Security'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // describe('swapCurrencyIn', function () { | ||
| // it('should swap currency tokens in for security tokens', async function () { | ||
| // await TokenSwap(pool, owner, 'Currency', 'Security'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // describe('swapCurrencyOut', function () { | ||
| // it('should swap currency tokens out for security tokens', async function () { | ||
| // await TokenSwap(pool, owner, 'Security', 'Currency'); | ||
| // }); | ||
| // }); | ||
|
|
||
| // const TokenSwap = async (pool: Contract, owner: SignerWithAddress, fromToken: string, toToken: string) => { | ||
| // // amount of tokens to swap | ||
| // const amountTokens = 100; | ||
|
|
||
| // // Get initial balances of tokens for the owner | ||
| // const initialFromBalance = await pool.balanceOf(owner.address, fromToken); | ||
| // const initialToBalance = await pool.balanceOf(owner.address, toToken); | ||
|
|
||
| // // Approve the contract to spend tokens from the owner's account | ||
| // await pool.connect(owner).approveTokens(amountTokens, fromToken); | ||
|
|
||
| // // Execute the swap | ||
| // const result = await pool.connect(owner).swapTokensIn(amountTokens, fromToken, toToken); | ||
|
|
||
| // // Get updated balances after the swap | ||
| // const updatedFromBalance = await pool.balanceOf(owner.address, fromToken); | ||
| // const updatedToBalance = await pool.balanceOf(owner.address, toToken); | ||
|
|
||
| // // Assertions to check the result of the swap | ||
| // expect(updatedFromBalance).to.equal(initialFromBalance.sub(amountTokens)); // Tokens were deducted from the 'from' balance | ||
| // expect(updatedToBalance).to.be.greaterThan(initialToBalance); // Tokens were received in the 'to' balance | ||
|
|
||
| // // Assertions to check the result of the swap | ||
| // expect(updatedFromBalance).to.equal(initialFromBalance.sub(amountTokens)); // Tokens were deducted from the 'from' balance | ||
| // expect(updatedToBalance).to.be.greaterThan(initialToBalance); | ||
| // }; | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@vinaykumar0103 we do not have a deployment of the primary pool on mainnet. It is on goerli, can you check with goerli ? The VCUSD and other addresses are also for goerli only.