Add ability to verify wallet exports

cmd/root.go

@@ -45,10 +45,6 @@ var quiet bool
 var verbose bool
 var debug bool
 
-// For transaction commands.
-var wait bool
-var generate bool
-
 // Root variables, present for all commands.
 var rootStore string
 var rootAccount string
@@ -102,13 +98,10 @@ func persistentPreRun(cmd *cobra.Command, args []string) {
 	rootAccountPassphrase = viper.GetString("passphrase")
 
 	if quiet && verbose {
-		die("Cannot supply both quiet and verbose flags")
+		fmt.Println("Cannot supply both quiet and verbose flags")
 	}
 	if quiet && debug {
-		die("Cannot supply both quiet and debug flags")
-	}
-	if generate && wait {
-		die("Cannot supply both generate and wait flags")
+		fmt.Println("Cannot supply both quiet and debug flags")
 	}
 
 	if viper.GetString("remote") == "" {

cmd/version.go

@@ -30,7 +30,7 @@ var versionCmd = &cobra.Command{
 
     ethdo version.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println("1.4.16")
+		fmt.Println("1.4.18")
 		if viper.GetBool("verbose") {
 			buildInfo, ok := dbg.ReadBuildInfo()
 			if ok {

cmd/walletdelete.go

@@ -0,0 +1,55 @@
+// Copyright © 2020 Weald Technology Trading
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package cmd
+
+import (
+	"os"
+	"path/filepath"
+
+	"github.com/spf13/cobra"
+	wtypes "github.com/wealdtech/go-eth2-wallet-types/v2"
+)
+
+var walletDeleteCmd = &cobra.Command{
+	Use:   "delete",
+	Short: "Delete a wallet",
+	Long: `Delete a wallet.  For example:
+
+    ethdo wallet delete --wallet=primary
+
+In quiet mode this will return 0 if the wallet has been deleted, otherwise 1.`,
+	Run: func(cmd *cobra.Command, args []string) {
+		assert(!remote, "wallet delete not available with remote wallets")
+		assert(walletWallet != "", "--wallet is required")
+
+		wallet, err := walletFromPath(walletWallet)
+		errCheck(err, "Failed to access wallet")
+
+		storeProvider, ok := wallet.(wtypes.StoreProvider)
+		assert(ok, "Cannot obtain store for the wallet")
+		store := storeProvider.Store()
+		storeLocationProvider, ok := store.(wtypes.StoreLocationProvider)
+		assert(ok, "Cannot obtain store location for the wallet")
+		walletLocation := filepath.Join(storeLocationProvider.Location(), wallet.ID().String())
+		err = os.RemoveAll(walletLocation)
+		errCheck(err, "Failed to delete wallet")
+
+		os.Exit(_exitSuccess)
+	},
+}
+
+func init() {
+	walletCmd.AddCommand(walletDeleteCmd)
+	walletFlags(walletDeleteCmd)
+}

cmd/walletimport.go

@@ -14,18 +14,22 @@
 package cmd
 
 import (
+	"encoding/json"
 	"fmt"
 	"io/ioutil"
 	"os"
 	"strings"
 
+	"github.com/google/uuid"
 	"github.com/spf13/cobra"
 	"github.com/wealdtech/go-bytesutil"
+	"github.com/wealdtech/go-ecodec"
 	wallet "github.com/wealdtech/go-eth2-wallet"
 )
 
 var walletImportData string
 var walletImportPassphrase string
+var walletImportVerify bool
 
 var walletImportCmd = &cobra.Command{
 	Use:   "import",
@@ -52,8 +56,42 @@ In quiet mode this will return 0 if the wallet is imported successfully, otherwi
 		importData, err := bytesutil.FromHexString(walletImportData)
 		errCheck(err, "Failed to decode wallet data")
 
-		_, err = wallet.ImportWallet(importData, []byte(walletImportPassphrase))
-		errCheck(err, "Failed to import wallet")
+		if walletImportVerify {
+			type accountInfo struct {
+				Name string `json:"name"`
+			}
+			type walletInfo struct {
+				ID   uuid.UUID `json:"uuid"`
+				Name string    `json:"name"`
+				Type string    `json:"type"`
+			}
+			type export struct {
+				Wallet   *walletInfo    `json:"wallet"`
+				Accounts []*accountInfo `json:"accounts"`
+			}
+
+			data, err := ecodec.Decrypt(importData, []byte(walletImportPassphrase))
+			errCheck(err, "Failed to decrypt wallet")
+			ext := &export{}
+			err = json.Unmarshal(data, ext)
+			errCheck(err, "Failed to read wallet")
+
+			outputIf(!quiet, fmt.Sprintf("Wallet name: %s", ext.Wallet.Name))
+			outputIf(!quiet, fmt.Sprintf("Wallet type: %s", ext.Wallet.Type))
+			outputIf(verbose, fmt.Sprintf("Wallet UUID: %s", ext.Wallet.ID))
+			if verbose {
+				fmt.Printf("Wallet accounts:\n")
+				for _, account := range ext.Accounts {
+					outputIf(verbose, fmt.Sprintf("  %s", account.Name))
+				}
+			} else {
+				outputIf(!quiet, fmt.Sprintf("Wallet accounts: %d", len(ext.Accounts)))
+			}
+
+		} else {
+			_, err = wallet.ImportWallet(importData, []byte(walletImportPassphrase))
+			errCheck(err, "Failed to import wallet")
+		}
 
 		os.Exit(_exitSuccess)
 	},
@@ -64,4 +102,5 @@ func init() {
 	walletFlags(walletImportCmd)
 	walletImportCmd.Flags().StringVar(&walletImportData, "importdata", "", "The data to import, or the name of a file to read")
 	walletImportCmd.Flags().StringVar(&walletImportPassphrase, "importpassphrase", "", "Passphrase protecting the data to import")
+	walletImportCmd.Flags().BoolVar(&walletImportVerify, "verify", false, "Verify the wallet can be imported, but do not import it")
 }

docs/usage.md

@@ -28,7 +28,7 @@ Spending: 0x85dfc6dcee4c9da36f6473ec02fda283d6c920c641fc8e3a76113c5c227d4aeeb100
 #### `create`
 
 `ethdo wallet create` creates a new wallet with the given parameters.  Options for creating a wallet include:
-  - `wallet`: the name of the wallet to create (defaults to "primary")
+  - `wallet`: the name of the wallet to create
   - `type`: the type of wallet to create.  This can be either "nd" for a non-deterministic wallet, where private keys are generated randomly, or "hd" for a hierarchical deterministic wallet, where private keys are generated from a seed and path as per [ERC-2333](https://github.com/CarlBeek/EIPs/blob/bls_path/EIPS/eip-2334.md) (defaults to "nd")
   - `walletpassphrase`: the passphrase for of the wallet.  This is required for hierarchical deterministic wallets, to protect the seed
   - `seed`: for hierarchical deterministic wallets only, use a pre-defined 24-word [BIP-39 seed phrase](https://en.bitcoin.it/wiki/Seed_phrase) to create the wallet.  **Warning** The same seed can be imported in to multiple wallets, in which case they will generate the same keys.  Please ensure that only a single wallet is active with any single seed phrase
@@ -37,6 +37,16 @@ Spending: 0x85dfc6dcee4c9da36f6473ec02fda283d6c920c641fc8e3a76113c5c227d4aeeb100
 $ ethdo wallet create --wallet="Personal wallet" --type="hd" --walletpassphrase="my wallet secret"
 ```
 
+#### `delete`
+`ethdo wallet delete` deletes a wallet.  Options for deleting a wallet include:
+  - `wallet`: the name of the wallet to delete
+
+```sh
+$ ethdo wallet delete --wallet="Old wallet"
+```
+
+**Warning** Deleting a wallet is permanent.  Only use this command if you really don't want the wallet, or you have securely backed the wallet up using `wallet export`.
+
 #### `export`
 
 `ethdo wallet export` exports the wallet and all of its accounts.  Options for exporting a wallet include:
@@ -59,6 +69,7 @@ $ ethdo wallet export --wallet="Personal wallet" --exportpassphrase="my export s
 `ethdo wallet import` imports a wallet and all of its accounts exported by `ethdo wallet export`.  Options for importing a wallet include:
   - `importdata`: the data exported by `ethdo wallet export`
   - `importpassphrase`: the passphrase that was provided to `ethdo wallet export` to encrypt the data
+  - `verify`: confirm information about the wallet import without importing it
 
 ```sh
 $ ethdo wallet import --importdata="0x01c7a27ad40d45b4ae5be5f..." --importpassphrase="my export secret"

go.mod

@@ -26,6 +26,7 @@ require (
 	github.com/tyler-smith/go-bip39 v1.0.2
 	github.com/wealdtech/eth2-signer-api v1.3.0
 	github.com/wealdtech/go-bytesutil v1.1.1
+	github.com/wealdtech/go-ecodec v1.1.0
 	github.com/wealdtech/go-eth2-types/v2 v2.4.0
 	github.com/wealdtech/go-eth2-util v1.2.0
 	github.com/wealdtech/go-eth2-wallet v1.10.0