Merge branch 'develop' into features/add-new-wmatic-address-mumbai

pods-finance · May 11, 2021 · e23fb24 · e23fb24
2 parents 68105c6 + 2bb59a6
commit e23fb24
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/contracts/amm/OptionAMMFactory.sol b/contracts/amm/OptionAMMFactory.sol
@@ -46,8 +46,8 @@ contract OptionAMMFactory is IOptionAMMFactory {
     ) external override returns (address) {
         require(address(_pools[_optionAddress]) == address(0), "OptionAMMFactory: Pool already exists");
 
-        FeePool feePoolTokenA = new FeePool(_stableAsset, 35, 4);
-        FeePool feePoolTokenB = new FeePool(_stableAsset, 15, 4);
+        FeePool feePoolTokenA = new FeePool(_stableAsset, 15, 3);
+        FeePool feePoolTokenB = new FeePool(_stableAsset, 15, 3);
 
         OptionAMMPool pool = new OptionAMMPool(
             _optionAddress,

diff --git a/deployments/kovan.json b/deployments/kovan.json
@@ -20,6 +20,6 @@
   "sigmaGuesser": "0x1e4F517b0caB78C1c3081fc78526ed4193587147",
   "chainlinkPriceFeed": "0xBD778aFF7db015A9417845660357dE1ca2180c36",
   "priceProvider": "0x5B9DD668D6e0BF1DC5929A19B24Fd9792D3C0b8D",
-  "optionAMMFactory": "0xC7Bf13A33A6fB2fE8095CfF99e5c0cf6327a2D7F",
+  "optionAMMFactory": "0xae3aa05186f9ed917383EF1671260EE40AE7BeE1",
   "optionHelper": "0x19dCF7AAfBa778200a69c342654Aa8BCE656a57F"
 }
diff --git a/deployments/mumbai.json b/deployments/mumbai.json
@@ -20,6 +20,6 @@
   "sigmaGuesser": "0xdfb3771eE2eb1BE9CDf34F4c1dee3d585199fbDD",
   "chainlinkPriceFeed": "0xe7A872aC181F22680bb9E8A2Cbb5Fc6311994efd",
   "priceProvider": "0x5c6732988b36a510aD3E370f34407a92C014094a",
-  "optionAMMFactory": "0x1217945D2C9143DcF561148b2B1908ab5c06A21A",
+  "optionAMMFactory": "0x08830F3a4D9604C8C58DAbf9C267378689624fE4",
   "optionHelper": "0xF2f848CD51807E8a07698a6a7542f5Be17f01a26"
 }
diff --git a/test/amm/OptionAMMPool.test.js b/test/amm/OptionAMMPool.test.js
@@ -671,7 +671,7 @@ scenarios.forEach(scenario => {
         const tokensSpent = buyerStrikeAmountBeforeTrade.sub(buyerStrikeAmountAfterTrade)
         expect(tradeDetails.amountBIn).to.be.equal(tokensSpent)
 
-        const feesBN = (new BigNumber(tokensSpent.toString()).multipliedBy(new BigNumber(0.005))).toFixed(0, 2)
+        const feesBN = (new BigNumber(tokensSpent.toString()).multipliedBy(new BigNumber(0.03))).toFixed(0, 2)
         const fees = toBigNumber(feesBN.toString())
         const feeContractA = await ethers.getContractAt('FeePool', feeAddressA)
         const feeContractB = await ethers.getContractAt('FeePool', feeAddressB)
@@ -845,7 +845,7 @@ scenarios.forEach(scenario => {
 
         const [poolOptionAmountAfterTrade, poolStrikeAmountAfterTrade] = await optionAMMPool.getPoolBalances()
 
-        const feesBN = (new BigNumber(numberOfTokensToReceive.toString()).multipliedBy(new BigNumber(0.005))).toFixed(0, 2)
+        const feesBN = (new BigNumber(numberOfTokensToReceive.toString()).multipliedBy(new BigNumber(0.03))).toFixed(0, 2)
         const fees = toBigNumber(feesBN.toString())
 
         expect(poolStrikeAmountBeforeTrade).to.eq(poolStrikeAmountAfterTrade.add(numberOfTokensToReceive).add(fees))