evm-contracts-tools 0.0.64 → 0.0.67

package/libevm-contract-call

@@ -221,25 +221,38 @@ const
 const
   _target_contract_check =
     _libevm_contract_deployment_module._target_contract_check;
+/* global
+     _target_networks_auto_detect */
+const
+  _target_networks_auto_detect =
+    _libevm_contract_deployment_module._target_networks_auto_detect;
 const
-  _evm_contracts_tools_module =
+  _address_check_module =
     await import(
-      "./evm-contracts-tools");
+      "./lib/address-check");
 /* global
      _address_check */
 const
   _address_check =
-    _evm_contracts_tools_module._address_check;
-/* global
-     _contract_call_static */
+    _address_check_module._address_check;
 const
-  _contract_call_static =
-    _evm_contracts_tools_module._contract_call_static;
+  _evm_contract_call_dynamic_module =
+    await import(
+      "./lib/evm-contract-call-dynamic");
 /* global
      _contract_run */
 const
   _contract_run =
-    _evm_contracts_tools_module._contract_run;
+    _evm_contract_call_dynamic_module._contract_run;
+const
+  _evm_contract_call_static_module =
+    await import(
+      "./lib/evm-contract-call-static");
+/* global
+     _contract_call_static */
+const
+  _contract_call_static =
+    _evm_contract_call_static_module._contract_call_static;
 const
   _evm_contract_deployment_address_module =
     await import(
@@ -295,6 +308,113 @@ const
   _data_get =
     _ethereum_data_module._data_get;
 
+function
+  _artifact_type_check(
+    _artifact_type) {
+  let
+    _flag_empty,
+    _flag_wrong,
+    _msg_empty,
+    _msg_wrong;
+  _flag_empty =
+    false;
+  _flag_wrong =
+    false;
+  const
+    _artifact_type_type =
+      typeof(
+        _artifact_type);
+  if ( _artifact_type_type === "undefined" ) {
+    _msg_empty =
+      "Artifact type undefined.";
+    _flag_empty =
+      true;
+  }
+  else if ( _artifact_type_type === "string" ) {
+    if ( _artifact_type_type.length < 1 ) {
+    _msg_empty =
+      "Artifact type not set.";
+    _flag_empty =
+      true;
+    }
+    else {
+      if ( _artifact_type !== "abi" &&
+           _artifact_type !== "bytecode" &&
+           _artifact_type !== "compiler_output" ) {
+        _msg_wrong =
+          "Artifact type can be 'abi', " +
+          "'bytecode' or 'compiler_output'.";
+        _flag_wrong =
+          true;
+      }
+    }
+  }
+  else {
+    _msg_wrong =
+      "Artifact type must be of type string.";
+    _flag_wrong =
+      true;
+  }
+  if ( _flag_empty ) {
+    _msg_error(
+      _msg_empty,
+      0);
+    throw _msg_empty;
+  }
+  if ( _flag_wrong ) {
+    _msg_error(
+      _msg_wrong,
+      0);
+    throw _msg_wrong;
+  }
+  return _artifact_type;
+}
+
+function
+  _artifact_local_auto_detect(
+    _artifact_type) {
+  let
+    _msg;
+  try {
+    _artifact_type =
+      _artifact_type_check(
+        _artifact_type);
+  }
+  catch(
+    _error) {
+    _msg =
+      "Error checking artifact type.";
+    _msg_error(
+      _msg,
+      0);
+    _echo2(
+      _error);
+    throw _error;
+  }
+  const
+    _artifact =
+      _default_artifact_path_get(
+        _artifact_type);
+  if ( _artifact_type == "abi" ) {
+    _override_set(
+      "contract",
+      "abi",
+      _artifact);
+  }
+  else if ( _artifact_type == "bytecode" ) {
+    _override_set(
+      "contract",
+      "bytecode",
+      _artifact);
+  }
+  else if ( _artifact_type == "compiler_output" ) {
+    _override_set(
+      "contract",
+      "compiler_output",
+      _artifact);
+  }
+}
+
 function
   _target_networks_get(
     _target_networks) {
@@ -429,33 +549,6 @@ function
            _target_network ];
 }
 
-function
-  _target_networks_auto_detect() {
-  // TODO:
-  //   _evm_wallet_module._balance_discovery
-  let
-    _target_network,
-    _target_networks;
-  _target_networks =
-    _get(
-      "target",
-      "networks");
-  [ _target_networks,
-    /* eslint-disable-next-line
-         prefer-const */  
-    _target_network ] =
-    _target_networks_auto_detect(
-      _target_networks);
-  _set(
-    "target",
-    "networks",
-    _target_networks);
-  _override_set(
-    "target",
-    "network",
-    _target_network);
-}
-
 function
   _contract_artifacts_retrieve() {
   true;
@@ -781,113 +874,6 @@ async function
   return _out;
 }
 
