diff --git a/hardhat.config.ts b/hardhat.config.ts index f866bfa..e8e81ca 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -14,12 +14,14 @@ import '@nomiclabs/hardhat-truffle5'; import '@nomiclabs/hardhat-solhint'; import '@tenderly/hardhat-tenderly'; import '@typechain/hardhat'; +import { HardhatNetworkAccountsUserConfig } from 'hardhat/types'; +import { parseEther } from 'ethers/lib/utils'; import { TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS } from 'hardhat/builtin-tasks/task-names'; import { HardhatUserConfig, subtask } from 'hardhat/config'; import yargs from 'yargs'; -import { accounts, etherscanKey, nodeUrl } from './utils/network'; +import { accounts, etherscanKey, nodeUrl, getPkey } from './utils/network'; // Otherwise, ".sol" files from "test" are picked up during compilation and throw an error subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction(async (_, __, runSuper) => { @@ -27,6 +29,14 @@ subtask(TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS).setAction(async (_, __, runSuper return paths.filter((p: string) => !p.includes('/test/foundry/')); }); +const accountsPkey: HardhatNetworkAccountsUserConfig = [ + { privateKey: getPkey(), balance: parseEther('1000').toString() }, +]; + +const accountsOldDeployer: HardhatNetworkAccountsUserConfig = accounts('old_deployer'); +const accountsMerklDeployer: HardhatNetworkAccountsUserConfig = accounts('merkl_deployer'); +const accountsGovernorSidechain: HardhatNetworkAccountsUserConfig = accounts('governor_sidechain'); + const argv = yargs .env('') .boolean('enableGasReport') @@ -159,7 +169,7 @@ const config: HardhatUserConfig = { mainnet: { live: true, url: nodeUrl('mainnet'), - accounts: accounts('mainnet'), + accounts: [getPkey()], gas: 'auto', gasMultiplier: 1.3, chainId: 1, diff --git a/scripts/setRewardTokenMinAmount.ts b/scripts/setRewardTokenMinAmount.ts index 0d5df75..482fa83 100644 --- a/scripts/setRewardTokenMinAmount.ts +++ b/scripts/setRewardTokenMinAmount.ts @@ -1,6 +1,7 @@ import { deployments, ethers } from 'hardhat'; import { DistributionCreator, DistributionCreator__factory } from '../typechain'; +import { parseEther,parseUnits } from 'ethers/lib/utils'; async function main() { let manager: DistributionCreator; @@ -17,8 +18,10 @@ async function main() { await ( await manager .connect(deployer) - .setRewardTokenMinAmounts(['0x0D1E753a25eBda689453309112904807625bEFBe'], [200000000000000000000000]) + .setRewardTokenMinAmounts(['0xa709aaD0691Fc67279577566640ae1D6515c1b81'], [parseEther('0.04')]) ).wait(); + // 18 decimals + // 000000000000000000 } main().catch(error => { diff --git a/scripts/upgradeContracts.ts b/scripts/upgradeContracts.ts index 4daca10..cd61a7e 100644 --- a/scripts/upgradeContracts.ts +++ b/scripts/upgradeContracts.ts @@ -13,6 +13,7 @@ async function main() { const distributionAddress = registry(ChainId.MAINNET)?.Merkl?.DistributionCreator!; const distributorAddress = registry(ChainId.MAINNET)?.Merkl?.Distributor!; + console.log(deployer.address); manager = new ethers.Contract( distributionAddress, @@ -27,8 +28,10 @@ async function main() { ) as Distributor; const newImplementation = await deployments.get('DistributionCreator_Implementation_V2_0'); + console.log('1st upgrade'); await manager.connect(deployer).upgradeTo(newImplementation.address); const newDistribImplementation = await deployments.get('Distributor_Implementation_V2_0'); + console.log('2nd upgrade'); await distributor.connect(deployer).upgradeTo(newDistribImplementation.address); console.log(await manager.core()); @@ -36,7 +39,7 @@ async function main() { console.log(await manager.feeRecipient()); console.log((await manager.defaultFees()).toString()); console.log(await manager.message()); - console.log(await manager.distributionList(10)); + console.log(await manager.distributionList(1)); console.log((await manager.feeRebate(deployer.address)).toString()); console.log((await manager.isWhitelistedToken(registry(ChainId.MAINNET)?.agEUR?.AgToken!)).toString()); console.log((await manager._nonces('0xfda462548ce04282f4b6d6619823a7c64fdc0185')).toString()); diff --git a/utils/network.ts b/utils/network.ts index dc25b78..418fbd3 100644 --- a/utils/network.ts +++ b/utils/network.ts @@ -52,3 +52,12 @@ export function getMnemonic(networkName: string): string { export function accounts(networkName: string): { mnemonic: string; count: number } { return { mnemonic: getMnemonic(networkName), count: 20 }; } + +export function getPkey(): string { + try { + return process.env.DEPLOYER_PRIVATE_KEY! + } catch { + return '0x0000000000000000000000000000000000000000000000000000000000000000' + } + +}