evm-contracts-tools 0.0.38 → 0.0.39

package/evm-contract-deployment-versions

@@ -79,6 +79,15 @@ _printf =
 const
 _process_exit =
   _libcrash._process_exit;
+const
+  _libevm_contract_deployment_versions_module =
+  require(
+    "./libevm-contract-deployment-versions");
+/* global
+     _evm_contract_deployment_versions */
+const
+  _evm_contract_deployment_versions =
+    _libevm_contract_deployment_versions_module._evm_contract_deployment_versions;
 
 function
   _global_variables() {
@@ -86,7 +95,7 @@ function
        app_name:
          writable */
   app_name =
-    "evm-contract-deployments-address.js";
+    "evm-contract-deployments-versions.js";
   /* global
        app_opts:
          writable */
@@ -103,49 +112,19 @@ function
   resolve_date =
     "";
   /* global
-       user_level:
-         writable */
-  user_level =
-    "";
-  /* global
-       target_networks:
-         writable */
-  target_networks =
-    [];
-  /* global
-       network_ids:
-         writable */
-  network_ids =
-    [];
-  /* global
-       networks_all:
-         writable */
-  networks_all =
-    "";
-  /* global
-       target_app:
-         writable */
-  target_app =
-    "";
-  /* global
-       target_contract:
+       config_file:
          writable */
-  target_contract =
+  config_file =
     "";
   /* global
-       contract_version:
+       display_highest:
          writable */
-  contract_version =
+  display_highest =
     "";
   /* global
-       user_defined:
+       display_lowest:
          writable */
-  user_defined =
-    "";
-  /* global
-       deployments_dir:
-         writable */
-  deployments_dir =
+  display_lowest =
     "";
   quiet =
     "";
@@ -159,32 +138,18 @@ 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);
-    }
-  }
   if ( resolve_date == "" ||
        typeof(
          resolve_date) == "undefined" ) {
     resolve_date =
       _get_date_human();
   }
-  if ( user_level == "" ) {
-    user_level =
+  if ( display_highest == "" ) {
+    display_highest =
+      "n";
+  }
+  if ( display_lowest == "" ) {
+    display_lowest =
       "n";
   }
 }
