evm-contracts-tools 0.0.55 → 0.0.62

package/evm-contract-call

@@ -88,6 +88,11 @@ const
 const
   _echo =
     _libcrash._echo;
+/* global
+     _echo2 */
+const
+  _echo2 =
+    _libcrash._echo2;
 /* global
      _exit */
 const
@@ -108,6 +113,11 @@ const
 const
   _global_get =
     _libcrash._global_get;
+/* global
+     _homedir_get */
+const
+  _homedir_get =
+    _libcrash._homedir_get;
 /* global
      _msg_info */
 const
@@ -176,6 +186,16 @@ const
 const
   _address_check =
     _libevm_contract_call_module._address_check;
+/* global
+     _cache_dir_auto_detect */
+const
+  _cache_dir_auto_detect =
+    _libevm_contract_call_module._cache_dir_auto_detect;
+/* global
+     _data_dir_auto_detect */
+const
+  _data_dir_auto_detect =
+    _libevm_contract_call_module._data_dir_auto_detect;
 /* global
      _default_artifact_path_get */
 const
@@ -196,6 +216,21 @@ const
 const
   _call_auth_auto_detect =
     _libevm_contract_call_module._call_auth_auto_detect;
+/* global
+     _target_app_auto_detect */
+const
+  _target_app_auto_detect =
+    _libevm_contract_call_module._target_app_auto_detect;
+/* global
+     _contract_address_auto_detect */
+const
+  _contract_address_auto_detect =
+    _libevm_contract_call_module._contract_address_auto_detect;
+/* global
+     _target_contract_auto_detect */
+const
+  _target_contract_auto_detect =
+    _libevm_contract_call_module._target_contract_auto_detect;
 
 function
   _global_variables() {
@@ -227,6 +262,20 @@ function
     "call",
     "date",
     "");
+  /* global
+       cache_dir:
+         writable */
+  _set(
+    "cache",
+    "dir",
+    "");
+  /* global
+       data_dir:
+         writable */
+  _set(
+    "data",
+    "dir",
+    "");
   /* global
        wallet_name:
          writable */
@@ -262,6 +311,20 @@ function
     "index",
     "retrieve",
     "");
+  /* global
+       target_app:
+         writable */
+  _set(
+    "target",
+    "app",
+    "");
+  /* global
+       target_contract:
+         writable */
+  _set(
+    "target",
+    "contract",
+    "");
   /* global
        contract_address:
          writable */