-function
-  _artifact_type_check(
-    _artifact_type) {
-  let
-    _flag_empty,
-    _flag_wrong,
-    _msg_empty,
-    _msg_wrong;
-  _flag_empty =
-    false;
-  _flag_wrong =
-    false;
-  const
-    _artifact_type_type =
-      typeof(
-        _artifact_type);
-  if ( _artifact_type_type === "undefined" ) {
-    _msg_empty =
-      "Artifact type undefined.";
-    _flag_empty =
-      true;
-  }
-  else if ( _artifact_type_type === "string" ) {
-    if ( _artifact_type_type.length < 1 ) {
-    _msg_empty =
-      "Artifact type not set.";
-    _flag_empty =
-      true;
-    }
-    else {
-      if ( _artifact_type !== "abi" &&
-           _artifact_type !== "bytecode" &&
-           _artifact_type !== "compiler_output" ) {
-        _msg_wrong =
-          "Artifact type can be 'abi', " +
-          "'bytecode' or 'compiler_output'.";
-        _flag_wrong =
-          true;
-      }
-    }
-  }
-  else {
-    _msg_wrong =
-      "Artifact type must be of type string.";
-    _flag_wrong =
-      true;
-  }
-  if ( _flag_empty ) {
-    _msg_error(
-      _msg_empty,
-      0);
-    throw _msg_empty;
-  }
-  if ( _flag_wrong ) {
-    _msg_error(
-      _msg_wrong,
-      0);
-    throw _msg_wrong;
-  }
-  return _artifact_type;
-}
-
-function
-  _artifact_local_auto_detect(
-    _artifact_type) {
-  let
-    _msg;
-  try {
-    _artifact_type =
-      _artifact_type_check(
-        _artifact_type);
-  }
-  catch(
-    _error) {
-    _msg =
-      "Error checking artifact type.";
-    _msg_error(
-      _msg,
-      0);
-    _echo2(
-      _error);
-    throw _error;
-  }
-  const
-    _artifact =
-      _default_artifact_path_get(
-        _artifact_type);
-  if ( _artifact_type == "abi" ) {
-    _override_set(
-      "contract",
-      "abi",
-      _artifact);
-  }
-  else if ( _artifact_type == "bytecode" ) {
-    _override_set(
-      "contract",
-      "bytecode",
-      _artifact);
-  }
-  else if ( _artifact_type == "compiler_output" ) {
-    _override_set(
-      "contract",
-      "compiler_output",
-      _artifact);
-  }
-}
-
 async function
   _target_app_get(
     _contract_address) {
@@ -982,7 +968,7 @@ async function
               _contract] =
               1;
           }
-	}
+        }
       }
     }
   }
@@ -1235,26 +1221,34 @@ export {
   _address_check,
   _app_lookup_contract,
   _artifact_local_auto_detect,
+  _artifact_type_check,
   _cache_dir_auto_detect,
   _call_auth_auto_detect,
   _call_auth_get,
+  _call_type_check,
   _contract_abi_auto_detect,
   _contract_abi_check,
   _contract_address_auto_detect,
   _contract_address_check,
+  _contract_artifacts_retrieve,
   _contract_bytecode_auto_detect,
   _contract_bytecode_check,
   _contract_compiler_output_auto_detect,
   _contract_compiler_output_check,
+  _contract_lookup_address,
+  _contracts_init,
   _data_dir_auto_detect,
   _default_artifact_path_get,
   _deployments_dir_auto_detect,
   _evm_contract_call,
   _help_display_check,
+  _methods_init,
   _target_app_auto_detect,
+  _target_app_get,
   _target_contract_auto_detect,
   _target_networks_auto_detect,
-  _target_networks_get
+  _target_networks_get,
+  _target_networks_check
 };
 
 // Common Javascript exports
