requested fixes

* remove gas limit
* isolate gas options into mixin function
* remove remaining gasPrice references

Author: dbeal-eth

index.js

@@ -90,8 +90,6 @@ const constants = {
 	ZERO_ADDRESS: '0x' + '0'.repeat(40),
 	ZERO_BYTES32: '0x' + '0'.repeat(64),
 
-	OVM_GAS_PRICE_GWEI: '0.015',
-
 	inflationStartTimestampInSecs: 1551830400, // 2019-03-06T00:00:00Z
 };
 

publish/src/Deployer.js

@@ -4,7 +4,7 @@ const linker = require('solc/linker');
 const ethers = require('ethers');
 const { gray, green, yellow } = require('chalk');
 const fs = require('fs');
-const { stringify, getExplorerLinkPrefix } = require('./util');
+const { stringify, getExplorerLinkPrefix, mixinGasOptions } = require('./util');
 const { getVersions, getUsers } = require('../..');
 
 class Deployer {
@@ -114,28 +114,17 @@ class Deployer {
 		return ethers.utils.defaultAbiCoder.encode(types, params);
 	}
 
-	async addGasOptions(tx) {
-		if (this.gasPrice) {
-			tx.gasPrice = ethers.utils.parseUnits(this.gasPrice.toString(), 'gwei');
-		} else if ((await this.provider.getFeeData()).maxFeePerGas) {
-			if (this.maxFeePerGas)
-				tx.maxFeePerGas = ethers.utils.parseUnits(this.maxFeePerGas.toString(), 'gwei');
-			if (this.maxPriorityFeePerGas)
-				tx.maxPriorityFeePerGas = ethers.utils.parseUnits(
-					this.maxPriorityFeePerGas.toString(),
-					'gwei'
-				);
-		}
-	}
-
 	async sendDummyTx() {
-		const tx = {
-			to: '0x0000000000000000000000000000000000000001',
-			data: '0x0000000000000000000000000000000000000000000000000000000000000000',
-			value: 0,
-		};
-
-		this.addGasOptions(tx);
+		const tx = await mixinGasOptions(
+			{
+				to: '0x0000000000000000000000000000000000000001',
+				data: '0x0000000000000000000000000000000000000000000000000000000000000000',
+				value: 0,
+			},
+			this.provider,
+			this.maxFeePerGas,
+			this.maxPriorityFeePerGas
+		);
 
 		const response = await this.signer.sendTransaction(tx);
 		await response.wait();
@@ -145,16 +134,13 @@ class Deployer {
 		}
 	}
 
-	async sendOverrides(type = 'method-call') {
-		const gasLimit = this.useOvm
-			? undefined
-			: type === 'method-call'
-			? this.methodCallGasLimit
-			: this.contractDeploymentGasLimit;
-
-		const params = { gasLimit };
-
-		this.addGasOptions(params);
+	async sendOverrides() {
+		const params = await mixinGasOptions(
+			{},
+			this.provider,
+			this.maxFeePerGas,
+			this.maxPriorityFeePerGas
+		);
 
 		if (this.nonceManager) {
 			params.nonce = await this.nonceManager.getNonce();
@@ -295,7 +281,7 @@ class Deployer {
 
 				const factory = new ethers.ContractFactory(compiled.abi, bytecode, this.signer);
 
-				const overrides = await this.sendOverrides('contract-deployment');
+				const overrides = await this.sendOverrides();
 
 				deployedContract = await factory.deploy(...args, overrides);
 				const receipt = await deployedContract.deployTransaction.wait();

publish/src/command-utils/transact.js

@@ -1,5 +1,10 @@
 const ethers = require('ethers');
-const { appendOwnerActionGenerator, confirmAction, stringify } = require('../util');
+const {
+	appendOwnerActionGenerator,
+	confirmAction,
+	stringify,
+	mixinGasOptions,
+} = require('../util');
 const { gray, yellow, green, redBright } = require('chalk');
 
 let _dryRunCounter = 0;
@@ -19,8 +24,8 @@ const performTransactionalStep = async ({
 	expected,
 	write,
 	writeArg, // none, 1 or an array of args, array will be spread into params
-	gasLimit,
-	deployer,
+	maxFeePerGas,
+	maxPriorityFeePerGas,
 	generateSolidity,
 	explorerLinkPrefix,
 	ownerActions,
@@ -76,11 +81,12 @@ const performTransactionalStep = async ({
 			_dryRunCounter++;
 			hash = '0x' + _dryRunCounter.toString().padStart(64, '0');
 		} else {
-			const overrides = {
-				gasLimit,
-			};
-
-			deployer.addGasOptions(overrides);
+			const overrides = await mixinGasOptions(
+				{},
+				target.provider,
+				maxFeePerGas,
+				maxPriorityFeePerGas
+			);
 
 			if (nonceManager) {
 				overrides.nonce = await nonceManager.getNonce();

publish/src/commands/deploy-shorting-rewards.js

@@ -252,7 +252,8 @@ const deployShortingRewards = async ({
 				gasLimit: methodCallGasLimit, // allow overriding of gasLimit
 				...opts,
 				signer,
-				deployer,
+				maxFeePerGas,
+				maxPriorityFeePerGas,
 				explorerLinkPrefix,
 				ownerActions,
 				ownerActionsFile,

publish/src/commands/deploy/index.js

@@ -18,13 +18,7 @@ const {
 const { performTransactionalStep } = require('../../command-utils/transact');
 
 const {
-	constants: {
-		BUILD_FOLDER,
-		CONFIG_FILENAME,
-		SYNTHS_FILENAME,
-		DEPLOYMENT_FILENAME,
-		OVM_GAS_PRICE_GWEI,
-	},
+	constants: { BUILD_FOLDER, CONFIG_FILENAME, SYNTHS_FILENAME, DEPLOYMENT_FILENAME },
 } = require('../../../..');
 
 const addSynthsToProtocol = require('./add-synths-to-protocol');
@@ -49,8 +43,6 @@ const takeDebtSnapshotWhenRequired = require('./take-debt-snapshot-when-required
 
 const DEFAULTS = {
 	priorityGasPrice: '1',
-	methodCallGasLimit: 250e3, // 250k
-	contractDeploymentGasLimit: 6.9e6, // TODO split out into separate limits for different contracts, Proxys, Synths, Synthetix
 	debtSnapshotMaxDeviation: 0.01, // a 1 percent deviation will trigger a snapshot
 	network: 'kovan',
 	buildPath: path.join(__dirname, '..', '..', '..', '..', BUILD_FOLDER),
@@ -60,7 +52,6 @@ const deploy = async ({
 	addNewSynths,
 	buildPath = DEFAULTS.buildPath,
 	concurrency,
-	contractDeploymentGasLimit = DEFAULTS.contractDeploymentGasLimit,
 	deploymentPath,
 	dryRun = false,
 	forceUpdateInverseSynthsOnTestnet = false,
@@ -71,7 +62,6 @@ const deploy = async ({
 	ignoreCustomParameters,
 	ignoreSafetyChecks,
 	manageNonces,
-	methodCallGasLimit = DEFAULTS.methodCallGasLimit,
 	network = DEFAULTS.network,
 	oracleExrates,
 	privateKey,
@@ -86,18 +76,6 @@ const deploy = async ({
 	deploymentPath = deploymentPath || getDeploymentPathForNetwork({ network, useOvm });
 	ensureDeploymentPath(deploymentPath);
 
-	let gasPrice = null;
-
-	// Gas price needs to be set to 0.015 gwei in Optimism,
-	// and gas limits need to be dynamically set by the provider.
-	// More info:
-	// https://www.notion.so/How-to-pay-Fees-in-Optimistic-Ethereum-f706f4e5b13e460fa5671af48ce9a695
-	if (useOvm) {
-		gasPrice = OVM_GAS_PRICE_GWEI;
-		methodCallGasLimit = undefined;
-		contractDeploymentGasLimit = undefined;
-	}
-
 	const limitPromise = pLimit(concurrency);
 
 	const {
@@ -141,14 +119,13 @@ const deploy = async ({
 
 	performSafetyChecks({
 		config,
-		contractDeploymentGasLimit,
 		deployment,
 		deploymentPath,
 		freshDeploy,
 		ignoreSafetyChecks,
 		manageNonces,
-		methodCallGasLimit,
-		gasPrice,
+		maxFeePerGas,
+		maxPriorityFeePerGas,
 		network,
 		useOvm,
 	});
@@ -202,15 +179,12 @@ const deploy = async ({
 
 	const deployer = new Deployer({
 		compiled,
-		contractDeploymentGasLimit,
 		config,
 		configFile,
 		deployment,
 		deploymentFile,
-		gasPrice,
 		maxFeePerGas,
 		maxPriorityFeePerGas,
-		methodCallGasLimit,
 		network,
 		privateKey,
 		providerUrl,
@@ -239,17 +213,14 @@ const deploy = async ({
 		addNewSynths,
 		concurrency,
 		config,
-		contractDeploymentGasLimit,
 		deployer,
 		deploymentPath,
 		dryRun,
 		earliestCompiledTimestamp,
 		freshDeploy,
-		gasPrice,
 		maxFeePerGas,
 		maxPriorityFeePerGas,
 		getDeployParameter,
-		methodCallGasLimit,
 		network,
 		oracleExrates,
 		providerUrl,
@@ -271,12 +242,11 @@ const deploy = async ({
 	const runStep = async opts => {
 		const { noop, ...rest } = await performTransactionalStep({
 			...opts,
-			// no gas limit on OVM (use system limit), otherwise use provided limit or the methodCall amount
-			gasLimit: useOvm ? undefined : opts.gasLimit || methodCallGasLimit,
 			signer,
 			dryRun,
 			explorerLinkPrefix,
-			deployer,
+			maxFeePerGas,
+			maxPriorityFeePerGas,
 			generateSolidity,
 			nonceManager: manageNonces ? nonceManager : undefined,
 			ownerActions,
@@ -410,7 +380,6 @@ const deploy = async ({
 
 	await configureSystemSettings({
 		deployer,
-		methodCallGasLimit,
 		useOvm,
 		generateSolidity,
 		getDeployParameter,
@@ -472,12 +441,6 @@ module.exports = {
 				'Path to a folder hosting compiled files from the "build" step in this script',
 				DEFAULTS.buildPath
 			)
-			.option(
-				'-c, --contract-deployment-gas-limit <value>',
-				'Contract deployment gas limit',
-				parseFloat,
-				DEFAULTS.contractDeploymentGasLimit
-			)
 			.option(
 				'-d, --deployment-path <value>',
 				`Path to a folder that has your input configuration file ${CONFIG_FILENAME}, the synth list ${SYNTHS_FILENAME} and where your ${DEPLOYMENT_FILENAME} files will go`
@@ -521,12 +484,6 @@ module.exports = {
 				'-l, --oracle-gas-limit <value>',
 				'The address of the gas limit oracle for this network (default is use existing)'
 			)
-			.option(
-				'-m, --method-call-gas-limit <value>',
-				'Method call gas limit',
-				parseFloat,
-				DEFAULTS.methodCallGasLimit
-			)
 			.option(
 				'-n, --network <value>',
 				'The network to run off.',

publish/src/commands/nominate.js

@@ -15,11 +15,11 @@ const {
 	loadAndCheckRequiredSources,
 	loadConnections,
 	confirmAction,
+	mixinGasOptions,
 } = require('../util');
 
 const DEFAULTS = {
-	maxPriorityFeePerGas: '1',
-	gasLimit: 2e5, // 200,000
+	priorityGasPrice: '1',
 };
 
 const nominate = async ({
@@ -29,8 +29,7 @@ const nominate = async ({
 	useFork = false,
 	deploymentPath,
 	maxFeePerGas,
-	maxPriorityFeePerGas = '1',
-	gasLimit = DEFAULTS.gasLimit,
+	maxPriorityFeePerGas = DEFAULTS.priorityGasPrice,
 	useOvm,
 	privateKey,
 	providerUrl,
@@ -148,17 +147,8 @@ const nominate = async ({
 			const nominationFnc =
 				'nominateOwner' in deployedContract ? 'nominateOwner' : 'nominateNewOwner';
 
-			const feeData = await provider.getFeeData();
-
 			console.log(yellow(`Invoking ${contract}.${nominationFnc}(${newOwner})`));
-			const overrides = {
-				gasLimit,
-			};
-
-			if (feeData.maxFeePerGas) {
-				overrides.maxFeePerGas = ethers.utils.parseUnits(maxFeePerGas, 'gwei');
-				overrides.maxPriorityFeePerGas = ethers.utils.parseUnits(maxPriorityFeePerGas, 'gwei');
-			}
+			const overrides = await mixinGasOptions({}, provider, maxFeePerGas, maxPriorityFeePerGas);
 
 			const tx = await deployedContract[nominationFnc](newOwner, overrides);
 			await tx.wait();
@@ -185,13 +175,16 @@ module.exports = {
 				`Path to a folder that has your input configuration file ${CONFIG_FILENAME} and where your ${DEPLOYMENT_FILENAME} files will go`
 			)
 			.option('-g, --max-fee-per-gas <value>', 'Maximum base gas fee price in GWEI')
-			.option('--max-priority-fee-per-gas <value>', 'Priority gas fee price in GWEI', '1')
+			.option(
+				'--max-priority-fee-per-gas <value>',
+				'Priority gas fee price in GWEI',
+				DEFAULTS.priorityGasPrice
+			)
 			.option(
 				'-k, --use-fork',
 				'Perform the deployment on a forked chain running on localhost (see fork command).',
 				false
 			)
-			.option('-l, --gas-limit <value>', 'Gas limit', parseInt, 15e4)
 			.option('-n, --network <value>', 'The network to run off.', x => x.toLowerCase(), 'kovan')
 			.option(
 				'-o, --new-owner <value>',