add settings

The-Poolz · Dec 18, 2023 · 3c39923 · 3c39923
1 parent 4653550
commit 3c39923
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/scripts/deploy.ts b/scripts/deploy.ts
@@ -8,7 +8,7 @@ import {
     VaultManager,
     DelayVaultMigrator,
 } from "../typechain-types"
-import { v1DelayVaultTestnet, POOLXTestnet } from "./utility/constants"
+import { v1DelayVault, POOLX } from "./utility/constants"
 import { deploy, delayVaultSettings } from "./utility/deployment"
 
 async function deployAllContracts(baseURI: string = "") {
@@ -24,22 +24,13 @@ async function deployAllContracts(baseURI: string = "") {
     const lockProvider: LockDealProvider = await deploy("LockDealProvider", lockDealNFT.address, dealProvider.address)
 
     // Deploy TimedDealProvider contract
-    const timedDealProvider: TimedDealProvider = await deploy(
-        "TimedDealProvider",
-        lockDealNFT.address,
-        lockProvider.address
-    )
+    await deploy("TimedDealProvider", lockDealNFT.address, lockProvider.address)
 
     // Deploy Migrator contract
-    const migrator: DelayVaultMigrator = await deploy("DelayVaultMigrator", lockDealNFT.address, v1DelayVaultTestnet)
+    const migrator: DelayVaultMigrator = await deploy("DelayVaultMigrator", lockDealNFT.address, v1DelayVault)
 
     // Deploy DelayVaultProvider contract
-    await deploy(
-        "DelayVaultProvider",
-        POOLXTestnet,
-        migrator.address,
-        delayVaultSettings(dealProvider.address, lockProvider.address, timedDealProvider.address)
-    )
+    await deploy("DelayVaultProvider", POOLX, migrator.address, delayVaultSettings(lockProvider.address))
 
     // Deploy CollateralProvider contract
     const collateralProvider: CollateralProvider = await deploy(

diff --git a/scripts/utility/deployment.ts b/scripts/utility/deployment.ts
@@ -1,6 +1,5 @@
 import { ethers } from "hardhat"
-import { IDelayVaultProvider } from "../../typechain-types"
-import { gasLimit, gasPrice, POOLXTestnet } from "./constants"
+import { gasLimit, gasPrice } from "./constants"
 import { utils, Wallet } from "ethers"
 
 export const deploy = async <T>(contractName: string, ...args: any[]): Promise<T> => {
@@ -23,17 +22,17 @@ export async function deployFrom<T>(contractName: string, user: Wallet, ...args:
 //     ["0x999a76a387ad9d199544cfbafad1673a2c39aa11", [604800, 2419200], "20000000000000000000000"],
 // ]
 
-export function delayVaultSettings(dealProvider: string, lockProvider: string, timedDealProvider: string) {
-    const tier1 = utils.parseUnits("250", 18)
-    const tier2 = utils.parseUnits("3500", 18)
+export function delayVaultSettings(lockProvider: string) {
+    const tier1 = utils.parseUnits("3499", 18)
+    const tier2 = utils.parseUnits("19999", 18)
     const tier3 = utils.parseUnits("20000", 18)
     const ONE_DAY = 86400
-    const week = ONE_DAY * 7
-    const startTime = week
-    const finishTime = week * 4
+    const tier1Timer = ONE_DAY * 10
+    const tier2Timer = ONE_DAY * 20
+    const tier3Timer = ONE_DAY * 30
     return [
-        { provider: dealProvider, params: [], limit: tier1 },
-        { provider: lockProvider, params: [startTime], limit: tier2 },
-        { provider: timedDealProvider, params: [startTime, finishTime], limit: tier3 },
+        { provider: lockProvider, params: [tier1Timer], limit: tier1 },
+        { provider: lockProvider, params: [tier2Timer], limit: tier2 },
+        { provider: lockProvider, params: [tier3Timer], limit: tier3 },
     ]
 }