libevm 0.0.15 → 0.0.20

package/libevm

@@ -33,11 +33,17 @@ const
   _libcrash =
     require(
       'crash-js');
+/* global
+     _homedir_get */
+/* eslint-disable-next-line
+     no-global-assign */
+_homedir_get =
+  _libcrash._homedir_get;
 /* global
      _msg_info */
 /* eslint-disable-next-line
      no-global-assign */
-_path_join =
+_msg_info =
   _libcrash._msg_info;
 /* global
      _path_join */
@@ -228,12 +234,148 @@ function
 }
 
 function
-  _wallet_path_get() {
+  _wallet_path_get(
+    _wallet_app,
+    _wallet_name,
+    _qr_support) {
+  let
+    _wallet_dir;
+  if ( typeof(
+         _wallet_app) == "undefined" ||
+       _wallet_app == "" ) {
+    _wallet_app =
+      "evm-wallet";
+  }
+  if ( typeof(
+         _wallet_name) == "undefined" ||
+       _wallet_name == "" ) {
+    _wallet_name =
+      "default";
   }
+  if ( typeof(
+         _qr_support) == "undefined" ||
+       _qr_support == "" ) {
+    _qr_support =
+      "n";
+  }
+  const
+    _home =
+      _homedir_get();
+  _wallet_dir =
+    _path_join( [
+      _home,
+      ".config",
+      _wallet_app ]);
+  if ( _qr_support == "y" ) {
+    _wallet_dir =
+      _path_join( [
+        _wallet_dir,
+        "qr" ]);
+  }
+  const
+    _path =
+      _path_join( [
+        _wallet_dir,
+        `${_wallet_name}.dat` ]);
+  return _path;
+}
 
 function
-  _secret_auto_detect() {
-  true;
+  _secret_path_get(
+    _secret,
+    _app,
+    _wallet_name,
+    _qr_support){
+  let
+    _config_dir;
+  if ( typeof(
+         _secret) == "undefined" ||
+       _secret == "" ) {
+    _secret =
+      "seed";
+  }
+  if ( typeof(
+         _app) == "undefined" ||
+       _app == "" ) {
+    _app =
+      "evm-wallet";
+  }
+  if ( typeof(
+         _wallet_name) == "undefined" ||
+       _wallet_name == "" ) {
+    _wallet_name =
+      "default";
+  }
+  if ( typeof(
+         _qr_support) == "undefined" ||
+       _qr_support == "" ) {
+    _qr_support =
+      "n";
+  }
+  _config_dir =
+    _path_join( [
+      _homedir_get(),
+      ".config",
+      _app ]);
+  if ( _qr_support == "y" ) {
+    _config_dir =
+      _path_join( [
+        _config_dir,
+        "qr" ]);
+  }
+  const
+    _secret_path =
+      _path_join( [
+        _config_dir,
+        `${_wallet_name}-${_secret}.txt` ]);
+  return _secret_path;
+}
+
+function
+  _secret_get(
+    _secret,
+    _secret_type,
+    _wallet_app,
+    _wallet_name,
+    _qr_support) {
+  if ( typeof(
+         _secret) == "undefined" ||
+       _secret == "" ) {
+    _secret =
+      "seed";
+  }
+  if ( typeof(
+         _secret) == "undefined" ||
+       _secret == "" ) {
+    _secret_type =
+      "seed";
+  }
+  if ( typeof(
+         _wallet_app) == "undefined" ||
+       _wallet_app == "" ) {
+    _wallet_app =
+      "evm-wallet";
+  }
+  if ( typeof(
+         _wallet_name) == "undefined" ||
+       _wallet_name == "" ) {
+    _wallet_name =
+      "default";
+  }
+  if ( typeof(
+         _qr_support) == "undefined" ||
+       _qr_support == "" ) {
+    _qr_support =
+      "n";
+  }
+  const
+    _secret_path =
+      _secret_path_get(
+        _secret,
+        _wallet_app,
+        _wallet_name,
+        _qr_support);
+  return _secret_path;
 }
 
 function
@@ -364,14 +506,14 @@ function
         0];
 }
 
-
-function
+async function
   _wallet_overrides_set(
     _wallet_app,
     _wallet_name,
     _call_auth,
     _qr_support) {
   let
+    _msg,
     _wallet_address,
     _wallet_seed,
     _wallet_password,
@@ -406,26 +548,38 @@ function
   }
   _wallet_address =
     "";
