Release 1.0.10

Release 1.0.10

Author: estebanmino

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Current Develop Branch
 
+## v1.0.10 - Jan 25 2021
+- [#2164](https://github.com/MetaMask/metamask-mobile/pull/2164): Initialize NetworkController.provider with chainId (#2164)
+- [#2161](https://github.com/MetaMask/metamask-mobile/pull/2161): chainid migration (#2161)
+
 ## v1.0.9 - Jan 21 2021
 - [#2149](https://github.com/MetaMask/metamask-mobile/pull/2149): update tests for new logic
 - [#2145](https://github.com/MetaMask/metamask-mobile/pull/2145): Add missing brew installation steps

android/app/build.gradle

@@ -166,8 +166,8 @@ android {
 		applicationId "io.metamask"
 		minSdkVersion rootProject.ext.minSdkVersion
 		targetSdkVersion rootProject.ext.targetSdkVersion
-		versionCode 43
-		versionName "1.0.9"
+		versionCode 44
+		versionName "1.0.10"
 		multiDexEnabled true
 		testBuildType System.getProperty('testBuildType', 'debug')
 		missingDimensionStrategy "minReactNative", "minReactNative46"

app/core/Engine.js

@@ -75,37 +75,34 @@ class Engine {
 					}),
 					new PersonalMessageManager(),
 					new MessageManager(),
-					new NetworkController(
-						{
-							infuraProjectId: process.env.MM_INFURA_PROJECT_ID,
-							providerConfig: {
-								static: {
-									eth_sendTransaction: async (payload, next, end) => {
-										const { TransactionController } = this.datamodel.context;
-										try {
-											const hash = await (await TransactionController.addTransaction(
-												payload.params[0],
-												payload.origin
-											)).result;
-											end(undefined, hash);
-										} catch (error) {
-											end(error);
-										}
+					new NetworkController({
+						infuraProjectId: process.env.MM_INFURA_PROJECT_ID,
+						providerConfig: {
+							static: {
+								eth_sendTransaction: async (payload, next, end) => {
+									const { TransactionController } = this.datamodel.context;
+									try {
+										const hash = await (await TransactionController.addTransaction(
+											payload.params[0],
+											payload.origin
+										)).result;
+										end(undefined, hash);
+									} catch (error) {
+										end(error);
 									}
-								},
-								getAccounts: (end, payload) => {
-									const { approvedHosts, privacyMode } = store.getState();
-									const isEnabled = !privacyMode || approvedHosts[payload.hostname];
-									const { KeyringController } = this.datamodel.context;
-									const isUnlocked = KeyringController.isUnlocked();
-									const selectedAddress = this.datamodel.context.PreferencesController.state
-										.selectedAddress;
-									end(null, isUnlocked && isEnabled && selectedAddress ? [selectedAddress] : []);
 								}
+							},
+							getAccounts: (end, payload) => {
+								const { approvedHosts, privacyMode } = store.getState();
+								const isEnabled = !privacyMode || approvedHosts[payload.hostname];
+								const { KeyringController } = this.datamodel.context;
+								const isUnlocked = KeyringController.isUnlocked();
+								const selectedAddress = this.datamodel.context.PreferencesController.state
+									.selectedAddress;
+								end(null, isUnlocked && isEnabled && selectedAddress ? [selectedAddress] : []);
 							}
-						},
-						{ network: '1', provider: { type: MAINNET } }
-					),
+						}
+					}),
 					new PhishingController(),
 					new PreferencesController(
 						{},

app/store/migrations.js

@@ -1,3 +1,4 @@
+import { NetworksChainId } from '@metamask/controllers';
 import AppConstants from '../core/AppConstants';
 import { getAllNetworks, isSafeChainId } from '../util/networks';
 
@@ -47,7 +48,31 @@ export const migrations = {
 			};
 		}
 		return state;
+	},
+	3: state => {
+		const provider = state.engine.backgroundState.NetworkController.provider;
+		const chainId = NetworksChainId[provider.type];
+		// if chainId === '' is a rpc
+		if (chainId) {
+			state.engine.backgroundState.NetworkController.provider = { ...provider, chainId };
+			return state;
+		}
+
+		// If provider is rpc, check if the current network has a valid chainId
+		const storedChainId = typeof provider.chainId === 'string' ? provider.chainId : '';
+		const isDecimalString = /^[1-9]\d*$/u.test(storedChainId);
+		const hasInvalidChainId = !isDecimalString || !isSafeChainId(parseInt(storedChainId, 10));
+
+		if (hasInvalidChainId) {
+			// If the current network does not have a chainId, switch to testnet.
+			state.engine.backgroundState.NetworkController.provider = {
+				ticker: 'ETH',
+				type: 'rinkeby',
+				chainId: NetworksChainId.rinkeby
+			};
+		}
+		return state;
 	}
 };
 
-export const version = 2;
+export const version = 3;

ios/MetaMask.xcodeproj/project.pbxproj

@@ -847,7 +847,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMaskDebug.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 564;
+				CURRENT_PROJECT_VERSION = 569;
 				DEAD_CODE_STRIPPING = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = 48XVW22RCG;
@@ -880,7 +880,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.0.10;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DFB_SONARKIT_ENABLED=1",
@@ -910,7 +910,7 @@
 				CODE_SIGN_ENTITLEMENTS = MetaMask/MetaMask.entitlements;
 				CODE_SIGN_IDENTITY = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 564;
+				CURRENT_PROJECT_VERSION = 569;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 48XVW22RCG;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -942,7 +942,7 @@
 					"\"$(SRCROOT)/MetaMask/System/Library/Frameworks\"",
 				);
 				LLVM_LTO = YES;
-				MARKETING_VERSION = 1.0.9;
+				MARKETING_VERSION = 1.0.10;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-DFB_SONARKIT_ENABLED=1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "metamask",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "private": true,
   "scripts": {
     "watch": "./scripts/build.sh watcher watch",