Merge branch 'master' into deployer-eip1559

Author: dbeal-eth

publish/deployed/local-ovm/synths.json

@@ -12,5 +12,9 @@
 		"sign": "Ξ",
 		"description": "Ether",
 		"name": "sETH"
+	},
+	{
+		"name": "sREDEEMER",
+		"asset": "USD"
 	}
 ]

publish/deployed/local/synths.json

@@ -357,7 +357,7 @@
 		"asset": "BTC",
 		"category": "crypto",
 		"sign": "₿",
-		"description": "Inverse Inverse Bitcoin",
+		"description": "Inverse Inverse Inverse Inverse Inverse Bitcoin",
 		"name": "iBTC",
 		"inverted": {
 			"entryPoint": 10600,
@@ -371,7 +371,7 @@
 		"asset": "ETH",
 		"category": "crypto",
 		"sign": "Ξ",
-		"description": "Inverse Inverse Ether",
+		"description": "Inverse Inverse Inverse Inverse Inverse Ether",
 		"name": "iETH",
 		"inverted": {
 			"entryPoint": 180.16,
@@ -385,7 +385,7 @@
 		"asset": "BNB",
 		"category": "crypto",
 		"sign": "",
-		"description": "Inverse Inverse Binance Coin",
+		"description": "Inverse Inverse Inverse Inverse Inverse Binance Coin",
 		"name": "iBNB",
 		"inverted": {
 			"entryPoint": 29,
@@ -399,7 +399,7 @@
 		"asset": "TRX",
 		"category": "crypto",
 		"sign": "",
-		"description": "Inverse Inverse TRON",
+		"description": "Inverse Inverse Inverse Inverse Inverse TRON",
 		"name": "iTRX",
 		"subclass": "PurgeableSynth",
 		"inverted": {
@@ -413,7 +413,7 @@
 		"asset": "XTZ",
 		"category": "crypto",
 		"sign": "",
-		"description": "Inverse Inverse Tezos",
+		"description": "Inverse Inverse Inverse Inverse Inverse Tezos",
 		"name": "iXTZ",
 		"subclass": "PurgeableSynth",
 		"inverted": {
@@ -427,7 +427,7 @@
 		"asset": "CEX",
 		"category": "index",
 		"sign": "",
-		"description": "Inverse Inverse Centralised Exchange Index",
+		"description": "Inverse Inverse Inverse Inverse Inverse Centralised Exchange Index",
 		"name": "iCEX",
 		"index": [
 			{
@@ -499,7 +499,7 @@
 		"asset": "DEFI",
 		"category": "index",
 		"sign": "",
-		"description": "Inverse Inverse DeFi Index",
+		"description": "Inverse Inverse Inverse Inverse Inverse DeFi Index",
 		"name": "iDEFI",
 		"index": [
 			{
@@ -620,5 +620,23 @@
 		"exchange": "TSE",
 		"description": "Nikkei 225 Index",
 		"name": "sNIKKEI"
+	},
+	{
+		"asset": "USD",
+		"category": "forex",
+		"sign": "$",
+		"description": "US Dollars",
+		"name": "sREDEEMER"
+	},
+	{
+		"asset": "USD",
+		"category": "forex",
+		"sign": "$",
+		"description": "US Dollars",
+		"name": "sREDEEMER"
+	},
+	{
+		"name": "sREDEEMER",
+		"asset": "USD"
 	}
 ]

publish/src/Deployer.js

@@ -114,6 +114,20 @@ 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 = await mixinGasOptions(
 			{
@@ -126,6 +140,8 @@ class Deployer {
 			this.maxPriorityFeePerGas
 		);
 
+		this.addGasOptions(tx);
+
 		const response = await this.signer.sendTransaction(tx);
 		await response.wait();
 

publish/src/command-utils/transact.js

@@ -26,6 +26,7 @@ const performTransactionalStep = async ({
 	writeArg, // none, 1 or an array of args, array will be spread into params
 	maxFeePerGas,
 	maxPriorityFeePerGas,
+	gasLimit,
 	generateSolidity,
 	skipSolidity,
 	explorerLinkPrefix,
@@ -85,7 +86,7 @@ const performTransactionalStep = async ({
 			hash = '0x' + _dryRunCounter.toString().padStart(64, '0');
 		} else {
 			const overrides = await mixinGasOptions(
-				{},
+				{ gasLimit },
 				target.provider,
 				maxFeePerGas,
 				maxPriorityFeePerGas

publish/src/commands/deploy/index.js

@@ -43,6 +43,8 @@ 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),