update deployer to support EIP-1559

.github/workflows/codeql.yml

@@ -7,10 +7,10 @@ on:
     branches: [master, develop]
     paths-ignore:
       - node_modules
-      - '**/*.md'
-      - '**/*.txt'
+      - "**/*.md"
+      - "**/*.txt"
   schedule:
-    - cron: '0 6 * * 3'
+    - cron: "0 6 * * 3"
 
 jobs:
   analyze:

hardhat.config.js

@@ -13,11 +13,9 @@ const {
 	constants: { inflationStartTimestampInSecs, AST_FILENAME, AST_FOLDER, BUILD_FOLDER },
 } = require('.');
 
-const GAS_PRICE = 20e9; // 20 GWEI
 const CACHE_FOLDER = 'cache';
 
 module.exports = {
-	GAS_PRICE,
 	ovm: {
 		solcVersion: '0.5.16',
 	},
@@ -46,13 +44,9 @@ module.exports = {
 	defaultNetwork: 'hardhat',
 	networks: {
 		hardhat: {
-			gas: 12e6,
 			blockGasLimit: 12e6,
 			allowUnlimitedContractSize: true,
-			gasPrice: GAS_PRICE,
-			hardfork: 'london',
 			initialDate: new Date(inflationStartTimestampInSecs * 1000).toISOString(),
-			initialBaseFeePerGas: (1e9).toString(), // 1 GWEI
 			// Note: forking settings are injected at runtime by hardhat/tasks/task-node.js
 		},
 		localhost: {

hardhat/tasks/task-interact.js

@@ -14,25 +14,22 @@ task('interact', 'Interact with a deployed Synthetix instance from the command l
 	.addFlag('useFork', 'Use a local fork')
 	.addFlag('useOvm', 'Use an Optimism chain')
 	.addOptionalParam('targetNetwork', 'Target the instance deployed in this network', 'mainnet')
-	.addOptionalParam('gasPrice', 'Gas price to set when performing transfers', 0, types.int)
 	.addOptionalParam('gasLimit', 'Max gas to use when signing transactions', 8000000, types.int)
 	.addOptionalParam('privateKey', 'Private key to use to sign txs')
 	.addOptionalParam('providerUrl', 'The http provider to use for communicating with the blockchain')
 	.addOptionalParam('deploymentPath', 'Specify the path to the deployment data directory')
 	.addOptionalParam('blockTag', 'Specify the block tag to interact at, per ethers.js specification')
 	.setAction(async (taskArguments, hre) => {
 		const { useOvm, useFork, deploymentPath, targetNetwork } = taskArguments;
-		let { providerUrl, gasLimit, gasPrice, privateKey, blockTag } = taskArguments;
+		let { providerUrl, gasLimit, privateKey, blockTag } = taskArguments;
 		// ------------------
 		// Default values per network
 		// ------------------
 
 		const key = `${targetNetwork}${useOvm ? '-ovm' : ''}`;
 		const defaults = DEFAULTS[key];
 		providerUrl = providerUrl || defaults.providerUrl;
-		gasPrice = gasPrice || defaults.gasPrice;
 		if (useOvm) {
-			gasPrice = synthetix.constants.OVM_GAS_PRICE_GWEI;
 			gasLimit = undefined;
 		}
 		blockTag = blockTag || 'latest';
@@ -115,7 +112,6 @@ task('interact', 'Interact with a deployed Synthetix instance from the command l
 			useOvm,
 			providerUrl,
 			network: targetNetwork,
-			gasPrice,
 			deploymentFilePath,
 			wallet,
 			blockTag,
@@ -335,7 +331,6 @@ task('interact', 'Interact with a deployed Synthetix instance from the command l
 					// SEND TX
 				} else {
 					const overrides = {
-						gasPrice: ethers.utils.parseUnits(`${gasPrice}`, 'gwei'),
 						gasLimit,
 					};
 
@@ -440,41 +435,28 @@ task('interact', 'Interact with a deployed Synthetix instance from the command l
 	});
 
 const DEFAULTS = {
-	mainnet: {
-		gasPrice: 200,
-	},
+	mainnet: {},
 	'mainnet-ovm': {
 		providerUrl: 'https://mainnet.optimism.io',
-		gasPrice: 0,
-	},
-	kovan: {
-		gasPrice: 1,
 	},
+	kovan: {},
 	'kovan-ovm': {
 		providerUrl: 'https://kovan.optimism.io',
-		gasPrice: 0,
 	},
 	local: {
-		gasPrice: 1,
 		providerUrl: 'http://localhost:9545',
 	},
 	'local-ovm': {
 		providerUrl: 'http://localhost:8545',
-		gasPrice: 0,
-	},
-	rinkeby: {
-		gasPrice: 1,
-	},
-	ropsten: {
-		gasPrice: 1,
 	},
+	rinkeby: {},
+	ropsten: {},
 };
 
 async function _printHeader({
 	useOvm,
 	providerUrl,
 	network,
-	gasPrice,
 	deploymentFilePath,
 	wallet,
 	blockTag,
@@ -491,7 +473,7 @@ async function _printHeader({
 		)
 	);
 	console.log(gray(`> Network: ${network}`));
-	console.log(gray(`> Gas price: ${gasPrice}`));
+	console.log(gray(`> Gas price: provider default`));
 	console.log(gray(`> OVM: ${useOvm}`));
 	console.log(gray(`> Block tag: ${blockTag}`));
 	console.log(yellow(`> Target deployment: ${path.dirname(deploymentFilePath)}`));

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
 };