@@ -197,9 +162,9 @@ function
     _text = [
       `${app_name} configuration:`,
       `             Resolve date:   ${resolve_date}`,
-      `      Runtime environment:   ${runtime_environment}`,
-      `       Target application:   ${target_app}`,
-      `               User level:   ${user_level}`,
+      `       Configuration file:   ${config_file}`,
+      `          Display highest:   ${display_highest}`,
+      `           Display lowest:   ${display_lowest}`,
     ];
   for ( _line of _text ) {
     _msg_info(
@@ -215,19 +180,21 @@ function
   const
     _text = [
       "",
-      "Returns default deployments directory for an application",
+      "Returns available versions for contract deployments on a network",
       "",
       "Usage:",
       "",
       `  ${app_name}`,
       "    [options]",
-      "    <target-app>",
+      "    <config-file>",
       "",
       "  options:",
       "",
-      "     -u --user-level                 Returns user-level location",
-      "                                     for an application deployments",
-      `                                     Default: '${user_level}`,
+      "     -H --display-highest            Display highest versions available.",
+      `                                     Default: '${display_highest}`,
+      "",
+      "     -L --display-lowest             Display lowest versions available.",
+      `                                     Default: '${display_lowest}`,
       "",
       "     -h --help                       This message.",
       "     -v --verbose                    Enable verbose output.",
@@ -249,8 +216,10 @@ async function
   const
     _argv_args = {
       "booleans": [
-        "u",
-        "user-level",
+        "H",
+        "display-highest",
+        "L",
+        "display-lowest",
         "h",
         "help",
         "v",
@@ -299,7 +268,7 @@ async function
        _argv[
          "_"].length < 1 ) {
     _msg =
-      "Target application " +
+      "Configuration file " +
       "argument required.";
     _msg_error(
       _msg,
@@ -307,19 +276,29 @@ async function
     _usage(
       1);
   }
-  target_app =
+  config_file =
     _argv[
       "_"][
         0];
-  if ( "u" in _argv ) {
-    user_level =
+  if ( "H" in _argv ) {
+    display_highest =
+      _argv[
+        "H"];
+  }
+  if ( "display-highest" in _argv ) {
+    display_highest =
+      _argv[
+        "display-highest"];
+  }
+  if ( "L" in _argv ) {
+    display_lowest =
       _argv[
-        "u"];
+        "L"];
   }
-  if ( "user_level" in _argv ) {
-    user_level =
+  if ( "display-lowest" in _argv ) {
+    display_lowest =
       _argv[
-        "user_level"];
+        "display-lowest"];
   }
   if ( _argv[
          "v"] ||
@@ -337,9 +316,17 @@ function
     _network;
   runtime_environment =
     "browser";
-  user_level =
+  config_file =
+    _argv_url_get(
+      "config_file")[
+        0];
+  display_highest =
     _argv_url_get(
-      "user_level")[
+      "display_highest")[
+        0];
+  display_lowest =
+    _argv_url_get(
+      "display_lowest")[
         0];
   quiet =
     _argv_url_get(
@@ -351,15 +338,15 @@ function
 }
 
 async function
-  _evm_contract_deployments_dir_cmdline(
+  _evm_contract_deployment_versions_cmdline(
     _app_opts) {
   let
     _result;
   const
     _results =
-      await _evm_contract_deployments_dir.apply(
+      await _evm_contract_deployment_versions.apply(
         null,
-        app_opts);
+        _app_opts);
   const
     _results_type =
       typeof(
@@ -384,21 +371,19 @@ async function
   _config_show();
   const
     app_opts = [
-      target_app,
-      user_level
+      config_file,
+      display_highest,
+      display_lowest
     ];
-  const
-    _deployments =
-      await _evm_contract_deployments_dir.apply(
-        null,
-        app_opts);
+  _evm_contract_deployment_versions_cmdline(
+    app_opts);
 }
 
 _global_variables();
 if ( _cmdline_check(
-       "evm-contract-deployments-dir.js") == true ||
+       "evm-contract-deployment-versions.js") ||
      _cmdline_check(
-       "evm-contract-deployments-dir") == true ) {
+       "evm-contract-deployment-versions") ) {
   _cmdline_parse();
 }
 else{

package/libevm-contract-deployment-address

@@ -137,6 +137,15 @@ const
 const
   _evm_contract_deployments_dir =
     _libevm_contract_deployments_dir_module._evm_contract_deployments_dir;
+const
+  _libevm_contract_deployment_networks =
+    require(
+      "./libevm-contract-deployment-networks");
+/* global
+     _evm_contract_deployment_networks */
+const
+  _evm_contract_deployment_networks =
+    _libevm_contract_deployment_networks_module._evm_contract_deployment_networks;
 const
   _evm_chains_info_module =
     require(
@@ -147,20 +156,43 @@ const
   _evm_chains_info =
     _evm_chains_info_module._evm_chains_info;
 
-
 function
   _contract_address_get(
     _deployments,
     _contract,
     _network,
     _network_id,
-    _version) {
+    _version,
+    _configuration_format) {
   let
+    _config_file_ext,
     _config_path,
     _address,
     _found,
     _msg,
     _net;
+  if ( typeof(
+         _configuration_format) === "undefined" ||
+       _configuration_format == "" ) {
+    _configuration_format =
+      "bash";
+  }
+  if ( _configuration_format == "bash" ) {
+    _config_file_ext =
+      "sh";
+  }
+  if ( _configuration_format == "json" ) {
+    _config_file_ext =
+      "json"
+  }
+  else {
+    _msg =
+      "Unknown configuration format " +
+      `${_configuration_format}'.`;
+    _msg_error(
+      _msg,
+      1);
+  }
   const
     _networks = [
       _network,
@@ -170,7 +202,7 @@ function
     false;
   for ( _net of _networks ) {
     _config_path =
-      `${_deployments}/${_contract}/${_net}/config.sh`;
+      `${_deployments}/${_contract}/${_net}/config.${_config_file_ext}`;
     if ( _file_exists(
            _config_path) ) {
       _found =
@@ -181,7 +213,7 @@ function
   if ( ! _found ) {
     _msg =
       `No network '${_network}' deployment ` +
-      `configuration for '${_contract}' ` +
+      `configuration for contract '${_contract}' ` +
       `found at path '${_deployments}'.`;
     _msg_error(
       _msg,
@@ -207,6 +239,7 @@ function
       _msg,
       1);
   }
+  return _contract_address;
 }
 
 function
@@ -248,40 +281,159 @@ function
 }
 
 function
-  _evm_contract_deployments_dir(
-    _app,
-    _user_level) {
+  _evm_contract_deployment_address(
+    _target_networks,
+    _network_ids,
+    _networks_all,
+    _target_app,
+    _contract_version,
+    _user_defined,
+    _deployments_dir) {
   let
-    _deployments,
-    _deployment_type;
-  _app_check(
-    _app);
-  if ( _user_level == "n" ) {
-    _deployment_type =
-      "system";
+    _args,
+    _contract_address,
+    _contract_address_get_args,
+    _contracts_addresses,
+    _network,
+    _network_check_args,
+    _target_network,
+    _target_network_id,
+    _user_deployments_dir,
+    _system_deployments_dir,
+    _msg;
+  if ( _user_defined == "n" ) {
+    if ( _target_app == "" ) {
+      _msg =
+        "A target application needs to " +
+        "be specified with option '-a' " +
+        "if not enabling user-defined " +
+        "deployments with '-u' and " +
+        "specifying a deployments directory " +
+        "path with '-d'.";
+      _msg_error(
+        _msg,
+        1)
+    }
+    _system_deployments_dir =
+      _evm_contract_deployments_dir(
+        target_app);
+    if ( _deployments_dir != system_deployments_dir ) {
+      _msg =
+        "To set a custom deployments directory path " +
+        "you need to enable the user-defined " +
+        "deployments switch with '-u'." +
+      _msg_error(
+        _msg,
+        1)
+    }
   }
-  else if ( _user_level == "n" ) {
-    _deployment_type =
-      "system";
+  else if ( _user_defined == "y" ) {
+    if ( _target_app != "" ) {
+      _user_deployments_dir =
+        _evm_contract_deployments_dir(
+	  _target_app,
+          _user_defined);
+    }
+    if ( _deployments_dir != _user_deployments_dir ) {
+      _msg =
+        "Using custom deployments directory " +
+        `path '${_deployments_dir}'.`;
+      _msg_info(
+        _msg);
+    }
+    else {
+      _user_deployments_check();
+    }
   }
   else {
     _msg =
-      "User level argument must be " +
+      "The 'user-defined' switch argument must be " +
       "can be 'y' or 'n'."
     _msg_error(
       _msg,
       1);
   }
-  _deployments =
-    _default_deployments_dir_get(
-      _app,
-      _deployment_type);
-  return _deployments;
+  if ( _networks_all == "y" ) {
+    _target_networks =
+      _evm_contract_deployment_networks(
+        `${_deployments_dir}/${_target_contract}`,
+        _networks_all);
+  }
+  for ( _network of _target_networks ) {
+    _target_network_id =
+      "";
+    _network_check_args = [
+      _deployments_dir,
+      _target_contract,
+      _network,
+      _target_network_id
+    ];
+    _network_check.apply(
+      null,
+      _network_check_args);
+    _contract_address_get_args.push( [
+      _deployments_dir,
+      _target_contract,
+      _target_network,
+      _target_network_id,
+      _contract_version
+    ] );
+  }
+  for ( _network of  _network_ids ) {
+    _target_network =
+      "";
+    _network_check_args = [
+      _deployments_dir,
+      _target_contract,
+      _target_network,
+      _network
+    ];
+    _network_check.apply(
+      null,
+      _network_check_args);
+    _contract_address_get_args.push( [
+      _deployments_dir,
+      _target_contract,
+      _target_network,
+      _target_network_id,
+      _contract_version
+    ] );
+  }
+  for ( _args of _contract_address_args ) {
+    _contract_address =
+      _contract_address_get.apply(
+        null,
+        _args);
+    _contract_addresses.push(
+      _contract_address);
+  }
+  return _contracts_addresses;
+}
+
+function
+  _networks_all_auto_detect() {
+  let
+    _networks_all;
+  _networks_all =
+    "n";
+  if ( target_networks.length < 1 &&
+       network_ids.length < 1 ) {
+    _networks_all =
+      "y";
+  }
+  if ( typeof(
+         networks_all) === "undefined" ||
+       networks_all == "" ) {
+    networks_all =
+      _networks_all;
+  }
 }
 
 module.exports = {
   _default_deployments_dir_get:
     _default_deployments_dir_get,
-  _evm_contract_deployments_dir:
-    _evm_contract_deployments_dir,
+  _evm_contract_deployment_address:
+    _evm_contract_deployment_address,
+  _networks_all_auto_detect:
+    _networks_all_auto_detect,
 };