evm-contracts-tools 0.0.55 → 0.0.62

package/libevm-contract-deployment-address

@@ -61,8 +61,8 @@
 
 const
   _libcrash_module =
-    require(
-      "crash-js");
+    await import(
+      "libcrash-js");
 /* global
      _basename */
 const
@@ -83,6 +83,16 @@ const
 const
   _dir_exists =
     _libcrash_module._dir_exists;
+/* global
+     _echo */
+const
+  _echo =
+    _libcrash_module._echo;
+/* global
+     _echo2 */
+const
+  _echo2 =
+    _libcrash_module._echo2;
 /* global
      _file_exists */
 const
@@ -98,6 +108,11 @@ const
 const
   _from_bash_ass_array =
     _libcrash_module._from_bash_ass_array;
+/* global
+     _global_get */
+const
+  _global_get =
+    _libcrash_module._global_get;
 /* global
      _homedir_get */
 const
@@ -143,27 +158,14 @@ const
 const
   _pwd =
     _libcrash_module._pwd;
-const
-  _evm_chains_info_module =
-    require(
-      "evm-chains-info");
 /* global
-     _evm_chains_info */
+     _require */
 const
-  _evm_chains_info =
-    _evm_chains_info_module._evm_chains_info;
-const
-  _libevm_contract_deployments_dir_module =
-    require(
-      "./libevm-contract-deployments-dir");
-/* global
-     _evm_contract_deployments_dir */
-const
-  _evm_contract_deployments_dir =
-    _libevm_contract_deployments_dir_module._evm_contract_deployments_dir;
+  _require =
+    _libcrash_module._require;
 const
   _libevm_contract_deployment_module =
