evm-contracts-tools 0.0.54 → 0.0.57

package/libevm-contract-call

@@ -65,6 +65,11 @@ const
   _libcrash_module =
     await import(
       "libcrash-js");
+/* global
+     _dir_exists */
+const
+  _dir_exists =
+    _libcrash_module._dir_exists;
 /* global
      _dirname */
 const
@@ -95,6 +100,11 @@ const
 const
   _lib_get =
     _libcrash_module._lib_get;
+/* global
+     _ls */
+const
+  _ls =
+    _libcrash_module._ls;
 /* global
      _msg_info */
 const
@@ -139,6 +149,15 @@ const
 const
   _address_check =
     _evm_contracts_tools_module._address_check;
+const
+  _evm_contract_deployment_address_module =
+    await import(
+      "./libevm-contract-deployment-address");
+/* global
+     _evm_contract_deployment_address */
+const
+  _evm_contract_deployment_address =
+    _evm_contract_deployment_address_module._evm_contract_deployment_address;
 const
   _ethereum_data_module =
     await _require(
@@ -513,17 +532,393 @@ function
   }
 }
 
+async function
+  _target_app_get(
+    _contract_address) {
+  let
+    _target_app;
+  _target_app =
+    "";
+  const
+    _contract_address_type =
+      typeof(
+        _contract_address);
+  if ( _contract_address_type != "undefined" &&
+       _contract_address != "" ) {
+    const
+      _address_valid =
+        _address_check(
+          _contract_address);
+    if ( ! _address_valid ) {
+      _target_app =
+        await _app_lookup_contract(
+          _contract_address);
+    }
+  }
+  return _target_app;
+}
+
+async function
+  _contract_lookup_address(
+    _target_app,
+    _address,
+    _target_network) {
+  let
+    _contract,
+    _contract_address,
+    _contract_dir,
+    _contract_networks,
+    _evm_contract_deployment_address_args,
+    _exception,
+    _msg,
+    _network;
+  const
+    _target_contracts =
+      {};
+  const
+    _lib =
+      await _lib_get();
+  const
+    _deployments_dir =
+      _path_join([
+        _lib,
+        _target_app,
+        "deployments"
+      ]);
+  const
+    _contracts =
+      await _ls(
+        _deployments_dir);
+  for ( _contract of _contracts ) {
+    _contract_dir =
+      _path_join([
+        _deployments_dir,
+        _contract
+      ]);
+    _contract_networks =
+      await _ls(
+        _contract_dir);
+    for ( _network in _contract_networks ) {
+      _evm_contract_deployment_address_args = [
+        [ _target_network ],       // target networks
+        [ _target_network ],       // target chain ids
+        "n",                       // all networks
+        _target_app,
+        _contract,
+        "",                        // contract version
+        "n",                       // user-level
+        "",                        // configuration format
+        _deployments_dir
+      ];
+      _contract_address =
+        await _evm_contract_deployment_address.apply(
+          null,
+          _evm_contract_deployment_address_args);
+      if ( _address == _contract_address ) {
+        if ( _target_network == "" ) {
+          _target_contracts[
+            _contract] =
+            1;
+        }
+        else {
+          if ( _network == _target_network ) {
+            _target_contracts[
+              _contract] =
+              1;
+          }
+	}
+      }
+    }
+  }
+  const
+    _target_contracts_set =
+      Object.keys(
+        _target_contracts);
+  const
+    _target_contracts_amount =
+      _target_contracts_set.length; 
+  if ( _target_contracts_amount < 1 ) {
+    _msg =
+      "No contract found for " +
+      `address '${_address}' ` +
+      `on network '${_network}' in '${_lib}'.`;
+    _msg_error(
+      _msg,
+      0);
+    _exception = {
+      "msg":
+        _msg
+    };
+    throw _exception;
+  }
+  if ( 1 < _target_contracts_amount ) {
+    _msg =
+      "Found more than one contract for " +
+      `contract '${_contract}' ` +
+      `in '${_lib}':\n`;
+    for ( _contract of _target_contracts_set ) {
+      _msg =
+        _msg + `${_contract}\n`;
+    }
+    _msg_error(
+      _msg,
+      0);
+    _exception = {
+      "msg":
+        _msg
+    };
+    throw _exception;
+  }
+  else {
+    return _target_contracts_set;
+  }
+}
+
+async function
+  _app_lookup_contract(
+    _contract_name) {
+  let
+    _app,
+    _contract_dir,
+    _msg;
+  const
+    _lib =
+      await _lib_get();
+  const
+    _target_apps =
+      {};
+  const
+    _apps =
+      await _ls(
+      _lib);
+  for ( _app of _apps ) {
+    _contract_dir =
+      _path_join([
+        _lib,
+        _app,
+        "deployments",
+        _contract_name
+      ]);
+    if ( _dir_exists(
+           _contract_dir) ) {
+      _target_apps[
+        _app] =
+        1;
+    }
+  }
+  const
+    _target_apps_set =
+      Object.keys(
+        _target_apps);
+  const
+    _target_apps_amount =
+      _target_apps_set.length;
+  if ( _target_apps_amount < 1 ) {
+    _msg =
+      "No apps found for " +
+      `contract '${_contract_name}' ` +
+      `in '${_lib}'.`;
+    _msg_error(
+      _msg,
+      0);
+    const
+      _exception = {
+        "msg":
+          _msg
+      };
+    throw _exception;
+  }
+  else if ( 1 < _target_apps_amount ) {
+    _msg =
+      "Found more than one app for " +
+      `contract '${_contract_name}' ` +
+      `in '${_lib}': '${_target_apps_set}'.`;
+    _msg_error(
+      _msg,
+      0);
+    const
+      _exception = {
+        "msg":
+          _msg
+      };
+    throw _exception;
+  }
+  return _target_apps_set[
+    0];
+}
+
+function
+  _target_app_auto_detect() {
+  let
+    _target_app;
+  _target_app =
+    "";
+  const
+    _contract_address =
+      _get(
+        "contract",
+        "address");
+  const
+    _contract_address_type =
+      typeof(
+        _contract_address);
+  if ( _contract_address_type != "undefined" &&
+       _contract_address != "" ) {
+    _target_app =
+      _target_app_get(
+        _contract_address);
+  }
+  _override_set(
+    "target",
+    "app",
+    _target_app);
+}
+
+async function
+  _contract_address_auto_detect() {
+  let
+    _contract_address,
+    _evm_contract_deployment_address_args,
+    _msg;
+  _contract_address =
+    _get(
+      "contract",
+      "address");
+  const
+    _target_app =
+      _get(
+        "target",
+        "app");
+  const
+    _target_network =
+      _get(
+        "target",
+        "network");
+  const
+    _target_contract =
+      _get(
+        "target",
+        "contract");
+  const
+    _deployments_dir =
+      _get(
+        "deployments",
+        "dir");
+  if ( _contract_address != "" ) {
+    const
+      _address_valid =
+        await _address_check(
+          _contract_address);
+    if ( ! _address_valid ) {
+      if ( _target_app != "" &&
+           _target_network != "" &&
+           _target_contract != "" ) {
+        _msg =
+          "Looking for address " +
+          "corresponding to contract " +
+          `'${_target_contract}' for the ` +
+          `'${_target_app}' ` +
+          "libEVM application on network " +
+          `'${_target_network}'.`;
+        _msg_info(
+          _msg);
+        _evm_contract_deployment_address_args = [
+          [ _target_network ],       // target networks
+          [ _target_network ],       // target chain ids
+          "n",                       // all networks
+          _target_app,
+          _target_contract,
+          "",                        // contract version
+          "n",                       // user-level
+          "",                        // configuration format
+          _deployments_dir
+        ];
+        _contract_address =
+          await _evm_contract_deployment_address.apply(
+            null,
+            _evm_contract_deployment_address_args);
+      }
+      else {
+        _msg =
+          "One between the " +
+          `application '${_target_app}', ` +
+          `the network '${_target_network}' ` +
+          `or the contract '${_target_contract}' ` +
+          `has not been specified.`;
+        _msg_info(
+          _msg);
+      }
+    }
+  }
+  _set(
+    "contract",
+    "address",
+    _contract_address);
+}
+
+function
+  _data_dir_auto_detect() {
+  const
+    _homedir =
+      _homedir_get();
+  const
+    _app_name =
+      _get(
+        "app",
+        "name");
+  const
+    _data_dir =
+      _path_join([
+        _homedir,
+        ".local",
+        "share",
+        _app_name
+      ]);
+  _override_set(
+    "data",
+    "dir",
+    _data_dir);
+}
+
+function
+  _cache_dir_auto_detect() {
+  const
+    _homedir =
+      _homedir_get();
+  const
+    _app_name =
+      _get(
+        "app",
+        "name");
+  const
+    _cache_dir =
+      _path_join([
+        _homedir,
+        ".cache",
+        _app_name
+      ]);
+  _override_set(
+    "cache",
+    "dir",
+    _cache_dir);
+}
+
 // ES6 module exports
 
 export {
   _address_check,
+  _app_lookup_contract,
   _artifact_local_auto_detect,
+  _cache_dir_auto_detect,
   _call_auth_auto_detect,
   _call_auth_get,
   _contract_abi_auto_detect,
   _contract_abi_get,
+  _contract_address_auto_detect,
+  _data_dir_auto_detect,
   _default_artifact_path_get,
   _evm_contract_call,
+  _target_app_auto_detect,
   _target_networks_auto_detect,
   _target_networks_get
 };