+  _msg =
+    "Getting default wallets credentials paths for " +
+    `app '${_wallet_app}' and wallet '${_wallet_name}'.`;
+  _msg_info(
+    _msg);
   if ( _call_auth == "y" ) {
     // undefined
     _wallet_path =
-      _wallet_path_get();
-    // undefined
-    _secret_auto_detect(
-      "seed",
-      "seed",
-      _wallet_app,
-      _wallet_name,
-      _qr_support);
-    // undefined
-    _secret_auto_detect(
-      "password",
-      "plain",
-      _wallet_app,
-      _wallet_name,
-      _qr_support);
+      _wallet_path_get(
+        _wallet_app,
+        _wallet_name,
+        _qr_support);
+    _wallet_seed =
+      _secret_get(
+        "seed",
+        "seed",
+        _wallet_app,
+        _wallet_name,
+        _qr_support);
+    _msg =
+      `Wallet seed: '${_wallet_seed}'`;
+    _msg_info(
+      _msg);
+    _wallet_password =
+      _secret_get(
+        "password",
+        "plain",
+        _wallet_app,
+        _wallet_name,
+        _qr_support);
     _wallet_address = 
-       _address_get(
+       await _address_get(
          _wallet_seed,
          "",             // _target_network,
          "",             // _api_key,
@@ -434,9 +588,8 @@ function
          "",             // _output_file
        );
     // to be turned into _msg_debug
-    const
-      _msg =
-        `Wallet address: '${_wallet_address}'`;
+    _msg =
+      `Wallet address: '${_wallet_address}'`;
     _msg_info(
       _msg);
   }
@@ -470,6 +623,14 @@ function
     wallet_address =
       _wallet_address;
   }
+  if ( typeof(
+         wallet_seed) == "undefined" ||
+       wallet_seed == "" ||
+       wallet_seed == [] ) {
+    wallet_seed =
+      _wallet_seed;
+  }
+  return true;
 }
 
 module.exports = {

package/package.json

@@ -2,7 +2,7 @@
   "name":
     "libevm",
   "version":
-    "0.0.15",
+    "0.0.20",
   "description":
     "Library providing useful functions to write native applications interacting with EVM-compatible blockchain networks.",
   "funding": {
@@ -18,9 +18,8 @@
     "AUTHORS.rst",
     "COPYING",
     "README.md",
+    "dist",
     "libevm",
-    "libevm.js",
-    "fs-worker.js",
     "fs-worker.webpack.config.js",
     "index.html",
     "package.json",
@@ -75,11 +74,11 @@
   },
   "dependencies": {
     "crash-js":
-      "^0.1.101",
+      "^0.1.107",
     "evm-chains-info":
-      "^0.0.18",
+      "^0.0.21",
     "evm-wallet.js":
-      "^0.0.27",
+      "^0.0.38",
     "yargs":
       "18.0.0"
   },
@@ -89,9 +88,9 @@
     "libevm",
   "scripts": {
     "build-fs-worker":
-      "npx webpack --mode 'production' --config 'fs-worker.webpack.config.cjs' --stats-error-details",
+      "npx webpack --mode 'production' --config 'fs-worker.webpack.config.cjs' --stats-error-details && mkdir -p 'dist' && cp 'fs-worker.js' 'dist/libevm'",
     "build-lib":
-      "npx webpack --mode 'production' --config 'webpack.config.cjs' --stats-error-details",
+      "npx webpack --mode 'production' --config 'webpack.config.cjs' --stats-error-details && mv 'libevm.js' 'dist/libevm'",
     "build":
       "npm run lint && npm run build-fs-worker && npm run build-lib",
     "lint":
@@ -99,7 +98,7 @@
     "publish-pnm":
       "npm run build && npm publish --access public",
     "start":
-      "npx safely-serve --help # index.html --port 3000 --https --no-cache",
+      "npx safely-serve 'dist/libevm' --port 3000 --https --no-cache",
     "test":
       "echo \"Error: no test specified\" && exit 1"
   }

package/fs-worker.js

@@ -1 +0,0 @@
-(()=>{var e={816(e,o,n){function t(){let e;return"undefined"==typeof window&&void 0!==n.g&&n.g.global===n.g&&"function"!=typeof n||(e=function(){let e;try{e=n(816)}catch(e){console.log(e);const o="Error importing the '@themartiancompany/opfs' module as 'opfs'. If you got this error while bundling a webpack for a project depending on this module double check its 'webpack.config.js' file or whether the 'opfs' module is listed in developer dependencies and install them.I'm sorry for this inconvenience but Node packagement system does not currently distinguish 'development' from 'build' dependencies.";throw console.error(o),e}return e}()),e}const r=t();e.exports=r,e.exports.getModule=function(e){let o;if(""==_module_name||"undefined"==typeof _module_name)o=t();else if("opfs"==_module_name)o=n(816);else{if("fs"!=_module_name){const e="Unknown file system module "+`'${_module_name}'.`.const;throw _error={msg:e},console.error(e),_error}o=n(816)}return o}},314(e,o,n){const t=n(816);_sync_agent=t.startSyncAgent,e.exports={_sync_agent},_sync_agent()}},o={};function n(t){var r=o[t];if(void 0!==r)return r.exports;var s=o[t]={exports:{}};return e[t](s,s.exports,n),s.exports}n.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),n(314)})();