-    require(
+    await import(
       "./libevm-contract-deployment");
 /* global
      _contract_version_auto_detect */
@@ -197,24 +199,15 @@ const
     _libevm_contract_deployment_module._user_deployments_check;
 const
   _libevm_contract_deployment_networks_module =
-    require(
+    await import(
       "./libevm-contract-deployment-networks");
 /* 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 =
-    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
+async function
   _contract_address_get(
     _deployments,
     _contract,
@@ -226,13 +219,39 @@ function
     _config,
     _config_file_ext,
     _config_path,
+    _evm_contract_deployment_versions_args,
+    _libevm_contract_deployment_versions_module,
     _found,
     _key_name,
     _msg,
     _net;
-  if ( typeof(
-         _configuration_format) === "undefined" ||
+  const
+    _global =
+      _global_get();
+  const
+    _quiet =
+      _global[
+        "quiet"];
+  _msg =
+    "Reading address from " +
+    "configuration file.";
+  _msg_info(
+    _msg);
+  const
+    _version_type =
+      typeof(
+        _version);
+  const
+    _configuration_format_type =
+      typeof(
+        _configuration_format);
+  if ( _configuration_format_type === "undefined" ||
        _configuration_format == "" ) {
+    _msg =
+      "Configuration format not set, " +
+      "setting default (bash).";
+    _msg_info(
+      _msg);
     _configuration_format =
       "bash";
   }
@@ -299,13 +318,78 @@ function
     _key_name =
       "contract_address";
   }
+  else {
+    _msg =
+      "Unknown configuration format " +
+      `'${_configuration_format}'.`;
+    _msg_error(
+      _msg,
+      0);
+    throw _msg;
+  }
+  if ( _version_type === "undefined" ||
+       _version == "" ) {
+    _msg =
+      "No version selected, " +
+      "retrieving.";
+    _msg_info(
+      _msg);
+    _libevm_contract_deployment_versions_module =
+      await import(
+        "./libevm-contract-deployment-versions");
+    const
+      _evm_contract_deployment_versions =
+        _libevm_contract_deployment_versions_module._evm_contract_deployment_versions;
+    _evm_contract_deployment_versions_args = [
+      _config_path,
+      "y",            // display highest
+      "n",            // display lowest
+      _configuration_format
+    ];
+    try {
+      _msg =
+        "Running '_evm_contract_deployment_versions' " +
+        "with arguments:";
+      _msg_info(
+        _msg);
+      if ( _quiet == "n" ) {
+        _echo(
+          _evm_contract_deployment_versions_args);
+      }
+      _version =
+        await _evm_contract_deployment_versions.apply(
+          null,
+          _evm_contract_deployment_versions_args);
+      _msg =
+        "Got contract version " +
+        `'${_version}'.`;
+      _msg_info(
+        _msg);
+    }
+    catch(
+      _error) {
+      _msg =
+        "Error while running " +
+        "'_evm_contract_deployment_versions' with arguments:";
+      _msg_error(
+        _msg,
+        0);
+      _echo2(
+        _evm_contract_deployment_versions_args);
+      throw _error;
+    }
+  }
   const
     _contract_address =
       _config[
         _key_name][
           _version];
-  if ( _contract_address == "" ||
-       _contract_address == null ) {
+  const
+    _contract_address_type =
+      typeof(
+        _contract_address);
+  if ( _contract_address_type === "undefined" ||
+       _contract_address == "" ) {
     _msg =
       `No '${_contract}' version '${_version}' ` +
       `contract deployment specified for network ` +
@@ -316,6 +400,12 @@ function
       0);
     throw _msg;
   }
+  else if ( _contract_address_type == "string" ) {
+    _msg =
+      `Got contract address '${_contract_address}'`;
+    _msg_info(
+      _msg);
+  }
   return _contract_address;
 }
 
@@ -331,23 +421,71 @@ async function
     _configuration_format,
     _deployments_dir) {
   let
+    _address,
     _args,
     _contract_address,
+    _msg,
     _network,
     _network_check_args,
     _target_network,
     _target_network_id,
     _user_deployments_dir,
-    _system_deployments_dir,
-    _msg;
+    _system_deployments_dir;
+  const
+    _libevm_contract_deployments_dir_module =
+      await import(
+        "./libevm-contract-deployments-dir");
+  const
+    _evm_contract_deployments_dir =
+      _libevm_contract_deployments_dir_module._evm_contract_deployments_dir;
   const
     _contracts_addresses =
       [];
   const
     _contract_address_get_args =
       [];
+  const
+    _user_defined_type =
+      typeof(
+        _user_defined);
+  const
+    _deployments_dir_type =
+      typeof(
+        _deployments_dir);
+  if ( _user_defined_type === "undefined" ||
+       _user_defined === "" ) {
+    _msg =
+      "User defined not specified, setting " +
+      "default (n).";
+    _msg_info(
+      _msg);
+    _user_defined =
+      "n";
+  }
+  if ( _deployments_dir_type === "undefined" ||
+       _deployments_dir === "" ) {
+    try {
+      _deployments_dir =
+        await _evm_contract_deployments_dir(
+          _target_app,
+          _user_defined);
+    }
+    catch(
+      _error) {
+      _msg =
+        "Error while retrieving system deployments " +
+        "directory location for auto-detection.";
+      _msg_error(
+        _msg,
+        0);
+      _msg_error(
+        _error,
+        0);
+      throw _error;
+    }
+  }
   if ( _user_defined == "n" ) {
-    if ( _target_app == "" ) {
+    if ( _target_app === "" ) {
       _msg =
         "A target application needs to " +
         "be specified with option '-a' " +
@@ -360,10 +498,25 @@ async function
         0);
       throw _msg;
     }
-    _system_deployments_dir =
-      await _evm_contract_deployments_dir(
-        _target_app,
-        _user_defined);
+    try {
+      _system_deployments_dir =
+        await _evm_contract_deployments_dir(
+          _target_app,
+          _user_defined);
+    }
+    catch(
+      _error) {
+      _msg =
+        "Error while retrieving system deployments " +
+        "directory location.";
+      _msg_error(
+        _msg,
+        0);
+      _msg_error(
+        _error,
+        0);
+      throw _error;
+    }
     if ( _deployments_dir != _system_deployments_dir ) {
       _msg =
         "To set a custom deployments directory path " +
@@ -377,10 +530,25 @@ async function
   }
   else if ( _user_defined == "y" ) {
     if ( _target_app != "" ) {
-      _user_deployments_dir =
-        await _evm_contract_deployments_dir(
-          _target_app,
-          _user_defined);
+      try {
+        _user_deployments_dir =
+          await _evm_contract_deployments_dir(
+            _target_app,
+            _user_defined);
+      }
+      catch(
+        _error) {
+        _msg =
+          "Error while retrieving user deployments " +
+          "directory location.";
+        _msg_error(
+          _msg,
+          0);
+        _msg_error(
+          _error,
+          0);
+        throw _error;
+      }
     }
     if ( _deployments_dir != _user_deployments_dir ) {
       _msg =
@@ -402,18 +570,46 @@ async function
     _msg_error(
       _msg,
       0);
-    throw _msg;
+    const
+      _exception = {
+        "msg":
+          _msg
+      };
+    throw _exception;
   }
   if ( _networks_all == "y" ) {
     _msg =
       "Selecting all networks.";
     _msg_info(
       _msg);
-    _target_networks =
-      await _evm_contract_deployment_networks(
-        `${_deployments_dir}/${_target_contract}`,
-        _networks_all);
+    try {
+      _target_networks =
+        await _evm_contract_deployment_networks(
+          `${_deployments_dir}/${_target_contract}`,
+          _networks_all);
+    }
+    catch(
+      _error) {
+      _msg =
+        "Error while retrieving networks " +
+        `for contract '${_target_contract}'.`;
+      _msg_error(
+        _msg,
+        0);
+      _echo2(
+        _error);
+      throw _error;
+    }
   }
+  _msg =
+    `Getting '${_target_contract}' contract address for ` +
+    `libEVM app '${_target_app}' ` +
+    `for networks with RPCs '${_target_networks}' ` +
+    `and chain ID '${_network_ids}', (user-defined contracts: ` +
+    `'${_user_defined}'), by looking for configuration files ` +
+    `of type '${_configuration_format}'.`;
+  _msg_info(
+    _msg);
   for ( _network of _target_networks ) {
     // _msg =
     //   "Info arguments for " +
@@ -456,31 +652,73 @@ async function
       _deployments_dir,
       _target_contract,
       _target_network,
-      _target_network_id,
+      _network,
       _contract_version,
       _configuration_format
     ] );
   }
   for ( _args of _contract_address_get_args ) {
-    _contract_address =
-      _contract_address_get.apply(
-        null,
+    try {
+      _msg =
+        "Running " +
+        "_contract_address_get " +
+        `with parameters:`;
+      _msg_info(
+        _msg);
+      _echo2(
+        _args);
+      _contract_address =
+        await _contract_address_get.apply(
+          null,
+          _args);
+    }
+    catch(
+      _error) {
+      _msg =
+        "Error while running " +
+        "_contract_address_get " +
+        `with parameters:`;
+      _msg_error(
+        _msg,
+        0);
+      _echo2(
         _args);
+      _echo2(
+        _error);
+      throw _msg;
+    }
     _contracts_addresses.push(
       _contract_address);
   }
-  return _contracts_addresses;
+  const
+    _contracts_addresses_set =
+      {};
+  for ( _address of _contracts_addresses ) {
+    _contracts_addresses_set[
+      _address] =
+      1;
+  }
+  return Object.keys(
+    _contracts_addresses_set);
 }
 
-module.exports = {
-  _contract_version_auto_detect:
-    _contract_version_auto_detect,
-  _deployments_dir_auto_detect:
-    _deployments_dir_auto_detect,
-  _evm_contract_deployment_address:
-    _evm_contract_deployment_address,
-  _networks_all_auto_detect:
-    _networks_all_auto_detect,
-  _target_app_auto_detect:
-    _target_app_auto_detect
+export {
+  _contract_version_auto_detect,
+  _deployments_dir_auto_detect,
+  _evm_contract_deployment_address,
+  _networks_all_auto_detect,
+  _target_app_auto_detect
 };
+
+// module.exports = {
+//   _contract_version_auto_detect:
+//     _contract_version_auto_detect,
+//   _deployments_dir_auto_detect:
+//     _deployments_dir_auto_detect,
+//   _evm_contract_deployment_address:
+//     _evm_contract_deployment_address,
+//   _networks_all_auto_detect:
+//     _networks_all_auto_detect,
+//   _target_app_auto_detect:
+//     _target_app_auto_detect
+// };

package/libevm-contract-deployments-dir

@@ -83,7 +83,8 @@ function
   if ( _error_flag ) {
     _msg_error(
       _msg,
-      1);
+      0);
+    throw _msg;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 { "name": "evm-contracts-tools",
   "version":
-    "0.0.55",
+    "0.0.62",
   "description":
     "JavaScript programs and libraries to enable seamless development of native computer applications designed to interact with Ethereum Virtual Machine-compatible networks.",
   "funding": {
@@ -100,7 +100,7 @@
   },
   "devDependencies": {
     "crash-js-webpack":
-      "^0.0.69",
+      "^0.0.77",
     "brace-expansion":
       "^5.0.9",
     "eslint":
@@ -108,11 +108,11 @@
     "@eslint/js":
       "^10.0.1",
     "fast-uri":
-      "^4.1.2",
+      "^4.1.4",
     "globals":
       "^17.3.0",
     "safely-serve":
-      "^0.0.19",
+      "^0.0.21",
     "webpack":
       "^5.109.2",
     "webpack-cli":
@@ -120,31 +120,33 @@
   },
   "dependencies": {
     "libcrash-js":
-      "npm:crash-js@^100000000000001.1000000000000001.1000000000000001",
+      "npm:crash-js@^1000000000000011.1000000000000001.1000000000000001",
     "ethers":
       "^6.13.2",
     "evm-chains-info":
-      "^0.0.34",
+      "^0.0.36",
     "evm-transactions-tools":
-      "^0.0.11111111",
+      "^0.1.10000000001",
     "evm-wallet":
-      "npm:evm-wallet.js@^0.0.92",
+      "npm:evm-wallet.js@^0.0.96",
     "libevm":
-      "^0.0.39",
+      "^0.0.41",
     "ws":
       "^8.21.0",
     "yargs":
       "18.0.0"
   },
   "overrides": {
+    "libcrash-js":
+      "npm:crash-js@^1000000000000011.1000000000000001.1000000000000001",
     "evm-contracts-tools":
       "./evm-contracts-tools",
     "evm-wallet":
-      "npm:evm-wallet.js@^0.0.92",
+      "npm:evm-wallet.js@^0.0.96",
     "evm-wallet.js":
-      "npm:evm-wallet.js@^0.0.92",
+      "npm:evm-wallet.js@^0.0.96",
     "libevm":
-      "^0.0.39"
+      "^0.0.41"
   },
   "type":
     "module",