Merge pull request #36 from ElrondNetwork/erdpy-wallet-new

Erdpy wallet new

Author: camilbancioiu

MANIFEST.in

@@ -1,5 +1,6 @@
 include erdpy/projects/*.txt
 include erdpy/projects/*.json
+include erdpy/wallet/*.txt
 
 include erdpy/testnet/wallets/users/*.pem
 include erdpy/testnet/wallets/users/*.json

erdpy/CLI.md

@@ -34,7 +34,7 @@ contract                       Build, deploy and interact with Smart Contracts
 tx                             Create and broadcast Transactions
 validator                      Stake, Unjail and other actions useful for Validators
 account                        Get Account data (nonce, balance) from the Network
-wallet                         Derive private key from mnemonic, bech32 address helpers etc.
+wallet                         Derive secret key from mnemonic, bech32 address helpers etc.
 network                        Get Network parameters, such as number of shards, chain identifier etc.
 cost                           Estimate cost of Transactions
 dispatcher                     Enqueue transactions, then bulk dispatch them
@@ -701,7 +701,7 @@ optional arguments:
 $ erdpy wallet --help
 usage: erdpy wallet COMMAND [-h] ...
 
-Derive private key from mnemonic, bech32 address helpers etc.
+Derive secret key from mnemonic, bech32 address helpers etc.
 
 COMMANDS:
   {derive,bech32,pem-address,pem-address-hex}

erdpy/accounts.py

@@ -27,12 +27,12 @@ def generate_accounts(self, count):
             self.generate_account(i)
 
     def generate_account(self, name):
-        seed, pubkey = generate_pair()
+        secret_key, pubkey = generate_pair()
         address = Address(pubkey).bech32()
 
         pem_file = f"{name}_{address}.pem"
         pem_file = path.join(self.folder, pem_file)
-        pem.write(pem_file, seed, pubkey, name=f"{name}:{address}")
+        pem.write(pem_file, secret_key, pubkey, name=f"{name}:{address}")
 
     def get_all(self):
         accounts = []
@@ -59,24 +59,24 @@ def __init__(self,
         self.ledger = ledger
 
         if self.pem_file:
-            seed, pubkey = pem.parse(self.pem_file, self.pem_index)
-            self.private_key_seed = seed.hex()
+            secret_key, pubkey = pem.parse(self.pem_file, self.pem_index)
+            self.secret_key = secret_key.hex()
             self.address = Address(pubkey)
         elif key_file and pass_file:
             password = get_password(pass_file)
-            address_from_key_file, seed = load_from_key_file(key_file, password)
-            self.private_key_seed = seed.hex()
+            address_from_key_file, secret_key = load_from_key_file(key_file, password)
+            self.secret_key = secret_key.hex()
             self.address = Address(address_from_key_file)
 
     def sync_nonce(self, proxy: Any):
         logger.info("Account.sync_nonce()")
         self.nonce = proxy.get_account_nonce(self.address)
         logger.info(f"Account.sync_nonce() done: {self.nonce}")
 
-    def get_seed(self) -> bytes:
+    def get_secret_key(self) -> bytes:
         if self.ledger:
             raise LedgerError("cannot get seed from a Ledger account")
-        return unhexlify(self.private_key_seed)
+        return unhexlify(self.secret_key)
 
 
 class Address(IAddress):

erdpy/cli_wallet.py

@@ -1,7 +1,11 @@
+from erdpy.wallet.keyfile import save_to_key_file
+from erdpy.wallet.core import generate_mnemonic
 import logging
+import getpass
+from pathlib import Path
 from typing import Any, List
 
-from erdpy import cli_shared, wallet
+from erdpy import cli_shared, wallet, utils
 from erdpy.accounts import Account, Address
 from erdpy.wallet import pem
 
@@ -12,10 +16,24 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     parser = cli_shared.add_group_subparser(
         subparsers,
         "wallet",
-        "Derive private key from mnemonic, bech32 address helpers etc."
+        "Derive secret key from mnemonic, bech32 address helpers etc."
     )
     subparsers = parser.add_subparsers()
 
+    sub = cli_shared.add_command_subparser(
+        subparsers,
+        "wallet",
+        "new",
+        "Create a new wallet"
+    )
+    sub.add_argument("--json",
+                     help="whether to create a json key file", action="store_true", default=False)
+    sub.add_argument("--pem",
+                     help="whether to create a pem key file", action="store_true", default=False)
+    sub.add_argument("--output-path",
+                     help="the output path and base file name for the generated wallet files (default: %(default)s)", type=str, default="./wallet")
+    sub.set_defaults(func=new_wallet)
+
     sub = cli_shared.add_command_subparser(
         subparsers,
         "wallet",
@@ -69,19 +87,42 @@ def setup_parser(args: List[str], subparsers: Any) -> Any:
     return subparsers
 
 
+def new_wallet(args: Any):
+    mnemonic = generate_mnemonic()
+    print(f"Mnemonic: {mnemonic}")
+    secret_key, pubkey = wallet.derive_keys(mnemonic)
+    if args.pem:
+        pem_file = prepare_file(args.output_path, ".pem")
+        address = Address(pubkey)
+        pem.write(pem_file, secret_key, pubkey, name=address.bech32())
+        logger.info(f"Pem wallet generated: {pem_file}")
+    if args.json:
+        json_file = prepare_file(args.output_path, ".json")
+        password = getpass.getpass("Enter a new password:")
+        save_to_key_file(json_file, secret_key, pubkey, password)
+        logger.info(f"Json wallet generated: {json_file}")
+
+
+def prepare_file(output_path: str, suffix: str) -> Path:
+    base_path = Path(output_path)
+    utils.ensure_folder(base_path.parent)
+    file_path = base_path.with_suffix(suffix)
+    return utils.uniquify(file_path)
+
+
 def generate_pem(args: Any):
     pem_file = args.pem
     mnemonic = args.mnemonic
     index = args.index
 
-    seed, pubkey = wallet.generate_pair()
+    secret_key, pubkey = wallet.generate_pair()
     if mnemonic:
         mnemonic = input("Enter mnemonic:\n")
         mnemonic = mnemonic.strip()
-        seed, pubkey = wallet.derive_keys(mnemonic, index)
+        secret_key, pubkey = wallet.derive_keys(mnemonic, index)
 
     address = Address(pubkey)
-    pem.write(pem_file, seed, pubkey, name=address.bech32())
+    pem.write(pem_file, secret_key, pubkey, name=address.bech32())
     logger.info(f"Created PEM file [{pem_file}] for [{address.bech32()}]")
 
 

erdpy/delegation/staking_provider.py

@@ -42,8 +42,8 @@ def prepare_args_for_add_nodes(args: Any):
         # get validator
         validator_pem = validator.get("pemFile")
         validator_pem = path.join(path.dirname(args.validators_file), validator_pem)
-        seed, bls_key = parse_validator_pem(validator_pem)
-        signed_message = sign_message_with_bls_key(account.address.pubkey().hex(), seed.decode('ascii'))
+        secret_key_bytes, bls_key = parse_validator_pem(validator_pem)
+        signed_message = sign_message_with_bls_key(account.address.pubkey().hex(), secret_key_bytes.decode('ascii'))
         add_nodes_data += f"@{bls_key}@{signed_message}"
 
     args.receiver = args.delegation_contract

erdpy/ide/static/app/models.js

@@ -3,7 +3,7 @@ var SmartContract = Backbone.Model.extend({
 
     initialize: function () {
     },
-    
+
     deploy: function (options) {
         var payload = options.toJSON();
         payload.id = this.id;
@@ -22,7 +22,7 @@ var SmartContract = Backbone.Model.extend({
         app.talkToHead("queryWatchedVariables", payload);
     },
 
-    addWatchedVariable: function(options) {
+    addWatchedVariable: function (options) {
         this.getWatchedVariables(options.onTestnet).push({
             Name: "alice's balance",
             FunctionName: "do_balance",
@@ -32,7 +32,7 @@ var SmartContract = Backbone.Model.extend({
         this.setWatchedVariables(options);
     },
 
-    updateWatchedVariable: function(options) {
+    updateWatchedVariable: function (options) {
         var index = options.index;
         var variable = this.getWatchedVariables(options.onTestnet)[index];
         variable.Name = options.name;
@@ -42,20 +42,20 @@ var SmartContract = Backbone.Model.extend({
         this.setWatchedVariables(options);
     },
 
-    deleteWatchedVariable: function(options) {
+    deleteWatchedVariable: function (options) {
         var variables = this.getWatchedVariables(options.onTestnet);
         variables.splice(options.index, 1);
 
         this.setWatchedVariables(options);
     },
 
-    getWatchedVariables: function(onTestnet) {
+    getWatchedVariables: function (onTestnet) {
         var properties = onTestnet ? this.get("PropertiesOnTestnet") : this.get("PropertiesOnNodeDebug");
         var variables = properties.WatchedVariables;
         return variables;
     },
 
-    setWatchedVariables: function(options) {
+    setWatchedVariables: function (options) {
         var payload = options;
         payload.id = this.id;
         payload.variables = this.getWatchedVariables(options.onTestnet);
@@ -68,8 +68,8 @@ var SmartContract = Backbone.Model.extend({
 var SmartContractDeployOptions = Backbone.Model.extend({
     validate: function (attrs, options) {
         if (attrs.onTestnet) {
-            if (!attrs.privateKey) {
-                return "When deploying on testnet, the private key is required.";
+            if (!attrs.secretKey) {
+                return "When deploying on testnet, the secret key is required.";
             }
         }
         else {
@@ -87,8 +87,8 @@ var SmartContractRunOptions = Backbone.Model.extend({
         }
 
         if (attrs.onTestnet) {
-            if (!attrs.privateKey) {
-                return "When running on testnet, the private key is required.";
+            if (!attrs.secretKey) {
+                return "When running on testnet, the secret key is required.";
             }
         }
         else {
@@ -101,4 +101,4 @@ var SmartContractRunOptions = Backbone.Model.extend({
 
 var SmartContractsCollection = Backbone.Collection.extend({
     model: SmartContract
-});
+});

erdpy/ide/static/app/views.deployDialog.js

@@ -6,7 +6,7 @@ var DeployDialog = Backbone.View.extend({
         "shown.bs.modal": "onBootstrapModalShown",
         "hidden.bs.modal": "onBootstrapModalHidden",
         "click .btn-submit": "onClickSubmit",
-        "change input[name='PrivateKeyFile']": "onChangePrivateKey"
+        "change input[name='SecretKeyFile']": "onChangeSecretKey"
     },
 
     initialize: function (options) {
@@ -49,13 +49,13 @@ var DeployDialog = Backbone.View.extend({
         this.remove();
     },
 
-    onChangePrivateKey: function (event) {
+    onChangeSecretKey: function (event) {
         var self = this;
         var file = event.currentTarget.files[0];
         var reader = new FileReader();
 
         reader.onload = function (onloadEvent) {
-            self.privateKey = onloadEvent.target.result;
+            self.secretKey = onloadEvent.target.result;
         };
 
         reader.readAsText(file);
@@ -69,7 +69,7 @@ var DeployDialog = Backbone.View.extend({
         var gasPrice = this.getGasPrice();
 
         var deployOptions = new SmartContractDeployOptions({
-            privateKey: this.privateKey,
+            secretKey: this.secretKey,
             senderAddress: senderAddress,
             initArgs: initArgs,
             value: value,
@@ -117,4 +117,4 @@ var DeployDialog = Backbone.View.extend({
     getGasPrice: function () {
         return Number(this.$el.find("[name='GasPrice']").val());
     }
-});
+});

erdpy/ide/static/app/views.runDialog.js

@@ -6,7 +6,7 @@ var RunDialog = Backbone.View.extend({
         "shown.bs.modal": "onBootstrapModalShown",
         "hidden.bs.modal": "onBootstrapModalHidden",
         "click .btn-submit": "onClickSubmit",
-        "change input[name='PrivateKeyFile']": "onChangePrivateKey"
+        "change input[name='SecretKeyFile']": "onChangeSecretKey"
     },
 
     initialize: function (options) {
@@ -49,13 +49,13 @@ var RunDialog = Backbone.View.extend({
         this.remove();
     },
 
-    onChangePrivateKey: function (event) {
+    onChangeSecretKey: function (event) {
         var self = this;
         var file = event.currentTarget.files[0];
         var reader = new FileReader();
 
         reader.onload = function (onloadEvent) {
-            self.privateKey = onloadEvent.target.result;
+            self.secretKey = onloadEvent.target.result;
         };
 
         reader.readAsText(file);
@@ -70,7 +70,7 @@ var RunDialog = Backbone.View.extend({
         var gasPrice = this.getGasPrice();
 
         var runOptions = new SmartContractRunOptions({
-            privateKey: this.privateKey,
+            secretKey: this.secretKey,
             senderAddress: senderAddress,
             functionName: functionName,
             functionArgs: functionArgs,
@@ -90,11 +90,11 @@ var RunDialog = Backbone.View.extend({
         }
     },
 
-    clearValidationErrors: function() {
+    clearValidationErrors: function () {
         this.$el.find(".validation-errors-container").addClass("d-none").empty();
     },
 
-    displayValidationErrors: function(validationError) {
+    displayValidationErrors: function (validationError) {
         this.$el.find(".validation-errors-container").removeClass("d-none").text(validationError);
     },
 
@@ -123,4 +123,4 @@ var RunDialog = Backbone.View.extend({
     getGasPrice: function () {
         return Number(this.$el.find("[name='GasPrice']").val());
     }
-});
+});

erdpy/ide/views/_deployDialog.html

@@ -9,8 +9,8 @@ <h4 class="modal-title">Deploy Smart Contract</h4>
             <form>
                 [[ if (onTestnet) { ]]
                 <div class="form-group">
-                    <label class="">Private key:</label>
-                    <input class="form-control" type="file" name="PrivateKeyFile" accept=".pem" />
+                    <label class="">Secret key:</label>
+                    <input class="form-control" type="file" name="SecretKeyFile" accept=".pem" />
                 </div>
                 [[ } else { ]]
                 <div class="form-group">
@@ -53,7 +53,8 @@ <h4 class="modal-title">Deploy Smart Contract</h4>
             [[ if (contract.PropertiesOnTestnet.Address) { ]]
             <div class="form-group">
                 <label class="">Deployed at address:</label>
-                <input class="form-control" name="" type="text" value="[[= contract.PropertiesOnTestnet.Address ]]" readonly />
+                <input class="form-control" name="" type="text" value="[[= contract.PropertiesOnTestnet.Address ]]"
+                    readonly />
             </div>
             [[ } ]]
             [[ } else { ]]
@@ -79,4 +80,4 @@ <h4 class="modal-title">Deploy Smart Contract</h4>
             </button>
         </div>
     </div>
-</div>
+</div>

erdpy/ide/views/_runDialog.html

@@ -12,8 +12,8 @@ <h4 class="modal-title">Run Smart Contract Function</h4>
                     [[ var properties = onTestnet ? contract.PropertiesOnTestnet : contract.PropertiesOnNodeDebug; ]]
                     [[ if (onTestnet) { ]]
                     <div class="form-group">
-                        <label class="">Private key:</label>
-                        <input class="form-control" type="file" name="PrivateKeyFile" accept=".pem" />
+                        <label class="">Secret key:</label>
+                        <input class="form-control" type="file" name="SecretKeyFile" accept=".pem" />
                     </div>
                     [[ } else { ]]
                     <div class="form-group">
@@ -76,4 +76,4 @@ <h4 class="modal-title">Run Smart Contract Function</h4>
             <button type="button" class="btn btn-primary btn-submit">Run</button>
         </div>
     </div>
-</div>
+</div>