evm-contracts-tools 0.0.62 → 0.0.65

package/libevm-contract-deployment-abi

@@ -2,25 +2,27 @@
 
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
-/**    ----------------------------------------------------------------
+/**    ----------------------------------------------------------
  *     libevm-contract-deployment-abi
- *     ----------------------------------------------------------------
+ *     ----------------------------------------------------------
  *     Copyright ©
  *       Pellegrino Prevete
  *         2025, 2026
  * 
  *     All rights reserved
- *     ----------------------------------------------------------------
+ *     ----------------------------------------------------------
  * 
- *     This program is free software: you can redistribute it and/or
- *     modify it under the terms of the GNU General Public License as
- *     published by the Free Software Foundation, either version 3 of
- *     the License, or (at your option) any later version.
+ *     This program is free software: you can redistribute it
+ *     and/or modify it under the terms of the GNU General
+ *     Public License as published by the Free Software
+ *     Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
  * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
+ *     This program is distributed in the hope that it will
+ *     be useful, but WITHOUT ANY WARRANTY; without even the
+ *     implied warranty of MERCHANTABILITY or FITNESS FOR A
+ *     PARTICULAR PURPOSE.
+ *     See the GNU General Public License for more details.
  * 
  *     You should have received a copy of the
  *     GNU General Public License
@@ -83,6 +85,11 @@ const
 const
   _dir_exists =
     _libcrash_module._dir_exists;
+/* global
+     _echo2 */
+const
+  _echo2 =
+    _libcrash_module._echo2;
 /* global
      _file_exists */
 const
@@ -157,15 +164,6 @@ const
 const
   _evm_chains_info =
     _evm_chains_info_module._evm_chains_info;
