evm-contracts-tools 0.0.52 → 0.0.54

package/Makefile

@@ -37,6 +37,12 @@ MAN_DIR?=$(DESTDIR)$(PREFIX)/share/man
 NODE_DIR=$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)
 BUILD_NPM_DIR=build
 
+_MAKE_LINK=\
+  ln \
+    -sv
+_MAKE_EXE=\
+  chmod \
+    755
 _INSTALL_FILE=\
   install \
     -vDm644
@@ -52,27 +58,29 @@ DOC_FILES=\
       *.rst) \
   $(wildcard \
       *.md)
+_PROGRAMS=\
+  "evm-contract-call" \
+  "evm-contract-deployment-abi" \
+  "evm-contract-deployment-address" \
+  "evm-contract-deployment-bytecode" \
+  "evm-contract-deployment-compiler-output" \
+  "evm-contract-deployment-networks" \
+  "evm-contract-deployment-versions" \
+  "evm-contract-deployments-dir"
 NPM_FILES=\
   "README.md" \
   "COPYING" \
   "AUTHORS.rst" \
   "Makefile" \
   "dist" \
-  "evm-contract-call" \
+  $(_PROGRAMS) \
   "evm-contract-call.webpack.config.cjs" \
-  "evm-contract-deployment-abi" \
   "evm-contract-deployment-abi.webpack.config.cjs" \
-  "evm-contract-deployment-address" \
   "evm-contract-deployment-address.webpack.config.cjs" \
-  "evm-contract-deployment-bytecode" \
   "evm-contract-deployment-bytecode.webpack.config.cjs" \
-  "evm-contract-deployment-compiler-output" \
   "evm-contract-deployment-compiler-output.webpack.config.cjs" \
-  "evm-contract-deployment-networks" \
   "evm-contract-deployment-networks.webpack.config.cjs" \
-  "evm-contract-deployment-versions" \
   "evm-contract-deployment-versions.webpack.config.cjs" \
-  "evm-contract-deployments-dir" \
   "evm-contract-deployments-dir.webpack.config.cjs" \
   "lib" \
   "libevm-contract-call" \
@@ -115,23 +123,73 @@ install: install-scripts install-doc install-examples install-man
 
 install-scripts:
 
-	$(_INSTALL_DIR) \
-	  "$(LIB_DIR)/nodejs/lib"
-	for _file in $(NPM_FILES); do
-	  $(_INSTALL_FILE) \
-	    "$${_file}" \
-	    "$(LIB_DIR)/nodejs/$${_file}"; \
-	  ln \
-	    -s \
-            "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs/$${_file}" \
-	    "$(LIB_DIR)/$${_file}" || \
+	if [[ "$(_NPM)" == "false" ]]; then \
+	  $(_INSTALL_DIR) \
+	    "$(LIB_DIR)/nodejs"; \
+	  cp \
+	    -r \
+	    $$(printf \
+	         "$${PWD}/%s " \
+	         $$(cat \
+	              "$${PWD}/package.json" | \
+	              jq \
+	                --raw-output \
+	                '.files[]')) \
+	    "$(LIB_DIR)/nodejs"; \
+	  $(_MAKE_EXE) \
+	    "$(LIB_DIR)/nodejs/$(_PROJECT_NPM)"; \
+	  for _program in \
+	    $(_PROGRAMS); do \
+	    if [[ ! -s "$(BIN_DIR)/$${_program}" && \
+	          ! -e "$(BIN_DIR)/$${_program}" ]]; then \
+	      $(_MAKE_LINK) \
+	        "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs/$${_program}" \
+	        "$(BIN_DIR)/$${_program}"; \
+	    fi; \
+	  done; \
+	  rm \
+	    "$(LIB_DIR)/node_modules" || \
 	    true; \
