From 58a0f669bb9dee6b5e0554fb232de5409475d010 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Tue, 13 Feb 2024 21:14:12 -0800 Subject: [PATCH 1/2] deploy vestings B + C --- addresses/address.json | 4 +++- scripts/deploy_vesting.js | 16 +++++++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/addresses/address.json b/addresses/address.json index 293daab8..0f75d135 100644 --- a/addresses/address.json +++ b/addresses/address.json @@ -140,7 +140,9 @@ "Splitter": "0xadF0D06e58E618de36Af0F1b52891b14FAA61187", "Distribute": "0x01BE353d9Fd3A64C591A30A8c4a6a37B5dfAe165", "VestingWallet0": "0x8D011915C437AD5f5e3B0E4c6dd6380c92599f99", - "VestingWalletA": "0xf9FB1f54eA825734E3a77e73A3864f4B46C815d9" + "VestingWalletA": "0xf9FB1f54eA825734E3a77e73A3864f4B46C815d9", + "VestingWalletB": "0x8a8Ec65F257072e30Dd8FeF539dC6aD67d578074", + "VestingWalletC": "0xe2F2Abdf25D2ECc75E21691Ee8fF9c85737Faa37" }, "goerli": { "chainId": 5, diff --git a/scripts/deploy_vesting.js b/scripts/deploy_vesting.js index 71442ade..88e7a3d4 100644 --- a/scripts/deploy_vesting.js +++ b/scripts/deploy_vesting.js @@ -49,6 +49,7 @@ async function main() { OPFOwner = "0x0d27cd67c4A3fd3Eb9C7C757582f59089F058167"; routerOwner = OPFOwner; OceanTokenAddress = "0x967da4048cD07aB37855c090aAF366e4ce1b9F48"; + gasPrice = ethers.utils.parseUnits('16', 'gwei') break; default: @@ -100,12 +101,21 @@ async function main() { const blockTimestamp = block.timestamp const endDate = "2024-03-14" const endDateUnix = parseInt(new Date(endDate).getTime() / 1000) - const startTimestamp = 1705017600 // Fri Jan 12 2024 00:00:00 GMT+0000 - const endTimestamp = 1709856000 // Fri Mar 08 2024 00:00:00 GMT+0000 - this is when we top up last week of DF Main1 + //vesting A + //const startTimestamp = 1705017600 // Fri Jan 12 2024 00:00:00 GMT+0000 + //const endTimestamp = 1709856000 // Fri Mar 08 2024 00:00:00 GMT+0000 - this is when we top up last week of DF Main1 + //vesting B + //const startTimestamp = 1710028800 // Sun Mar 10 2024 00:00:00 GMT+0000 + //const endTimestamp = 1725750000 // Sat Sep 07 2024 23:00:00 GMT+0000 - this is when we top up last week of DF Main2 + //vesting C + const startTimestamp = 1725750000 // Sat Sep 07 2024 23:00:00 GMT+0000 + const endTimestamp = 1741392000 // Sat Mar 08 2025 00:00:00 GMT+0000 - this is when we top up last week of DF Main3 + + const vestingPeriod = endTimestamp - startTimestamp const deployVestingWallet0 = await VestingWallet0.connect(owner).deploy(addresses.Splitter, startTimestamp, vestingPeriod, options) await deployVestingWallet0.deployTransaction.wait(); - addresses.VestingWalletA = deployVestingWallet0.address; + addresses.VestingWalletC = deployVestingWallet0.address; if (show_verify) { console.log("\tRun the following to verify on etherscan"); console.log("\tnpx hardhat verify --network " + networkName + " " + addresses.VestingWalletA+" "+addresses.Splitter+" "+blockTimestamp+" "+vestingPeriod) From 06f4a047aa15c4d9832f12a645934e93497245b5 Mon Sep 17 00:00:00 2001 From: alexcos20 Date: Wed, 14 Feb 2024 21:39:44 -0800 Subject: [PATCH 2/2] fix timestamps & deploy --- addresses/address.json | 4 ++-- scripts/deploy_vesting.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addresses/address.json b/addresses/address.json index 0f75d135..0d2f9236 100644 --- a/addresses/address.json +++ b/addresses/address.json @@ -141,8 +141,8 @@ "Distribute": "0x01BE353d9Fd3A64C591A30A8c4a6a37B5dfAe165", "VestingWallet0": "0x8D011915C437AD5f5e3B0E4c6dd6380c92599f99", "VestingWalletA": "0xf9FB1f54eA825734E3a77e73A3864f4B46C815d9", - "VestingWalletB": "0x8a8Ec65F257072e30Dd8FeF539dC6aD67d578074", - "VestingWalletC": "0xe2F2Abdf25D2ECc75E21691Ee8fF9c85737Faa37" + "VestingWalletB": "0xf02e3163Dc3409D69D88D7AcDA613432E9A18741", + "VestingWalletC": "0x29F74B853C4B8D36273666FB63a3b71c754424Ed" }, "goerli": { "chainId": 5, diff --git a/scripts/deploy_vesting.js b/scripts/deploy_vesting.js index 88e7a3d4..bcbe1848 100644 --- a/scripts/deploy_vesting.js +++ b/scripts/deploy_vesting.js @@ -49,7 +49,7 @@ async function main() { OPFOwner = "0x0d27cd67c4A3fd3Eb9C7C757582f59089F058167"; routerOwner = OPFOwner; OceanTokenAddress = "0x967da4048cD07aB37855c090aAF366e4ce1b9F48"; - gasPrice = ethers.utils.parseUnits('16', 'gwei') + gasPrice = ethers.utils.parseUnits('23', 'gwei') break; default: @@ -106,10 +106,10 @@ async function main() { //const endTimestamp = 1709856000 // Fri Mar 08 2024 00:00:00 GMT+0000 - this is when we top up last week of DF Main1 //vesting B //const startTimestamp = 1710028800 // Sun Mar 10 2024 00:00:00 GMT+0000 - //const endTimestamp = 1725750000 // Sat Sep 07 2024 23:00:00 GMT+0000 - this is when we top up last week of DF Main2 + //const endTimestamp = 1725753600 // Sun Sep 08 2024 00:00:00 GMT+0000 - this is when we top up last week of DF Main2 //vesting C - const startTimestamp = 1725750000 // Sat Sep 07 2024 23:00:00 GMT+0000 - const endTimestamp = 1741392000 // Sat Mar 08 2025 00:00:00 GMT+0000 - this is when we top up last week of DF Main3 + const startTimestamp = 1725753600 // Sun Sep 08 2024 00:00:00 GMT+0000 + const endTimestamp = 1741478400 // Sun Mar 09 2025 00:00:00 GMT+0000 - this is when we top up last week of DF Main3 const vestingPeriod = endTimestamp - startTimestamp @@ -118,7 +118,7 @@ async function main() { addresses.VestingWalletC = deployVestingWallet0.address; if (show_verify) { console.log("\tRun the following to verify on etherscan"); - console.log("\tnpx hardhat verify --network " + networkName + " " + addresses.VestingWalletA+" "+addresses.Splitter+" "+blockTimestamp+" "+vestingPeriod) + console.log("\tnpx hardhat verify --network " + networkName + " " + deployVestingWallet0.address+" "+addresses.Splitter+" "+blockTimestamp+" "+vestingPeriod) } if (sleepAmount > 0) await sleep(sleepAmount)