Merge pull request #2644 from SelfKeyFoundation/release

Release 1.9.15
SelfKeyFoundation · Sep 24, 2021 · 3a7318b · 3a7318b
2 parents 8330313 + eacf1af
commit 3a7318b
Show file tree

Hide file tree

Showing 13 changed files with 38 additions and 32 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "selfkey-identity-wallet",
 	"productName": "SelfKey Identity Wallet",
-	"version": "1.9.14",
+	"version": "1.9.15",
 	"description": "The Official SelfKey Identity Wallet for Desktop",
 	"browser": [
 		"chrome"

diff --git a/src/common/contract/index.js b/src/common/contract/index.js
@@ -179,7 +179,7 @@ const operations = {
 					.ethGasStationInfo.average;
 			}
 
-			// TODO: suggestedMaxFeePerGas
+			// TODO: suggestedMaxPriorityFeePerGas
 
 			await dispatch(
 				contractActions.updateEditorAction({

diff --git a/src/common/eth-gas-station/selectors.js b/src/common/eth-gas-station/selectors.js
@@ -11,8 +11,9 @@ export const getEthGasStationInfoWEI = ({ ethGasStationInfo }) => {
 export const getEthFeeInfo = ({ ethGasStationInfo }) => ethGasStationInfo.ethGasStationInfo.fees;
 export const getEthFeeInfoWEI = ({ ethGasStationInfo }) => {
 	return {
-		medium: ethGasStationInfo.ethGasStationInfo.fees.medium.suggestedMaxFeePerGas * GWEI,
-		high: ethGasStationInfo.ethGasStationInfo.fees.high.suggestedMaxFeePerGas * GWEI,
-		low: ethGasStationInfo.ethGasStationInfo.fees.low.suggestedMaxFeePerGas * GWEI
+		medium:
+			ethGasStationInfo.ethGasStationInfo.fees.medium.suggestedMaxPriorityFeePerGas * GWEI,
+		high: ethGasStationInfo.ethGasStationInfo.fees.high.suggestedMaxPriorityFeePerGas * GWEI,
+		low: ethGasStationInfo.ethGasStationInfo.fees.low.suggestedMaxPriorityFeePerGas * GWEI
 	};
 };
diff --git a/src/common/marketplaces/marketplaces.spec.js b/src/common/marketplaces/marketplaces.spec.js
@@ -47,19 +47,19 @@ describe('marketplace selectors', () => {
 			fast: 7000,
 			safeLow: 2000,
 			fees: {
-				low: { suggestedMaxFeePerGas: 1 },
-				medium: { suggestedMaxFeePerGas: 2 },
-				high: { suggestedMaxFeePerGas: 3 }
+				low: { suggestedMaxPriorityFeePerGas: 1 },
+				medium: { suggestedMaxPriorityFeePerGas: 2 },
+				high: { suggestedMaxPriorityFeePerGas: 3 }
 			}
 		},
 		feePriceEstimates: {
 			avarage: 5000,
 			fast: 7000,
 			safeLow: 2000,
 			fees: {
-				low: { suggestedMaxFeePerGas: 1 },
-				medium: { suggestedMaxFeePerGas: 2 },
-				high: { suggestedMaxFeePerGas: 3 }
+				low: { suggestedMaxPriorityFeePerGas: 1 },
+				medium: { suggestedMaxPriorityFeePerGas: 2 },
+				high: { suggestedMaxPriorityFeePerGas: 3 }
 			}
 		},
 		gasPrice: 3000,
@@ -134,19 +134,19 @@ describe('marketplace selectors', () => {
 			fast: 7000,
 			safeLow: 2000,
 			fees: {
-				low: { suggestedMaxFeePerGas: 1 },
-				medium: { suggestedMaxFeePerGas: 2 },
-				high: { suggestedMaxFeePerGas: 3 }
+				low: { suggestedMaxPriorityFeePerGas: 1 },
+				medium: { suggestedMaxPriorityFeePerGas: 2 },
+				high: { suggestedMaxPriorityFeePerGas: 3 }
 			}
 		});
 		sinon.stub(ethGasStationInfoSelectors, 'getEthFeeInfoWEI').returns({
 			avarage: 5000,
 			fast: 7000,
 			safeLow: 2000,
 			fees: {
-				low: { suggestedMaxFeePerGas: 1 },
-				medium: { suggestedMaxFeePerGas: 2 },
-				high: { suggestedMaxFeePerGas: 3 }
+				low: { suggestedMaxPriorityFeePerGas: 1 },
+				medium: { suggestedMaxPriorityFeePerGas: 2 },
+				high: { suggestedMaxPriorityFeePerGas: 3 }
 			}
 		});
 		sinon.stub(fiatCurrencySelectors, 'getFiatCurrency').returns('USD');

diff --git a/src/common/transaction/operations.js b/src/common/transaction/operations.js
@@ -120,7 +120,8 @@ export const setTransactionFee = (newAddress, newAmount, newGasPrice, newGasLimi
 			if (!transaction.maxPriorityFee) {
 				maxPriorityFee = Number(
 					parseFloat(
-						state.ethGasStationInfo.ethGasStationInfo.fees.medium.suggestedMaxFeePerGas
+						state.ethGasStationInfo.ethGasStationInfo.fees.medium
+							.suggestedMaxPriorityFeePerGas
 					).toFixed(2)
 				);
 			} else {

diff --git a/src/common/transaction/operations.spec.js b/src/common/transaction/operations.spec.js
@@ -64,9 +64,9 @@ const getStoreMock = (transaction = {}) =>
 				average: 200,
 				fast: 300,
 				fees: {
-					low: { suggestedMaxFeePerGas: 1 },
-					medium: { suggestedMaxFeePerGas: 2 },
-					high: { suggestedMaxFeePerGas: 3 }
+					low: { suggestedMaxPriorityFeePerGas: 1 },
+					medium: { suggestedMaxPriorityFeePerGas: 2 },
+					high: { suggestedMaxPriorityFeePerGas: 3 }
 				}
 			}
 		}

diff --git a/src/renderer/did/create-did-popup-container.jsx b/src/renderer/did/create-did-popup-container.jsx
@@ -32,7 +32,7 @@ class CreateDIDPopupContainerComponent extends PureComponent {
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxPriorityFeePerGas)
 				: 1;
 		const ethFee = EthUnits.toEther((gasPrice + maxPriorityFee) * gasLimit, 'gwei');
 		const usdFee = ethFee * ethRate;

diff --git a/src/renderer/marketplace/bank-accounts/checkout/checkout-container.jsx b/src/renderer/marketplace/bank-accounts/checkout/checkout-container.jsx
@@ -40,7 +40,7 @@ class BankAccountsCheckoutContainer extends MarketplaceBankAccountsComponent {
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxPriorityFeePerGas)
 				: 1;
 		const price = jurisdiction.price;
 		const keyAmount = price / keyRate;

diff --git a/src/renderer/marketplace/incorporation/checkout/incorporations-checkout-container.jsx b/src/renderer/marketplace/incorporation/checkout/incorporations-checkout-container.jsx
@@ -39,7 +39,7 @@ class IncorporationsCheckoutContainer extends MarketplaceIncorporationsComponent
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxPriorityFeePerGas)
 				: 1;
 		const price = program.price;
 		const keyAmount = price / keyRate;

diff --git a/src/renderer/marketplace/keyfi/checkout/keyfi-checkout-container.jsx b/src/renderer/marketplace/keyfi/checkout/keyfi-checkout-container.jsx
@@ -42,7 +42,7 @@ class MarketplaceKeyFiCheckoutContainerComponent extends MarketplaceKeyFiCompone
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxPriorityFeePerGas)
 				: 1;
 		const price = product.price;
 		const ethPrice = price;

diff --git a/src/renderer/marketplace/notarization/process/request-notarization-container.jsx b/src/renderer/marketplace/notarization/process/request-notarization-container.jsx
@@ -99,7 +99,7 @@ class RequestNotarizationContainer extends MarketplaceNotariesComponent {
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxPriorityFeePerGas)
 				: 1;
 		const gasLimit = FIXED_GAS_LIMIT_PRICE;
 		const gasEthFee = EthUnits.toEther((gasPrice + maxPriorityFee) * gasLimit, 'gwei');

diff --git a/src/renderer/marketplace/passports/checkout/passports-checkout-container.jsx b/src/renderer/marketplace/passports/checkout/passports-checkout-container.jsx
@@ -39,7 +39,7 @@ class PassportsCheckoutContainerComponent extends MarketplacePassportsComponent
 		const gasPrice = ethGasStationInfo ? ethGasStationInfo.average : 50;
 		const maxPriorityFee =
 			ethGasStationInfo && ethGasStationInfo.fees && ethGasStationInfo.fees.medium
-				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxFeePerGas)
+				? parseFloat(ethGasStationInfo.fees.medium.suggestedMaxPriorityFeePerGas)
 				: 1;
 
 		const price = program.price;

diff --git a/src/renderer/transaction/send/components/transaction-fee-box.jsx b/src/renderer/transaction/send/components/transaction-fee-box.jsx
@@ -179,7 +179,8 @@ export class TransactionFeeBoxComponent extends PureComponent {
 			return;
 		}
 		const maxPriorityFee = parseFloat(
-			this.props.ethGasStationInfo.fees[this.typeTranslation(type)].suggestedMaxFeePerGas
+			this.props.ethGasStationInfo.fees[this.typeTranslation(type)]
+				.suggestedMaxPriorityFeePerGas
 		).toFixed(2);
 		return maxPriorityFee;
 	}
@@ -189,7 +190,8 @@ export class TransactionFeeBoxComponent extends PureComponent {
 		const gasLimit = this.props.gasLimit ? this.props.gasLimit : DEFAULT_ETH_GAS_LIMIT;
 
 		const maxFee = parseFloat(
-			this.props.ethGasStationInfo.fees[this.typeTranslation(type)].suggestedMaxFeePerGas
+			this.props.ethGasStationInfo.fees[this.typeTranslation(type)]
+				.suggestedMaxPriorityFeePerGas
 		);
 
 		const ethFee = EthUnits.toEther((gasPrice + maxFee) * gasLimit, 'gwei');
@@ -252,9 +254,11 @@ export class TransactionFeeBoxComponent extends PureComponent {
 		}
 
 		const gasPrice = this.props.ethGasStationInfo[type];
-		const maxPriorityFee = parseFloat(
-			this.props.ethGasStationInfo.fees[this.typeTranslation(type)]
-				.suggestedMaxPriorityFeePerGas
+		const maxPriorityFee = Number(
+			parseFloat(
+				this.props.ethGasStationInfo.fees[this.typeTranslation(type)]
+					.suggestedMaxPriorityFeePerGas
+			).toFixed(2)
 		);
 
 		if (changeMaxPriorityFeeAction) {