-	    done
-	  # ln \
-		  #   -s \
-		  #   "$(PREFIX)/lib/$(_PROJECT_NPM)/node/lib$(_PROJECT_NPM)" \
-		  #   "$(LIB_DIR)/$(_PROJECT_NPM)-js" || \
-		  # true
+	  if [[ ! -s "$(LIB_DIR)/node_modules" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/node_modules" \
+	      "$(LIB_DIR)/nodejs/node_modules"; \
+	  fi; \
+	  rm \
+	    -rf \
+	    "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT)" \
+	    "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)"; \
+	  if [[ ! -s "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT)" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs" \
+	      "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT)"; \
+	  fi; \
+	  if [[ ! -s "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs" \
+	      "$(DESTDIR)$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)" || \
+	      true; \
+	  fi; \
+	  if [[ ! -s "$(DESTDIR)$(PREFIX)/lib/$(_PROJECT)" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs" \
+	      "$(DESTDIR)$(PREFIX)/lib/$(_PROJECT)" || \
+	      true; \
+	  fi; \
+	  if [[ ! -s "$(DESTDIR)$(PREFIX)/lib/$(_PROJECT_NPM)" ]]; then \
+	    $(_MAKE_LINK) \
+	      "$(PREFIX)/lib/$(_PROJECT_NPM)/nodejs" \
+	      "$(DESTDIR)$(PREFIX)/lib/$(_PROJECT_NPM)" || \
+	      true; \
+	  fi; \
+	elif [[ "$(_NPM)" == "true" ]]; then \
+	  make \
+	    install-npm; \
+	  $(_MAKE_LINK) \
+	    "$(PREFIX)/lib/node_modules/$(_PROJECT_NPM)" \
+	    "$(LIB_DIR)/nodejs" || \
+	  true; \
+	fi;
 
 build-man:
 
@@ -244,4 +302,16 @@ install-man:
 	  "build/man/$(_PROJECT_NPM).1" \
 	  "$(MAN_DIR)/man1/$(_PROJECT_NPM).1"
 
+uninstall-scripts:
+
+	for _program in \
+	  $(_PROGRAMS); do \
+	  rm \
+	    -vrf \
+	    "$(BIN_DIR)/$${_program}"; \
+	done; \
+	rm  \
+	  "$(LIB_DIR") \
+	  "$(NODE_DIR)"
+
 .PHONY: check build-man build-npm build-scripts install install-doc install-man install-npm install-scripts shellcheck

package/evm-contract-call

@@ -83,6 +83,11 @@ const
 const
   _cmdline_check =
     _libcrash._cmdline_check;
+/* global
+     _echo */
+const
+  _echo =
+    _libcrash._echo;
 /* global
      _exit */
 const
@@ -561,7 +566,7 @@ function
       ""
     ];
   for ( _line of _text ) {
-    console.log(
+    _echo(
       _line);
   }
   _exit(
@@ -1009,7 +1014,7 @@ async function
         _results);
   if ( _results_type == "object" ) {
     for ( _result of _results ) {
-      console.log(
+      _echo(
         _result);
     }
   }
@@ -1064,6 +1069,8 @@ else{
   _url_parse();
   _libevm_url_parse();
 }
+_echo(
+  contract_address);
 _main();
 
 export {

package/lib/address-check

@@ -28,13 +28,13 @@
 
 const
   _libcrash =
-    require(
-      "crash-js");
+    await import(
+      "libcrash-js");
 /* global
-     _argv_get */
+     _argv */
 const
-  _argv_get =
-    _libcrash._argv_get;
+  _argv =
+    _libcrash._argv;
 /* global
      _basename */
 const
@@ -45,11 +45,21 @@ const
 const
   _cmdline_check =
     _libcrash._cmdline_check;
+/* global
+     _echo */
+const
+  _echo =
+    _libcrash._echo;
 /* global
      _exit */
 const
   _exit =
     _libcrash._exit;
+/* global
+     _global_get */
+const
+  _global_get =
+    _libcrash._global_get;
 /* global
      _msg_info */
 const
@@ -60,11 +70,21 @@ const
 const
   _msg_error =
     _libcrash._msg_error;
+/* global
+     _override_set */
+const
+  _override_set =
+    _libcrash._override_set;
 /* global
      _require */
 const
   _require =
     _libcrash._require;
+/* global
+     _set */
+const
+  _set =
+    _libcrash._override_set;
 const
   _ethers_module =
     await _require(
@@ -80,17 +100,32 @@ const
 
 function
   _global_variables() {
-  app_name =
-    "address-check";
   /* global
-       target_address:
+       app_name:
          writable */
-  target_address =
-    "";
+  _set(
+    "app",
+    "name",
+    "address-check");
   /* global
-       quiet:
+       app_opts:
          writable */
-  quiet =
+  _set(
+    "app",
+    "opts",
+    []);
+  /* global
+       target_address:
+         writable */
+  _set(
+    "target",
+    "address",
+    "");
+  const
+    _global =
+      _global_get();
+  _global[
+    "quiet"] =
     "";
 }
 
@@ -98,14 +133,11 @@ function
   _config_show() {
   let
     _line;
-  const
-    _argv =
-      _argv_get();
   const
     _program =
       _basename(
         _argv[
-          "$0"]);
+          0]);
   const
     _text = [
       `${_program} configuration:`,
@@ -123,14 +155,11 @@ function
   let
     _display_fun,
     _line;
-  const
-    _argv =
-      _argv_get();
   const
     _program =
       _basename(
         _argv[
-          "$0"]);
+          0]);
   const
     _text = [
       "Checks whether an address is valid.",
@@ -148,7 +177,7 @@ function
       "    -h --help                      This help."
     ];
   for (_line of _text) {
-    _msg_info(
+    _echo(
       _line);
   }
   _exit(
@@ -164,30 +193,41 @@ function
   _cmdline_parse() {
   quiet =
     "y";
-  process.argv.forEach(
+  _argv.forEach(
     function (
       _value,
-      _index,
-      _array) {
+      _index) {
+      const
+        _global =
+          _global_get();
       if ( _index == 2 ) {
-        target_address =
-          _value;
+        _set(
+          "target",
+          "address",
+          _value);
       }
       else if ( _value == "-v" ||
            _value == "--verbose" ) {
-        quiet =
+        _global[
+          "quiet"] =
           "n";
       }
       else if ( _value == "-h" ||
            _value == "--help" ) {
-        quiet =
+        _global[
+          "quiet"] =
           "n";
         _usage(
           0);
       }
     }
   );
-  if ( target_address == "" ) {
+  const
+    _target_address =
+      _get(
+        "target",
+        "address");
+  if ( _target_address == "" ) {
     const
       _msg =
         "No target address specified.";
@@ -237,9 +277,9 @@ async function
   }
 }
 
-if ( _cmdline_check(
+if ( await _cmdline_check(
        "address-check") ||
-     _cmdline_check(
+     await _cmdline_check(
        "ethereum-address-validate") ) {
   _global_variables();
   await _cmdline_parse();
@@ -251,8 +291,16 @@ if ( _cmdline_check(
   _address_check_cmdline(
     app_opts);
 }
+else {
+  _echo(
+    "chromi");
+}
 
-module.exports = {
-  _address_check:
-    _address_check
+export {
+  _address_check
 };
+
+// module.exports = {
+//   _address_check:
+//     _address_check
+// };