-const
-  _libevm_contract_deployments_dir_module =
-    await import(
-      "./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_module =
     await import(
@@ -200,6 +198,25 @@ const
 const
   _user_deployments_check =
     _libevm_contract_deployment_module._user_deployments_check;
+/* global
+     _user_defined_check */
+const
+  _user_defined_check =
+    _libevm_contract_deployment_module._user_defined_check;
+/* global
+     _version_check */
+const
+  _version_check =
+    _libevm_contract_deployment_module._version_check;
+const
+  _libevm_contract_deployments_dir_module =
+    await import(
+      "./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 import(
@@ -209,53 +226,134 @@ const
 const
   _evm_contract_deployment_networks =
     _libevm_contract_deployment_networks_module._evm_contract_deployment_networks;
-const
-  _libevm_contract_deployment_versions_module =
-    await import(
-      "./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_abi_get(
     _deployments,
+    _app,
     _contract,
     _network,
     _network_id,
-    _version) {
+    _version,
+    _configuration_format,
+    _user_defined) {
   let
     _abi_path,
+    _abi_retrieve,
     _address,
+    _break,
     _found,
-    _key_name,
     _msg,
-    _net;
+    _net,
+    _non_empty_networks;
   const
     _networks = [
       _network,
       _network_id
     ];
+  _non_empty_networks =
+    false;
   _found =
     false;
+  // _echo2(
+  //   _networks);
   for ( _net of _networks ) {
-    _abi_path =
-      _path_join( [
-        _deployments,
-        _contract,
-        _net,
-        _version,
-        `${_contract}.abi.json` ]);
-    if ( _file_exists(
-           _abi_path) ) {
-      _found =
+    _abi_retrieve =
+      false;
+    _break =
+      false;
+    if ( _net.length < 1 ) {
+      _msg =
+        `Empty value network '${_net}', ` +
+        "skipping.";
+      _msg_info(
+        _msg);
+    }
+    else {
+      _abi_retrieve =
+      true;
+    }
+    if ( _abi_retrieve ) {
+      _non_empty_networks =
         true;
+      _msg =
+        "Getting ABI for network " +
+        `'${_net}'.`;
+      _msg_info(
+        _msg);
+      const
+        _version_check_args = [
+          _version,
+          _app,            // app
+          _contract,
+          "",            // address
+          _net,
+          _user_defined,
+          _deployments,
+          "",            // config file
+          _configuration_format
+        ];
+      try {
+        _version =
+          await _version_check.apply(
+            null,
+            _version_check_args);
+      }
+      catch(
+        _error) {
+        _msg =
+          "Error running '_version_check' " +
+          "with arguments:";
+        _msg_error(
+          _msg,
+          0);
+        _echo2(
+          _version_check_args);
+        _echo2(
+          _error);
+        throw _error;
+      }
+      _msg =
+        `Checked version '${_version}'.`;
+      _msg_info(
+        _msg);
+      _abi_path =
+        _path_join( [
+          _deployments,
+          _contract,
+          _net,
+          _version,
+          `${_contract}.abi.json`
+        ]);
+      _msg =
+        `Checking file '${_abi_path}'.`;
+      _msg_info(
+        _msg);
+      if ( _file_exists(
+             _abi_path) ) {
+        _found =
+          true;
+        _break =
+          true;
+      }
+      else {
+        _msg =
+          `ABI at path '${_abi_path}' ` +
+          `not found.`;
+        _msg_info(
+          _msg);
+      }
+    }
+    if ( _break ) {
+      _msg =
+        "File found, breaking loop.";
+      _msg_info(
+        _msg);
       break;
     }
   }
-  if ( ! _found ) {
+  if ( ! _found &&
+       _non_empty_networks ) {
     _msg =
       `No ABI file for '${_network}' deployment ` +
       `of contract '${_contract}' ` +
@@ -268,10 +366,13 @@ function
   const
     _contract_abi =
       _abi_path;
-  if ( _contract_abi == "" ||
-       typeof(
-         _contract_abi) == "undefined" ||
-       _contract_abi == null ) {
+  const
+    _contract_abi_type =
+      typeof(
+        _contract_abi);
+  if ( _contract_abi === "" ||
+       _contract_abi_type === "undefined" ||
+       _contract_abi === null ) {
     _msg =
       `No '${_contract}' version '${_version}' ` +
       `contract deployment specified for network ` +
@@ -282,6 +383,10 @@ function
       0);
     throw _msg;
   }
+  _msg =
+    `Got ABI: '${_contract_abi}'.`;
+  _msg_info(
+    _msg);
   return _contract_abi;
 }
 
@@ -299,6 +404,7 @@ async function
   let
     _args,
     _contract_abi,
+    _deployments_dir_get,
     _network,
     _network_check_args,
     _target_network,
@@ -312,6 +418,59 @@ async function
   const
     _contract_abi_get_args =
       [];
+  _user_defined =
+    _user_defined_check(
+      _user_defined);
+  const
+    _deployments_dir_type =
+      typeof(
+        _deployments_dir);
+  _deployments_dir_get =
+    false;
+  if ( _deployments_dir_type === "undefined" ) {
+    _msg =
+      "Deployments directory undefined, getting.";
+    _msg_info(
+      _msg);
+    _deployments_dir_get =
+      true;
+  }
+  else if ( _deployments_dir_type === "string" ) {
+    if ( _deployments_dir.length < 1 ) {
+      _msg =
+        "Deployments directory not set, getting.";
+      _msg_info(
+        _msg);
+      _deployments_dir_get =
+        true;
+    }
+  }
+  if ( _deployments_dir_get ) {
+    const
+      _evm_contract_deployments_dir_args = [
+        _target_app,
+        _user_defined
+      ];
+    try {
+      _deployments_dir =
+        await _evm_contract_deployments_dir.apply(
+          null,
+          _evm_contract_deployments_dir_args);
+    }
+    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 == "" ) {
       _msg =
@@ -367,7 +526,8 @@ async function
       `can be 'y' or 'n', current value '${_user_defined}'.`;
     _msg_error(
       _msg,
-      1);
+      0);
+    throw _msg;
   }
   if ( _networks_all == "y" ) {
     _msg =
@@ -385,52 +545,88 @@ async function
     //   `network '${_network}'.`;
     // _msg_info(
     //   _msg);
-    _target_network_id =
-      "";
-    _network_check_args = [
-      _deployments_dir,
-      _target_contract,
-      _network,
-      _target_network_id
-    ];
-    await _network_check.apply(
-      null,
-      _network_check_args);
-    _contract_abi_get_args.push( [
-      _deployments_dir,
-      _target_contract,
-      _network,
-      _target_network_id,
-      _contract_version,
-      _configuration_format
-    ] );
+    if ( _network.length < 1 ) {
+      _msg =
+        "Empty network, skipping.";
+      _msg_info(
+        _msg);
+    }
+    else {
+      _target_network_id =
+        "";
+      _network_check_args = [
+        _deployments_dir,
+        _target_contract,
+        _network,
+        _target_network_id
+      ];
+      await _network_check.apply(
+        null,
+        _network_check_args);
+      _contract_abi_get_args.push( [
+        _deployments_dir,
+        _target_app,
+        _target_contract,
+        _network,
+        _target_network_id,
+        _contract_version,
+        _configuration_format,
+        _user_defined
+      ] );
+    }
   }
-  for ( _network of  _network_ids ) {
-    _target_network =
-      "";
-    _network_check_args = [
-      _deployments_dir,
-      _target_contract,
-      _target_network,
-      _network
-    ];
-    await _network_check.apply(
-      null,
-      _network_check_args);
-    _contract_abi_get_args.push( [
-      _deployments_dir,
-      _target_contract,
-      _target_network,
-      _target_network_id,
-      _contract_version,
-      _configuration_format
-    ] );
+  for ( _network of _network_ids ) {
+    if ( _network.length < 1 ) {
+      _msg =
+        "Empty network, skipping.";
+      _msg_info(
+        _msg);
+    }
+    else {
+      _target_network =
+        "";
+      _network_check_args = [
+        _deployments_dir,
+        _target_contract,
+        _target_network,
+        _network
+      ];
+      await _network_check.apply(
+        null,
+        _network_check_args);
+      _contract_abi_get_args.push( [
+        _deployments_dir,
+        _target_app,
+        _target_contract,
+        _target_network,
+        _network,
+        _contract_version,
+        _configuration_format,
+        _user_defined
+      ] );
+    }
   }
   for ( _args of _contract_abi_get_args ) {
-    _contract_abi =
-      _contract_abi_get.apply(
-        null,
+    try {
+      _contract_abi =
+        await _contract_abi_get.apply(
+          null,
+          _args);
+    }
+    catch(
+      _error) {
+      _msg =
+        "Error running '_contract_abi_get' " +
+        "with parameters:";
+      _msg_error(
+        _msg,
+        0);
+      _echo2(
         _args);
+      _echo2(
+        _error);
+      throw _error;
+    }
     _contracts_abis.push(
       _contract_abi);
   }

package/libevm-contract-deployment-address

@@ -167,6 +167,16 @@ const
   _libevm_contract_deployment_module =
     await import(
       "./libevm-contract-deployment");
+/* global
+     _config_file_path_check */
+const
+  _config_file_path_check =
+    _libevm_contract_deployment_module._config_file_path_check;
+/* global
+     _configuration_format_check */
+const
+  _configuration_format_check =
+    _libevm_contract_deployment_module._configuration_format_check;
 /* global
      _contract_version_auto_detect */
 const
@@ -241,20 +251,9 @@ async function
     _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";
-  }
+  _configuration_format =
+    _configuration_format_check(
+      _configuration_format);
   if ( _configuration_format == "bash" ) {
     _config_file_ext =
       "sh";
@@ -431,6 +430,16 @@ async function
     _target_network_id,
     _user_deployments_dir,
     _system_deployments_dir;
+  _configuration_format =
+    _configuration_format_check(
+      _configuration_format);
+  const
+    _global =
+      _global_get();
+  const
+    _quiet =
+      _global[
+        "quiet"];
   const
     _libevm_contract_deployments_dir_module =
       await import(
@@ -665,8 +674,10 @@ async function
         `with parameters:`;
       _msg_info(
         _msg);
-      _echo2(
-        _args);
+      if ( _quiet == "n" ) {
+        _echo2(
+          _args);
+      }
       _contract_address =
         await _contract_address_get.apply(
           null,