Add supported hardforks up to Merge. (#5213)

package.json

@@ -55,7 +55,7 @@
     "fix-path": "^2.1.0",
     "follow-redirects": "1.9.0",
     "fs-extra": "9.0.0",
-    "ganache": "7.5.0",
+    "ganache": "7.7.3",
     "ganache-core": "2.13.1",
     "get-port": "^5.0.0",
     "history": "4.10.1",

src/integrations/ethereum/common/redux/core/reducers.js

@@ -10,7 +10,7 @@ const initialState = {
   lastRequestedBlock: -1, // Last block whose data was requested
   gasPrice: "0",
   gasLimit: "0",
-  hardfork: "muirGlacir",
+  hardfork: "merge",
   snapshots: [],
   blocks: [],
   transactions: [],

src/integrations/ethereum/renderer/screens/config/ConfigScreens/ChainScreen.js

@@ -18,7 +18,7 @@ const VALIDATIONS = {
     canBeBlank: true,
   },
   "workspace.server.hardfork": {
-    allowedChars: /^(byzantium|constantinople|petersburg|istanbul|muirGlacier)$/,
+    allowedChars: /^(merge|grayGlacier|arrowGlacier|london|berlin|muirGlacier|istanbul|petersburg|constantinople|byzantium)$/,
     canBeBlank: false,
   },
 };
@@ -116,15 +116,20 @@ class ChainScreen extends Component {
                 }
                 changeFunction={this.validateChange.bind(this)}
               >
+                <option value="merge">Merge</option>
+                <option value="grayGlacier">Gray Glacier</option>
+                <option value="arrowGlacier">Arrow Glacier</option>
+                <option value="london">London</option>
+                <option value="berlin">Berlin</option>
+                <option value="muirGlacier">Muir Glacier</option>
+                <option value="istanbul">Istanbul</option>
                 <option value="petersburg">Petersburg</option>
                 <option value="constantinople">Constantinople</option>
                 <option value="byzantium">Byzantium</option>
-                <option value="istanbul">Istanbul</option>
-                <option value="muirGlacier">Muir Glacier</option>
               </StyledSelect>
             </div>
             <div className="RowItem">
-              <p>The hardfork to use. Default is Petersburg.</p>
+              <p>The hardfork to use. Default is Merge.</p>
             </div>
           </div>
         </section>
@@ -133,5 +138,4 @@ class ChainScreen extends Component {
     );
   }
 }
-
 export default ChainScreen;

src/main/types/settings/flavors/ethereum.js

@@ -17,7 +17,7 @@ module.exports = {
     verbose: false,
     gasLimit: 6721975,
     gasPrice: 20000000000,
-    hardfork: "muirGlacier",
+    hardfork: "merge",
     fork: null,
     fork_block_number: null
   },

static/node/package.json

@@ -6,7 +6,7 @@
     "electron": "12.0.2",
     "electron-fetch": "1.7.3",
     "fs-extra": "9.0.0",
-    "ganache": "7.5.0",
+    "ganache": "7.7.3",
     "ganache-core": "2.13.1",
     "lodash.clonedeep": "4.5.0",
     "lodash.merge": "4.6.2",