@@ -335,24 +398,35 @@ function
 async function 
   _overrides_set(
     _help_display) {
-  if ( ! _help_display &&
-       typeof(_help_display) != "undefined" &&
-       _help_display != "" ) {
-    const
-      _address_valid =
-        _address_check(
-          contract_address);
-    if ( ! _address_valid ) {
-      const
-        _msg =
-          "Contract address " +
-          `'${contract_address}' is ` +
-          `invalid.`;
-      _msg_error(
-        _msg,
-        1);
-    }
+  let
+    _address_valid,
+    _contract_abi,
+    _contract_address,
+    _msg;
+  const
+    _global =
+      _global_get();
+  const
+    _quiet =
+      _global[
+        "quiet"];
+  if ( _quiet == "" ) {
+    _global[
+      "quiet"] =
+    "y"; 
   }
+  const
+    _target_app =
+      _get(
+        "target",
+        "app");
+  const
+    _target_networks =
+      _get(
+        "target",
+        "networks");
+  await _cache_dir_auto_detect();
+  await _data_dir_auto_detect();
   _override_set(
     "call",
     "date",
@@ -361,10 +435,6 @@ async function
     "wallet",
     "name",
     "default");
-  _override_set(
-    "index",
-    "retrieve",
-    "n");
   _override_set(
     "retries",
     "max",
@@ -390,27 +460,158 @@ async function
     "msg",
     "value",
     "0");
+  await _wallet_overrides_set(
+    "evm-wallet",
+    wallet_name,
+    call_auth,
+    "n",                // qr support
+    _target_networks);
+  await _target_app_auto_detect();
+  await _target_contract_auto_detect();
+  // await _target_networks_auto_detect();
+  try {
+    await _contract_address_auto_detect();
+  }
+  catch(
+    _error) {
+    _msg =
+      "Error auto-detecting address.";
+    _msg_error(
+      _msg,
+      0);
+    _echo2(
+      _msg);
+    throw _error; 
+  }
+  const
+    _help_display_type =
+      typeof(
+        _help_display);
+  if ( ( _help_display_type !== "undefined" &&
+         _help_display !== "" ) &&
+       ( _help_display_type !== "boolean" &&
+         _help_display !== true ) ) {
+    try {
+      _contract_address =
+        _get(
+          "contract",
+          "address");
+      _address_valid =
+        await _address_check(
+          _contract_address);
+    }
+    catch(
+      _error) {
+      _msg =
+        "Error detecting validity " +
+        ` of address '${_contract_address}'`;
+      _msg_error(
+        _msg,
+        0);
+      _echo2(
+        _error);
+      throw _error;
+    }
+    if ( ! _address_valid ) {
+      _msg =
+        "Contract address " +
+        `'${contract_address}' is ` +
+        `invalid.`;
+      _msg_error(
+        _msg,
+        0);
+      throw _msg;
+    }
+  }
+  _override_set(
+    "index",
+    "retrieve",
+    "n");
   // _api_key_auto_detect();
-  if ( contract_address != "" ) {
-    if ( contract_abi == "" ) {
-      contract_abi =
-        _default_artifact_path_get(
-          "abi");
-      _artifact_local_auto_detect(
-        "bytecode");
-      _artifact_local_auto_detect(
-        "compiler_output");
-      if ( contract_abi == "" ||
-           _default_artifact_path_get(
-             "abi") == contract_abi ) {
-        _contract_abi_auto_detect();
+  _contract_abi =
+    _get(
+      "contract",
+      "abi");
+  _contract_address =
+    _get(
+      "contract",
+      "address");
+  const
+    _target_contract =
+      _get(
+        "target",
+        "contract");
+  const
+    _contract_address_type =
+      typeof(
+        _contract_address);
+  const
+    _contract_abi_type =
+      typeof(
+        _contract_abi);
+  if ( _contract_address_type !== "undefined" &&
+       _contract_address != "" ) {
+    if ( _contract_abi_type === "array" ) {
+      _msg =
+        "Not implemented.";
+      _msg_error(
+        _msg,
+        1);
+    }
+    else if ( _contract_abi_type === "string" ) {
+      if ( 0 < _contract_abi.length ) {
+        _msg =
+          "Contract ABI:";
+        _msg_error(
+          _msg,
+          0);
+        _echo2(
+          _contract_abi);
+      }
+      else {
+        _msg =
+          "Specified no contract ABI " +
+          `for contract '${_target_contract}' ` +
+          `and address'${_contract_address}',` +
+          "auto-detecting.";
+        _msg_info(
+          _msg);
+        try {
+          _contract_abi =
+            await _default_artifact_path_get(
+              "abi");
+          await _artifact_local_auto_detect(
+            "bytecode");
+          await _artifact_local_auto_detect(
+            "compiler_output");
+          if ( _contract_abi == "" ||
+               _default_artifact_path_get(
+                 "abi") == _contract_abi ) {
+            await _contract_abi_auto_detect();
+          }
+        }
+        catch(
+          _error) {
+          _msg =
+            "Sigh.";
+          _msg_error(
+            _msg,
+            0);
+          throw _error;
+        }
       }
     }
   }
-  await _wallet_overrides_set(
-    "evm-wallet",
-    wallet_name,
-    call_auth);
+  else {
+    _msg =
+      `Contract address (type ` +
+      `'${_contract_address_type}'):`;
+    _msg_error(
+      _msg,
+      0);
+    _echo2(
+      _contract_address);
+  }
 }
 
 function
@@ -429,6 +630,9 @@ function
       `      Runtime environment:   ${runtime_environment}`,
       `                Call type:   ${call_type}`,
       `      Call authentication:   ${call_auth}`,
+      `    Application options:`,
+      `          Cache directory:   ${cache_dir}`,
+      `           Data directory:   ${data_dir}`,
       `    Credentials options:`,
       `              Wallet name:   ${wallet_name}`,
       `           Wallet address:   ${api_key}`,
@@ -436,13 +640,15 @@ function
       `          Wallet password:   ${wallet_password}`,
       `              Wallet seed:   ${wallet_seed}`,
       `        Network options:`,
-      `           Target network:   ${target_network}`,
+      `          Target networks:   ${target_networks}`,
       `              Max retries:   ${retries_max}`,
       `             Call timeout:   ${call_timeout}`,
       `                  API key:   ${api_key}`,
       `     RPC selection method:   ${rpc_selection}`,
       `                Gas price:   ${price_gas}`,
       `       Contract options:`,
+      `       Target application:   ${target_app}`,
+      `          Target contract:   ${target_contract}`,
       `         Contract address:   ${contract_address}`,
       `             Contract ABI:   ${contract_abi}`,
       `        Contract bytecode:   ${contract_bytecode}`,
@@ -549,6 +755,9 @@ function
       "",
       "  libEVM options:",
       "",
+      "     -K --app                        Target application.",
+      `                                     Default: '${target_app}'`,
+      "",
       "     -a --auth                       Call authentication.",
       `                                     Default: '${call_auth}'`,
       "",
@@ -561,7 +770,15 @@ function
       "       <rpc-selection>               'kirsh', 'random' or 'all'.",
       `                                     Default: '${rpc_selection}'.`,
       "",
+      "  Application options:",
+      "",
+      "     -W --cache-dir                  Cache directory.",
+      `                                     Default: '${cache_dir}'`,
+      "",
+      "     -D --data-dir                   Data directory.",
+      `                                     Default: '${data_dir}'`,
       "     -h --help                       This message.",
+      "",
       "     -v --verbose                    Enable verbose output.",
       ""
     ];
@@ -577,7 +794,9 @@ async function
   _cmdline_parse() {
   let
     _help_display,
-    _msg;
+    _msg,
+    _network,
+    _target_networks_set;
   const
     _argv_args = {
       "booleans": [
@@ -589,7 +808,9 @@ async function
         "index-retrieve",
         "v",
         "verbose"
-      ]
+      ],
+      "string":
+        true
     };
   const
     _argv =
@@ -719,6 +940,48 @@ async function
       _argv[
         "index-retrieve"]);
   }
+  if ( "app" in _argv ) {
+    _set(
+      "target",
+      "app",
+      _argv[
+        "app"]);
+  }
+  if ( "K" in _argv ) {
+    _set(
+      "target",
+      "app",
+      _argv[
+        "K"]);
+  }
+  if ( "cache-dir" in _argv ) {
+    _set(
+      "cache",
+      "dir",
+      _argv[
+        "cache-dir"]);
+  }
+  if ( "W" in _argv ) {
+    _set(
+      "cache",
+      "dir",
+      _argv[
+        "W"]);
+  }
+  if ( "data-dir" in _argv ) {
+    _set(
+      "data",
+      "dir",
+      _argv[
+        "data-dir"]);
+  }
+  if ( "D" in _argv ) {
+    _set(
+      "data",
+      "dir",
+      _argv[
+        "D"]);
+  }
   if ( "P" in _argv ) {
     _set(
       "price",
@@ -843,25 +1106,6 @@ async function
       "auth",
       "y");
   }
-  const
-    _target_networks =
-      _get(
-        "target",
-        "networks");
-  if ( "n" in _argv ) {
-    _target_networks.push(
-      _argv[
-        "n"]);
-  }
-  if ( "network" in _argv ) {
-    _target_networks.push(
-      _argv[
-        "network"]);
-  }
-  _set(
-    "target",
-    "networks",
-    _target_networks);
   _libevm_cmdline_parse(
     _argv);
   if ( _argv[
@@ -901,6 +1145,24 @@ function
     _argv_url_get(
       "index_retrieve")[
         0]);
+  _set(
+    "target",
+    "app",
+    _argv_url_get(
+      "app")[
+        0]);
+  _set(
+    "data",
+    "dir",
+    _argv_url_get(
+      "data_dir")[
+        0]);
+  _set(
+    "cache",
+    "dir",
+    _argv_url_get(
+      "cache_dir")[
+        0]);
   _set(
     "price",
     "gas",
@@ -1002,57 +1264,144 @@ async function
   _evm_contract_call_cmdline(
     _app_opts) {
   let
-    _result;
-  const
+    _msg,
+    _results;
+  try {
     _results =
       await _evm_contract_call.apply(
         null,
-        app_opts);
-  const
-    _results_type =
-      typeof(
-        _results);
-  if ( _results_type == "object" ) {
-    for ( _result of _results ) {
-      _echo(
-        _result);
-    }
+        _app_opts);
   }
-  else if ( _results_type == "string" ) {
-    _printf(
-      _results);
+  catch(
+    _error) {
+    _msg =
+      "Error running '_evm_contract_call' " +
+      `with options '${_app_opts}'.`;
+    _msg_error(
+      _msg,
+      0);
+    _echo(
+      _msg);
+    _echo2(
+      _error);
+    throw _error;
   }
+  // const
+  //   _results_type =
+  //     typeof(
+  //       _results);
+  // if ( _results_type == "array" ) {
+  //   for ( _result of _results ) {
+  //     _echo(
+  //       _result);
+  //   }
+  // }
+  // else if ( _results_type == "object" ) {
+  //   for ( _result in _results ) {
+  //     _echo(
+  //       _results[
+  //         _result]);
+  //   }
+  // }
+  // else if ( _results_type == "string" ) {
+  //   _printf(
+  //     _results);
+  // }
+  // else if ( _results_type == "undefined" ) {
+  //   _msg =
+  //     "No results";
+  //   _msg_error(
+  //     _msg,
+  //     0);
+  //   throw _msg;
+  // }
+  return _results;
 }
 
 async function
   _main() {
-  const
+  let
+    _cmdline_out,
+    _msg,
+    _overrides_set_up;
+  try {
     _overrides_set_up =
       await _overrides_set();
+  }
+  catch(
+    _error) {
+    _msg =
+      "Error setting up " +
+      "overrides.";
+    _msg_error(
+      _msg,
+      0);
+    throw _error;
+  }
+  const
+    _global =
+      _global_get();
+  const
+    _quiet =
+      _global[
+        "quiet"];
   _config_show();
-  app_opts = [
-    call_type,
-    call_timeout,
-    wallet_name,
-    wallet_path,
-    wallet_password,
-    wallet_seed,
-    api_key,
-    msg_value,
-    price_gas,
-    measure_unit,
-    retries_max,
-    target_network,
-    rpc_selection,
-    contract_address,
-    contract_abi,
-    contract_bytecode,
-    contract_compiler_output,
-    contract_method,
-    method_args
-  ];
-  await _evm_contract_call_cmdline(
-    app_opts);
+  _set(
+    "app",
+    "opts",
+    [
+      call_type,
+      call_timeout,
+      wallet_name,
+      wallet_path,
+      wallet_password,
+      wallet_seed,
+      api_key,
+      msg_value,
+      price_gas,
+      measure_unit,
+      retries_max,
+      target_networks,
+      rpc_selection,
+      contract_address,
+      contract_abi,
+      contract_bytecode,
+      contract_compiler_output,
+      contract_method,
+      method_args
+    ]);
+  const
+    _app_opts =
+      _get(
+        "app",
+        "opts");
+  try {
+    _msg =
+      "Running '_evm_contract_call_cmdline' " +
+      `with parameters:`;
+    _msg_info(
+      _msg);
+    if ( _quiet == "n" ) {
+      _echo(
+        _app_opts);
+    }
+    _cmdline_out =
+      await _evm_contract_call_cmdline(
+        _app_opts);
+  }
+  catch(
+    _error) {
+    _msg =
+      "Running '_evm_contract_call_cmdline' " +
+      `with parameters '${_app_opts}' failed.`;
+    _msg_error(
+      _msg,
+      0);
+    _echo2(
+      _error);
+    throw _error;
+  }
+  return _cmdline_out;
 }
 
 _global_variables();
@@ -1069,9 +1418,21 @@ else{
   _url_parse();
   _libevm_url_parse();
 }
-_echo(
-  contract_address);
-_main();
+try {
+  await _main();
+}
+catch(
+  _error) {
+  const
+    _msg =
+      "Error running 'main'.";
+  _msg_error(
+    _msg,
+    0);
+  _echo2(
+    _error);
+  throw _error;
+}
 
 export {
   _evm_contract_call