diff --git a/hardhat.config.ts b/hardhat.config.ts index 74d548e9b..955f01ed8 100644 --- a/hardhat.config.ts +++ b/hardhat.config.ts @@ -49,8 +49,6 @@ const config: HardhatUserConfig = { polygon: { url: envConfigProd.POLYGON_RPC_URL, accounts: envConfigProd.ACCOUNTS, - gasPrice: 120*10**9, - gas: 15*10**6, }, hardhat: { accounts: hardhatAccounts, diff --git a/tasks/helpers/submitMultiSigTx.ts b/tasks/helpers/submitMultiSigTx.ts index 58c7a7d9f..223f50032 100644 --- a/tasks/helpers/submitMultiSigTx.ts +++ b/tasks/helpers/submitMultiSigTx.ts @@ -2,6 +2,7 @@ import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers"; import {BytesLike} from "ethers"; import {IMultiSigGeneric__factory} from "typechain-types"; import {filterEvents, logger} from "utils"; +import { Wallet } from "ethers"; /** * Submits a transaction to the designated Multisig contract and executes it if possible. @@ -13,13 +14,13 @@ import {filterEvents, logger} from "utils"; */ export async function submitMultiSigTx( msAddress: string, - owner: SignerWithAddress, + owner: SignerWithAddress | Wallet, destination: string, data: BytesLike ): Promise { logger.out(`Submitting transaction to Multisig at address: ${msAddress}...`); const multisig = IMultiSigGeneric__factory.connect(msAddress, owner); - const tx = await multisig.submitTransaction(destination, 0, data, "0x"); + const tx = await multisig.submitTransaction(destination, 0, data, "0x", {gasPrice: 120*10**9}); logger.out(`Tx hash: ${tx.hash}`); const receipt = await tx.wait(); diff --git a/utils/signers/connectSignerFromPkey.ts b/utils/signers/connectSignerFromPkey.ts index 334fb7b80..0cbce32e5 100644 --- a/utils/signers/connectSignerFromPkey.ts +++ b/utils/signers/connectSignerFromPkey.ts @@ -1,11 +1,9 @@ -import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers"; import {Wallet} from "ethers"; import {HardhatRuntimeEnvironment} from "hardhat/types"; export async function connectSignerFromPkey( pkey: string, hre: HardhatRuntimeEnvironment -): Promise { - const signer = new Wallet(pkey, hre.ethers.provider); - return hre.ethers.getSigner(signer.address); +): Promise { + return new Wallet(pkey, hre.ethers.provider); } diff --git a/utils/signers/getAPTeamOwner.ts b/utils/signers/getAPTeamOwner.ts index cf383c162..7cbe39219 100644 --- a/utils/signers/getAPTeamOwner.ts +++ b/utils/signers/getAPTeamOwner.ts @@ -2,11 +2,12 @@ import {SignerWithAddress} from "@nomiclabs/hardhat-ethers/signers"; import {HardhatRuntimeEnvironment} from "hardhat/types"; import {connectSignerFromPkey} from "./connectSignerFromPkey"; import {getSigners} from "./getSigners"; +import { Wallet } from "ethers"; export async function getAPTeamOwner( hre: HardhatRuntimeEnvironment, pkey?: string -): Promise { +): Promise { if (pkey) { return await connectSignerFromPkey(pkey, hre); }