Merge pull request #154 from remyroy/package-up2

Update for staking-deposit-cli 2.4.0 and Zhejiang testnet

package.json

@@ -12,7 +12,7 @@
     "@types/react-router-dom": "^5.1.8",
     "@types/styled-components": "^5.1.11",
     "@types/tmp": "^0.2.2",
-    "electron": "^18.2.0",
+    "electron": "18.3.15",
     "electron-builder": "^22.14.5",
     "ts-loader": "^9.2.3",
     "typescript": "^4.3.5",

src/electron/index.ts

@@ -3,7 +3,7 @@
  * This typescript file contains the Electron app which renders the React app.
  */
 
-import { BrowserWindow, app, globalShortcut, ipcMain, dialog, clipboard } from "electron";
+import { BrowserWindow, app, ipcMain, dialog, clipboard } from "electron";
 import path from "path";
 
 import { accessSync, constants } from "fs";
@@ -62,15 +62,6 @@ app.on("ready", () => {
     return callback(false);
   });
 
-  /**
-   * Allow for refreshing of the React app within Electron without reopening.
-   * This feature is used for development and will be disabled before production deployment.
-   */
-	globalShortcut.register('CommandOrControl+R', function() {
-		console.log('CommandOrControl+R was pressed, refreshing the React app within Electron.')
-		window.reload()
-	})
-
   /**
    * This logic closes the application when the window is closed, explicitly.
    * On MacOS this is not a default feature.

src/react/components/NetworkPicker.tsx

@@ -60,8 +60,6 @@ export const NetworkPicker = (props: NetworkPickerProps) => {
     props.setNetwork(selected.target.value as Network);
   }
 
-  const goerliLabel = `${Network.GOERLI}/${Network.PRATER}`;
-
   return (
     <Container>
       <Header>Network</Header>
@@ -72,8 +70,8 @@ export const NetworkPicker = (props: NetworkPickerProps) => {
               <FormControlLabel value={Network.MAINNET} control={<Radio />} label={Network.MAINNET} />
               <Divider />
               <SubHeader>Testnets</SubHeader>
-              <FormControlLabel value={Network.GOERLI} control={<Radio />} label={goerliLabel} />
-              <FormControlLabel value={Network.ROPSTEN} control={<Radio />} label={Network.ROPSTEN} />
+              <FormControlLabel value={Network.GOERLI} control={<Radio />} label={Network.GOERLI} />
+              <FormControlLabel value={Network.ZHEJIANG} control={<Radio />} label={Network.ZHEJIANG} />
             </RadioGroup>
           </FormControl>
         </div>

src/react/types.ts

@@ -14,8 +14,5 @@ export enum StepSequenceKey {
 export enum Network {
   MAINNET = "Mainnet",
   GOERLI = "Goerli",
-  PRATER = "Prater",
-  KINTSUGI = "Kintsugi",
-  ROPSTEN = "Ropsten",
-  KILN = "Kiln"
+  ZHEJIANG = "Zhejiang"
 }

src/scripts/bundle_proxy_linux.sh

@@ -10,7 +10,7 @@ fi
 
 SCRIPTPATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 
-EDCDIR=staking-deposit-cli-2.3.0
+EDCDIR=staking-deposit-cli-2.4.0
 
 TARGETPACKAGESPATH=$SCRIPTPATH/../../dist/packages
 ETH2DEPOSITCLIPATH=$SCRIPTPATH/../vendors/$EDCDIR

src/scripts/bundle_proxy_win.bat

@@ -5,7 +5,7 @@ rem Windows.
 
 SET BATDIR=%~dp0
 
-SET EDCDIR=staking-deposit-cli-2.3.0
+SET EDCDIR=staking-deposit-cli-2.4.0
 
 SET TARGETPACKAGESPATH=%BATDIR%..\..\dist\packages
 

src/vendors/staking-deposit-cli-2.3.0/build_configs/linux/requirements.txt → src/vendors/staking-deposit-cli-2.4.0/build_configs/linux/requirements.txt

@@ -14,9 +14,9 @@ pyinstaller==4.10 \
     --hash=sha256:cfed0b3a43e73550a43a094610328109564710b9514afa093ef7199d072cae87 \
     --hash=sha256:d4f79c0a774451f12baca4e476376418f011fa3039dde8fd172ea2aa8ff67bad \
     --hash=sha256:f2166ff2cd95eefb0d377ae8d1071f186fa25edd410ede65b376162d5ec41909
-setuptools==60.9.3 \
-    --hash=sha256:2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5 \
-    --hash=sha256:e4f30b9f84e5ab3decf945113119649fec09c1fc3507c6ebffec75646c56e62b
+setuptools==65.5.1 \
+    --hash=sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31 \
+    --hash=sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f
 cffi==1.15.0 \
     --hash=sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 \
     --hash=sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 \

src/vendors/staking-deposit-cli-2.3.0/build_configs/macos/requirements.txt → src/vendors/staking-deposit-cli-2.4.0/build_configs/macos/requirements.txt

@@ -14,9 +14,9 @@ pyinstaller==4.10 \
     --hash=sha256:cfed0b3a43e73550a43a094610328109564710b9514afa093ef7199d072cae87 \
     --hash=sha256:d4f79c0a774451f12baca4e476376418f011fa3039dde8fd172ea2aa8ff67bad \
     --hash=sha256:f2166ff2cd95eefb0d377ae8d1071f186fa25edd410ede65b376162d5ec41909
-setuptools==60.9.3 \
-    --hash=sha256:2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5 \
-    --hash=sha256:e4f30b9f84e5ab3decf945113119649fec09c1fc3507c6ebffec75646c56e62b
+setuptools==65.5.1 \
+    --hash=sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31 \
+    --hash=sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f
 cffi==1.15.0 \
     --hash=sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 \
     --hash=sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 \

src/vendors/staking-deposit-cli-2.3.0/build_configs/windows/requirements.txt → src/vendors/staking-deposit-cli-2.4.0/build_configs/windows/requirements.txt

@@ -14,9 +14,9 @@ pyinstaller==4.10 \
     --hash=sha256:cfed0b3a43e73550a43a094610328109564710b9514afa093ef7199d072cae87 \
     --hash=sha256:d4f79c0a774451f12baca4e476376418f011fa3039dde8fd172ea2aa8ff67bad \
     --hash=sha256:f2166ff2cd95eefb0d377ae8d1071f186fa25edd410ede65b376162d5ec41909
-setuptools==60.9.3 \
-    --hash=sha256:2347b2b432c891a863acadca2da9ac101eae6169b1d3dfee2ec605ecd50dbfe5 \
-    --hash=sha256:e4f30b9f84e5ab3decf945113119649fec09c1fc3507c6ebffec75646c56e62b
+setuptools==65.5.1 \
+    --hash=sha256:d0b9a8433464d5800cbe05094acf5c6d52a91bfac9b52bcfc4d41382be5d5d31 \
+    --hash=sha256:e197a19aa8ec9722928f2206f8de752def0e4c9fc6953527360d1c36d94ddb2f
 cffi==1.15.0 \
     --hash=sha256:00c878c90cb53ccfaae6b8bc18ad05d2036553e6d9d1d9dbcf323bbe83854ca3 \
     --hash=sha256:0104fb5ae2391d46a4cb082abdd5c69ea4eab79d8d44eaaf79f1b1fd806ee4c2 \

src/vendors/staking-deposit-cli-2.3.0/setup.py → src/vendors/staking-deposit-cli-2.4.0/setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="staking_deposit",
-    version='2.3.0',
+    version='2.4.0',
     py_modules=["staking_deposit"],
     packages=find_packages(exclude=('tests', 'docs')),
     python_requires=">=3.8,<4",

src/vendors/staking-deposit-cli-2.3.0/staking_deposit/settings.py → src/vendors/staking-deposit-cli-2.4.0/staking_deposit/settings.py

@@ -1,7 +1,7 @@
 from typing import Dict, NamedTuple
 
 
-DEPOSIT_CLI_VERSION = '2.3.0'
+DEPOSIT_CLI_VERSION = '2.4.0'
 
 
 class BaseChainSetting(NamedTuple):
@@ -13,8 +13,8 @@ class BaseChainSetting(NamedTuple):
 ROPSTEN = 'ropsten'
 GOERLI = 'goerli'
 PRATER = 'prater'
-KILN = 'kiln'
 SEPOLIA = 'sepolia'
+ZHEJIANG = 'zhejiang'
 
 
 # Mainnet setting
@@ -23,19 +23,19 @@ class BaseChainSetting(NamedTuple):
 RopstenSetting = BaseChainSetting(NETWORK_NAME=ROPSTEN, GENESIS_FORK_VERSION=bytes.fromhex('80000069'))
 # Goerli setting
 GoerliSetting = BaseChainSetting(NETWORK_NAME=GOERLI, GENESIS_FORK_VERSION=bytes.fromhex('00001020'))
-# Merge Testnet (spec v1.1.9)
-KilnSetting = BaseChainSetting(NETWORK_NAME=KILN, GENESIS_FORK_VERSION=bytes.fromhex('70000069'))
 # Sepolia setting
 SepoliaSetting = BaseChainSetting(NETWORK_NAME=SEPOLIA, GENESIS_FORK_VERSION=bytes.fromhex('90000069'))
+# Zhejiang setting
+ZhejiangSetting = BaseChainSetting(NETWORK_NAME=ZHEJIANG, GENESIS_FORK_VERSION=bytes.fromhex('00000069'))
 
 
 ALL_CHAINS: Dict[str, BaseChainSetting] = {
     MAINNET: MainnetSetting,
     ROPSTEN: RopstenSetting,
     GOERLI: GoerliSetting,
     PRATER: GoerliSetting,  # Prater is the old name of the Prater/Goerli testnet
-    KILN: KilnSetting,
     SEPOLIA: SepoliaSetting,
+    ZHEJIANG: ZhejiangSetting,
 }
 
 

yarn.lock

@@ -2292,16 +2292,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron@npm:^18.2.0":
-  version: 18.2.0
-  resolution: "electron@npm:18.2.0"
+"electron@npm:18.3.15":
+  version: 18.3.15
+  resolution: "electron@npm:18.3.15"
   dependencies:
     "@electron/get": ^1.13.0
     "@types/node": ^16.11.26
     extract-zip: ^1.0.3
   bin:
     electron: cli.js
-  checksum: 242169d6e22854248e427326a03910b96311333d5dd57aa0e4cd9cef733aa8c2e893b16269c32514ad325468cdc08c41736d6f1f6791770cad236652fe06662c
+  checksum: d5ff1a31cb2da292e3f1141036640cabe66563425ebe5ce9784c1945aab1f2b1a6d1b474c23c753cd46af5937702ace343d4b6f9119934bc86e3c41d4dd9fa4a
   languageName: node
   linkType: hard
 
@@ -5638,7 +5638,7 @@ __metadata:
     "@types/styled-components": ^5.1.11
     "@types/tmp": ^0.2.2
     css-loader: ^5.2.6
-    electron: ^18.2.0
+    electron: 18.3.15
     electron-builder: ^22.14.5
     file-loader: ^6.2.0
     git-revision-webpack-plugin: ^5.0.0