@@ -533,8 +928,12 @@ export {
 // module.exports = {
 //   _address_check:
 //     _address_check,
+//   _app_lookup_contract:
+//     _app_lookup_contract,
 //   _artifact_local_auto_detect:
 //     _artifact_local_auto_detect,
+//   _cache_dir_auto_detect:
+//     _cache_dir_auto_detect,
 //   _call_auth_auto_detect:
 //     _call_auth_auto_detect,
 //   _call_auth_get:
@@ -543,10 +942,16 @@ export {
 //     _contract_abi_auto_detect,
 //   _contract_abi_get:
 //     _contract_abi_get,
+//   _contract_address_auto_detect:
+//     _contract_address_auto_detect,
+//   _data_dir_auto_detect:
+//     _data_dir_auto_detect,
 //   _default_artifact_path_get:
 //     _default_artifact_path_get,
 //   _evm_contract_call:
 //     _evm_contract_call,
+//   _target_app_auto_detect:
+//     _target_app_auto_detect,
 //   _target_networks_auto_detect:
 //     _target_networks_auto_detect,
 //   _target_networks_get:

package/libevm-contract-deployment

@@ -156,7 +156,7 @@ const
     _evm_chains_info_module._evm_chains_info;
 const
   _libevm_contract_deployments_dir_module =
-    await _require(
+    await import(
       "./libevm-contract-deployments-dir");
 /* global
      _evm_contract_deployments_dir */
@@ -165,7 +165,7 @@ const
     _libevm_contract_deployments_dir_module._evm_contract_deployments_dir;
 const
   _libevm_contract_deployment_networks_module =
-    await _require(
+    await import(
       "./libevm-contract-deployment-networks");
 /* global
      _evm_contract_deployment_networks */
@@ -174,7 +174,7 @@ const
     _libevm_contract_deployment_networks_module._evm_contract_deployment_networks;
 const
   _libevm_contract_deployment_versions_module =
-    await _require(
+    await import(
       "./libevm-contract-deployment-versions");
 /* global
      _evm_contract_deployment_versions */

package/libevm-contract-deployment-address

@@ -61,8 +61,8 @@
 
 const
   _libcrash_module =
-    require(
-      "crash-js");
+    await import(
+      "libcrash-js");
 /* global
      _basename */
 const
@@ -143,9 +143,14 @@ const
 const
   _pwd =
     _libcrash_module._pwd;
+/* global
+     _require */
+const
+  _require =
+    _libcrash_module._require;
 const
   _evm_chains_info_module =
-    require(
+    await _require(
       "evm-chains-info");
 /* global
      _evm_chains_info */
@@ -154,7 +159,7 @@ const
     _evm_chains_info_module._evm_chains_info;
 const
   _libevm_contract_deployments_dir_module =
-    require(
+    await import(
       "./libevm-contract-deployments-dir");
 /* global
      _evm_contract_deployments_dir */
@@ -163,7 +168,7 @@ const
     _libevm_contract_deployments_dir_module._evm_contract_deployments_dir;
 const
   _libevm_contract_deployment_module =
-    require(
+    await import(
       "./libevm-contract-deployment");
 /* global
      _contract_version_auto_detect */
@@ -197,7 +202,7 @@ 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 */
@@ -206,7 +211,7 @@ const
     _libevm_contract_deployment_networks_module._evm_contract_deployment_networks;
 const
   _libevm_contract_deployment_versions_module =
-    require(
+    await import(
       "./libevm-contract-deployment-versions");
 /* global
      _evm_contract_deployment_versions */
@@ -472,15 +477,23 @@ async function
   return _contracts_addresses;
 }
 
-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/package.json

@@ -1,6 +1,6 @@
 { "name": "evm-contracts-tools",
   "version":
-    "0.0.54",
+    "0.0.57",
   "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.67",
+      "^0.0.69",
     "brace-expansion":
       "^5.0.9",
     "eslint":
@@ -120,17 +120,17 @@
   },
   "dependencies": {
     "libcrash-js":
-      "npm:crash-js@^10000000000001.1000000000000001.1000000000000001",
+      "npm:crash-js@^100000000000001.1000000000000001.1000000000000001",
     "ethers":
       "^6.13.2",
     "evm-chains-info":
       "^0.0.34",
     "evm-transactions-tools":
-      "^0.0.111111",
+      "^0.0.1111111111",
     "evm-wallet":
-      "npm:evm-wallet.js@^0.0.86",
+      "npm:evm-wallet.js@^0.0.93",
     "libevm":
-      "^0.0.37",
+      "^0.0.39",
     "ws":
       "^8.21.0",
     "yargs":
@@ -140,11 +140,11 @@
     "evm-contracts-tools":
       "./evm-contracts-tools",
     "evm-wallet":
-      "npm:evm-wallet.js@^0.0.86",
+      "npm:evm-wallet.js@^0.0.93",
     "evm-wallet.js":
-      "npm:evm-wallet.js@^0.0.86",
+      "npm:evm-wallet.js@^0.0.93",
     "libevm":
-      "^0.0.37"
+      "^0.0.39"
   },
   "type":
     "module",