evm-contracts-tools 0.0.55 → 0.0.62

package/libevm-contract-deployment

@@ -85,6 +85,11 @@ const
 const
   _dir_exists =
     _libcrash_module._dir_exists;
+/* global
+     _echo */
+const
+  _echo =
+    _libcrash_module._echo;
 /* global
      _file_exists */
 const
@@ -100,6 +105,11 @@ const
 const
   _from_bash_ass_array =
     _libcrash_module._from_bash_ass_array;
+/* global
+     _get */
+const
+  _get =
+    _libcrash_module._get;
 /* global
      _homedir_get */
 const
@@ -154,33 +164,12 @@ const
 const
   _evm_chains_info =
     _evm_chains_info_module._evm_chains_info;
-const
-  _libevm_contract_deployments_dir_module =
-    await _require(
-      "./libevm-contract-deployments-dir");
-/* global
-     _evm_contract_deployments_dir */
-const
-  _evm_contract_deployments_dir =
-    _libevm_contract_deployments_dir_module._evm_contract_deployments_dir;
-const
-  _libevm_contract_deployment_networks_module =
-    await _require(
-      "./libevm-contract-deployment-networks");
+  /* global
+       _evm_contract_deployments_dir */
 /* global
      _evm_contract_deployment_networks */
-const
-  _evm_contract_deployment_networks =
-    _libevm_contract_deployment_networks_module._evm_contract_deployment_networks;
-const
-  _libevm_contract_deployment_versions_module =
-    await _require(
-      "./libevm-contract-deployment-versions");
 /* global
      _evm_contract_deployment_versions */
-const
-  _evm_contract_deployment_versions =
-    _libevm_contract_deployment_versions_module._evm_contract_deployment_versions;
 
 async function
   _network_check(
@@ -189,18 +178,45 @@ async function
     _target_network,
     _target_network_id) {
   let
+    _contract_deployments_path,
     _error_flag,
+    _evm_contract_deployment_networks,
+    _evm_chains_info_args,
     _msg,
     _network_id;
+  _msg =
+    "Network check for deployments " +
+    `'${_deployments}', contract '${_contract}', ` +
+    `network '${_target_network}' and network with ID ` +
+    `'${_target_network_id}'.`;
+  _msg_info(
+    _msg);
+  _evm_contract_deployment_networks =
+    _get(
+      "_evm_contract",
+      "deployment_networks");
+  const
+    _evm_contract_deployment_networks_type =
+      typeof(
+        _evm_contract_deployment_networks_dir);
+  if ( _evm_contract_deployment_networks_type == "undefined" ||
+       _evm_contract_deployment_networks == "" ) {
+    const
+      _libevm_contract_deployment_networks_module =
+        await import(
+          "./libevm-contract-deployment-networks");
+      _evm_contract_deployment_networks =
+        _libevm_contract_deployment_networks_module._evm_contract_deployment_networks;
+  }
   _error_flag =
     false;
-  _deployments_path =
+  _contract_deployments_path =
     _path_join( [
       _deployments,
       _contract ]);
   const
     _evm_contract_deployment_networks_args = [
-      _deployments_path,
+      _contract_deployments_path,
       "y",                  // Display all
       "n",                  // Display safest
       "n"                   // Display cheapest
@@ -240,7 +256,8 @@ async function
   if ( _error_flag ) {
     _msg_error(
       _msg,
-      1);
+      0);
+    throw _msg;
   }
   if ( _target_network_id == "" ) {
     _evm_chains_info_args = [
@@ -256,12 +273,29 @@ async function
       _target_network,
       []                 // database paths
     ];
-    _network_id =
-      await _evm_chains_info.apply(
-        null,
-        _evm_chains_info_args);
+    try {
+      _network_id =
+        await _evm_chains_info.apply(
+          null,
+          _evm_chains_info_args);
+    }
+    catch(
+      _error) {
+      _msg = 
+        "Error while running '_evm_chains_info' " +
+        `with arguments '${_evm_chains_info_args}'.`;
+      _msg_error(
+        _msg,
+        0);
+      _msg_error(
+        _error,
+        0);
+      throw _error;
+    }
   }
   else if ( _target_network == "" ) {
+    _network_id =
+      _target_network_id;
     _evm_chains_info_args = [
       "get",             // target command
       "id"  ,            // input type
@@ -275,9 +309,25 @@ async function
       _target_network_id,
       []                 // database paths
     ];
-    _target_network =
-      await _evm_chains_info(
-        _evm_chains_info_args);
+    try {
+      _target_network =
+        await _evm_chains_info.apply(
+          null,
+          _evm_chains_info_args);
+    }
+    catch(
+      _error) {
+      _msg = 
+        "Error while running '_evm_chains_info' " +
+        `with arguments '${_evm_chains_info_args}'.`;
+      _msg_error(
+        _msg,
+        0);
+      _msg_error(
+        _error,
+        0);
+      throw _error;
+    }
   }
   if ( _target_network_id != "" ) {
     if ( _target_network_id != _network_id ) {
@@ -288,18 +338,45 @@ async function
         `known ID '${_network_id}'.`;
       _msg_error(
         _msg,
-        1);
+        0);
+      throw _msg;
     }
   }