@@ -1266,6 +1260,10 @@ export {
 //     _app_lookup_contract,
 //   _artifact_local_auto_detect:
 //     _artifact_local_auto_detect,
+//   _artifact_type_check:
+//     _artifact_type_check,
+//   _cache_dir_auto_detect:
+//     _cache_dir_auto_detect,
 //   _cache_dir_auto_detect:
 //     _cache_dir_auto_detect,
 //   _call_auth_auto_detect:
@@ -1280,6 +1278,8 @@ export {
 //     _contract_address_auto_detect,
 //   _contract_address_check:
 //     _contract_address_check,
+//   _contract_artifacts_retrieve:
+//     _contract_artifacts_retrieve,
 //   _contract_bytecode_auto_detect:
 //     _contract_bytecode_auto_detect,
 //   _contract_bytecode_check:
@@ -1288,6 +1288,10 @@ export {
 //     _contract_compiler_output_auto_detect,
 //   _contract_compiler_output_check:
 //     _contract_compiler_output_check,
+//   _contract_lookup_address:
+//     _contract_lookup_address,
+//   _contracts_init:
+//     _contracts_init,
 //   _data_dir_auto_detect:
 //     _data_dir_auto_detect,
 //   _default_artifact_path_get:
@@ -1296,12 +1300,20 @@ export {
 //     _deployments_dir_auto_detect,
 //   _evm_contract_call:
 //     _evm_contract_call,
+//   _help_display_check:
+//     _help_display_check,
+//   _methods_init:
+//     _methods_init,
 //   _target_app_auto_detect:
 //     _target_app_auto_detect,
-//   _target_networks_auto_detect:
-//     _target_networks_auto_detect,
+//   _target_app_get:
+//     _target_app_get,
 //   _target_contract_auto_detect:
 //     _target_contract_auto_detect,
+//   _target_networks_auto_detect:
+//     _target_networks_auto_detect,
+//   _target_networks_check:
+//     _target_networks_check,
 //   _target_networks_get:
 //     _target_networks_get
 // };

package/libevm-contract-deployment

@@ -182,15 +182,6 @@ const
 const
   _set =
     _libcrash_module._set;
-const
-  _evm_chains_info_module =
-    await _require(
-      "evm-chains-info");
-/* global
-     _evm_chains_info */
-const
-  _evm_chains_info =
-    _evm_chains_info_module._evm_chains_info;
 /* global
      _evm_contract_deployments_dir */
 /* global
@@ -198,14 +189,23 @@ const
 /* global
      _evm_contract_deployment_versions */
 const
-  _evm_contracts_tools_module =
+  _address_check_module =
     await import(
-      "./evm-contracts-tools");
+      "./lib/address-check");
 /* global
      _address_check */
 const
   _address_check =
-    _evm_contracts_tools_module._address_check;
+    _address_check_module._address_check;
+const
+  _evm_chains_info_module =
+    await _require(
+      "evm-chains-info");
+/* global
+     _evm_chains_info */
+const
+  _evm_chains_info =
+    _evm_chains_info_module._evm_chains_info;
 
 function
   _configuration_format_check(
@@ -1931,6 +1931,10 @@ function
   return _app;
 }
 
+const
+  _target_app_check =
+    _app_check;
+
 async function
   _contract_version_auto_detect() {
   let
@@ -3100,6 +3104,37 @@ async function
   return _version;
 }
 
+const
+  _contract_version_check =
+    _version_check;
+
+function
+  _target_networks_auto_detect() {
+  // TODO:
+  //   _evm_wallet_module._balance_discovery
+  let
+    _target_network,
+    _target_networks;
+  _target_networks =
+    _get(
+      "target",
+      "networks");
+  [ _target_networks,
+    /* eslint-disable-next-line
+         prefer-const */  
+    _target_network ] =
+    _target_networks_auto_detect(
+      _target_networks);
+  _set(
+    "target",
+    "networks",
+    _target_networks);
+  _override_set(
+    "target",
+    "network",
+    _target_network);
+}
+
 async function
   _target_networks_check(
     _target_networks,
@@ -4596,6 +4631,7 @@ export {
   _configuration_format_check,
   _configuration_format_get,
   _contract_abi_auto_detect,
+  _contract_abi_check,
   _contract_address_auto_detect,
   _contract_address_check,
   _contract_bytecode_auto_detect,
@@ -4603,14 +4639,18 @@ export {
   _contract_compiler_output_auto_detect,
   _contract_compiler_output_check,
   _contract_version_auto_detect,
+  _contract_version_check,
   _default_artifact_path_get,
   _deployments_dir_auto_detect,
   _deployments_dir_check,
   _network_check,
   _networks_all_auto_detect,
   _target_app_auto_detect,
+  _target_app_check,
   _target_contract_auto_detect,
   _target_contract_check,
+  _target_networks_auto_detect,
+  _target_networks_check,
   _user_deployments_check,
   _user_defined_check,
   _user_level_check,
@@ -4646,6 +4686,8 @@ export {
 //     _contract_compiler_output_check,
 //   _contract_version_auto_detect:
 //     _contract_version_auto_detect,
+//   _contract_version_check:
+//     _contract_version_check,
 //   _default_artifact_path_get:
 //     _default_artifact_path_get,
 //   _deployments_dir_check:
@@ -4658,10 +4700,16 @@ export {
 //     _networks_all_auto_detect,
 //   _target_app_auto_detect:
 //     _target_app_auto_detect,
+//   _target_app_check:
+//     _target_app_check,
 //   _target_contract_auto_detect:
 //     _target_contract_auto_detect,
 //   _target_contract_check:
 //     _target_contract_check,
+//   _target_networks_auto_detect:
+//     _target_networks_auto_detect,
+//   _target_networks_check:
+//     _target_networks_check,
 //   _user_deployments_check:
 //     _user_deployments_check,
 //   _user_defined_check:

package/libevm-contract-deployment-abi

@@ -634,6 +634,7 @@ async function
 }
 
 export {
+  _contract_abi_get,
   _contract_version_auto_detect,
   _deployments_dir_auto_detect,
   _evm_contract_deployment_abi,
@@ -642,6 +643,8 @@ export {
 };
 
 // module.exports = {
+//   _contract_abi_get:
+//     _contract_abi_get,
 //   _contract_version_auto_detect:
 //     _contract_version_auto_detect,
 //   _deployments_dir_auto_detect:

package/libevm-contract-deployment-address

@@ -714,6 +714,7 @@ async function
 }
 
 export {
+  _contract_address_get,
   _contract_version_auto_detect,
   _deployments_dir_auto_detect,
   _evm_contract_deployment_address,

package/libevm-contract-deployment-bytecode

@@ -633,6 +633,7 @@ async function
 }
 
 export {
+  _contract_bytecode_get,
   _contract_version_auto_detect,
   _deployments_dir_auto_detect,
   _evm_contract_deployment_bytecode,

package/libevm-contract-deployment-compiler-output

@@ -686,6 +686,7 @@ async function
 }
 
 export {
+  _contract_compiler_output_get,
   _contract_version_auto_detect,
   _deployments_dir_auto_detect,
   _evm_contract_deployment_compiler_output,
@@ -694,6 +695,8 @@ export {
 };
 
 // module.exports = {
+//   _contract_compiler_output_get:
+//     _contract_compiler_output_get,
 //   _contract_version_auto_detect:
 //     _contract_version_auto_detect,
 //   _deployments_dir_auto_detect:

package/libevm-contract-deployment-networks

@@ -123,67 +123,6 @@ const
   _evm_chains_info =
     _evm_chains_info_module._evm_chains_info;
 
-function
-  _contract_address_get(
-    _deployments,
-    _contract,
-    _network,
-    _network_id,
-    _version) {
-  let
-    _config_path,
-    _address,
-    _found,
-    _msg,
-    _net;
-  const
-    _networks = [
-      _network,
-      _network_id
-    ];
-  _found =
-    false;
-  for ( _net of _networks ) {
-    _config_path =
-      `${_deployments}/${_contract}/${_net}/config.sh`;
-    if ( _file_exists(
-           _config_path) ) {
-      _found =
-        true;
-      break;
-    }
-  }
-  if ( ! _found ) {
-    _msg =
-      `No network '${_network}' deployment ` +
-      `configuration for '${_contract}' ` +
-      `found at path '${_deployments}'.`;
-    _msg_error(
-      _msg,
-      1);
-  }
-  const
-    _config =
-      _json_read(
-        _config);
-  const
-    _contract_address =
-      _config[
-        "contract-address"][
-          _version];
-  if ( _contract_address == "" ||
-       _contract_address == null ) {
-    _msg =
-      `No '${_contract}' version '${_version}' ` +
-      `contract deployment specified for network ` +
-      `'${_network}' for directory at path `+
-      `'${_deployments}'.`;
-    _msg_error(
-      _msg,
-      1);
-  }
-}
-
 async function
   _networks_find(
     _deployment_dir) {
@@ -251,7 +190,8 @@ async function
 
 export {
   _evm_contract_deployment_networks,
-  _network_check
+  _network_check,
+  _networks_find
 };
 
 // module.exports = {
@@ -259,4 +199,6 @@ export {
 //     _evm_contract_deployment_networks,
 //   _network_check:
 //     _network_check
+//   _networks_find:
+//     _networks_find
 // };