+  _msg =
+    "Network check for deployments " +
+    `'${_deployments}', contract '${_contract}', ` +
+    `network '${_target_network}' and network with ID ` +
+    `'${_target_network_id}' completed.`;
+  _msg_info(
+    _msg);
 }
 
 async function
   _user_deployments_init(
     _app,
     _deployments_dir) {
+  let
+    _evm_contract_deployments_dir;
   const
     _user_defined =
       "y";
+  _evm_contract_deployments_dir =
+    _get(
+      "_evm_contract",
+      "deployments_dir");
+  const
+    _evm_contract_deployments_dir_type =
+      typeof(
+        _evm_contract_deployments_dir);
+  if ( _evm_contract_deployments_dir_type == "undefined" ||
+       _evm_contract_deployments_dir == "" ) {
+    const
+      _libevm_contract_deployments_dir_module =
+        await import(
+          "./libevm-contract-deployments-dir");
+      _evm_contract_deployments_dir =
+        _libevm_contract_deployments_dir_module._evm_contract_deployments_dir;
+  }
   const
     _evm_contract_deployments_dir_args = [
       _app,
@@ -347,7 +424,8 @@ async function
 async function
   _deployments_dir_auto_detect() {
   let
-    _deployments;
+    _deployments,
+    _evm_contract_deployments_dir;
   _deployments =
     "";
   const
@@ -362,6 +440,23 @@ async function
     const
       _user_defined =
         user_defined;
+    _evm_contract_deployments_dir =
+      _get(
+        "_evm_contract",
+        "deployments_dir");
+    const
+      _evm_contract_deployments_dir_type =
+        typeof(
+          _evm_contract_deployments_dir);
+    if ( _evm_contract_deployments_dir_type == "undefined" ||
+         _evm_contract_deployments_dir == "" ) {
+      const
+        _libevm_contract_deployments_dir_module =
+          await import(
+            "./libevm-contract-deployments-dir");
+        _evm_contract_deployments_dir =
+          _libevm_contract_deployments_dir_module._evm_contract_deployments_dir;
+    }
     const
       _evm_contract_deployments_dir_args = [
         _app,
@@ -384,6 +479,7 @@ async function
     _config,
     _config_ext,
     _deployments,
+    _evm_contracts_deployment_versions,
     _found,
     _net,
     _network,
@@ -485,6 +581,27 @@ async function
           _msg,
           1);
       }
+      const
+        _libevm_contract_deployment_versions_module =
+          await import(
+            "./libevm-contract-deployment-versions");
+      _evm_contract_deployment_versions =
+        _get(
+          "_evm_contract",
+          "deployment_versions");
+      const
+        _evm_contract_deployment_versions_type =
+          typeof(
+            _evm_contract_deployment_versions_dir);
+      if ( _evm_contract_deployment_versions_type == "undefined" ||
+           _evm_contract_deployment_versions == "" ) {
+        const
+          _libevm_contract_deployment_versions_module =
+            await import(
+              "./libevm-contract-deployment-versions");
+          _evm_contract_deployment_versions =
+            _libevm_contract_deployment_versions_module._evm_contract_deployment_versions;
+      }
       const
         _evm_contract_deployment_versions_args = [
           _config,
@@ -548,6 +665,7 @@ async function
   const
     _user_defined =
       user_defined;
+
   const
     _evm_contract_deployments_dir_args = [
       _dir_current_name,