@hairy/ether-lib 1.11.0 → 1.13.0

package/dist/index.cjs

@@ -30,11 +30,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  Bignumber: () => import_utils.Bignumber,
   Errors: () => Errors,
   formatEther: () => formatEther,
   idprefix: () => idprefix,
-  subscribeForTransaction: () => subscribeForTransaction,
   wait: () => wait
 });
 module.exports = __toCommonJS(index_exports);
@@ -74,7 +72,7 @@ var import_utils = require("@hairy/utils");
 var import_ethers2 = require("ethers");
 function formatEther(value = "0", options = {}) {
   const { separator = false, decimals, delimiters = false, rounding, zeromove = true } = options;
-  const number = (0, import_ethers2.formatEther)((0, import_utils.unum)((0, import_utils.numerfix)(value)).toFixed(0));
+  const number = (0, import_ethers2.formatEther)((0, import_utils.BigNum)((0, import_utils.numerfix)(value)).toFixed(0));
   const groupSeparator = separator === false ? "" : ",";
   return (0, import_utils.formatNumeric)(number, {
     format: { groupSeparator, ...options.format },
@@ -86,24 +84,8 @@ function formatEther(value = "0", options = {}) {
 }
 
 // src/wait.ts
-var import_ethers3 = require("ethers");
 var import_mitt = __toESM(require("mitt"), 1);
 var emitter = (0, import_mitt.default)();
-for (const Response of [import_ethers3.TransactionResponse, import_ethers3.ContractTransactionResponse]) {
-  const waitForTransaction = Response.prototype.wait;
-  Response.prototype._wait = waitForTransaction;
-  Response.prototype.wait = async function(...args) {
-    try {
-      emitter.emit("before");
-      const receipt = await waitForTransaction.call(this, ...args);
-      emitter.emit("after", receipt);
-      return receipt;
-    } catch (error) {
-      emitter.emit("error", error);
-      throw error;
-    }
-  };
-}
 async function wait(transaction) {
   try {
     emitter.emit("before");
@@ -115,17 +97,16 @@ async function wait(transaction) {
     emitter.emit("after", receipt);
     return receipt;
   } catch (error) {
+    emitter.emit("after", null);
     emitter.emit("error", error);
     throw error;
   }
 }
-var subscribeForTransaction = emitter.on.bind(emitter);
+wait.subscribe = emitter.on.bind(emitter);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Bignumber,
   Errors,
   formatEther,
   idprefix,
-  subscribeForTransaction,
   wait
 });

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 import { Delimiter, Bignumber, Numberish } from '@hairy/utils';
-export { Bignumber } from '@hairy/utils';
 import * as mitt from 'mitt';
 import { TransactionResponse, ContractTransactionResponse, TransactionReceipt } from 'ethers';
 
@@ -39,17 +38,19 @@ declare function formatEther(value?: Numberish, options?: FormatEtherOptions): s
 
 type GenericTransactionResponse = TransactionResponse | ContractTransactionResponse | Promise<TransactionResponse | ContractTransactionResponse> | (() => TransactionResponse | ContractTransactionResponse) | (() => Promise<TransactionResponse | ContractTransactionResponse>);
 declare function wait(transaction: GenericTransactionResponse): Promise<any>;
-declare const subscribeForTransaction: {
-    <Key extends "before" | "after" | "error">(type: Key, handler: mitt.Handler<{
-        before: void;
-        after: TransactionReceipt | null;
-        error: Error;
-    }[Key]>): void;
-    (type: "*", handler: mitt.WildcardHandler<{
-        before: void;
-        after: TransactionReceipt | null;
-        error: Error;
-    }>): void;
-};
+declare namespace wait {
+    var subscribe: {
+        <Key extends "before" | "after" | "error">(type: Key, handler: mitt.Handler<{
+            before: void;
+            after: TransactionReceipt | null;
+            error: Error;
+        }[Key]>): void;
+        (type: "*", handler: mitt.WildcardHandler<{
+            before: void;
+            after: TransactionReceipt | null;
+            error: Error;
+        }>): void;
+    };
+}
 
-export { Errors, type FormatEtherOptions, type GenericTransactionResponse, formatEther, idprefix, subscribeForTransaction, wait };
+export { Errors, type FormatEtherOptions, type GenericTransactionResponse, formatEther, idprefix, wait };

package/dist/index.global.js

@@ -80,22 +80,20 @@
     m: { v: 10 ** 6, d: 7, n: "m" },
     k: { v: 10 ** 3, d: 4, n: "k" }
   };
-  function unum(num = "0") {
+  function BigNum(num = "0") {
     return new import_bignumber.default(numerfix(num));
   }
   function gte(num, n) {
-    return unum(num).gte(unum(n));
+    return BigNum(num).gte(BigNum(n));
   }
   function lt(num, n) {
-    return unum(num).lt(unum(n));
+    return BigNum(num).lt(BigNum(n));
   }
   function zeromove(value) {
     return value.toString().replace(/\.?0+$/, "");
   }
   function numerfix(value) {
     const _isNaN = Number.isNaN(Number(value)) || value.toString() === "NaN";
-    if (_isNaN)
-      console.warn(`numerfix(${value}): value is not the correct value. To ensure the normal operation of the program, it will be converted to zero`);
     return _isNaN ? "0" : String(value);
   }
   function parseNumeric(num, delimiters = ["t", "b", "m"]) {
@@ -107,7 +105,7 @@
     ];
     let options;
     for (const analy of mappings) {
-      const opts = analy && analy(unum(num).toFixed(0));
+      const opts = analy && analy(BigNum(num).toFixed(0));
       opts && (options = opts);
     }
     return options || { v: 1, d: 0, n: "" };
@@ -120,7 +118,7 @@
       decimals = 2
     } = options || {};
     const config = parseNumeric(value, delimiters || []);
-    let number = unum(value).div(config.v).toFormat(decimals, rounding, {
+    let number = BigNum(value).div(config.v).toFormat(decimals, rounding, {
       decimalSeparator: ".",
       groupSeparator: ",",
       groupSize: 3,
@@ -137,7 +135,7 @@
   var import_ethers2 = __toESM(require_ethers(), 1);
   function formatEther(value = "0", options = {}) {
     const { separator = false, decimals, delimiters = false, rounding, zeromove: zeromove2 = true } = options;
-    const number = (0, import_ethers2.formatEther)(unum(numerfix(value)).toFixed(0));
+    const number = (0, import_ethers2.formatEther)(BigNum(numerfix(value)).toFixed(0));
     const groupSeparator = separator === false ? "" : ",";
     return formatNumeric(number, {
       format: { groupSeparator, ...options.format },
@@ -148,9 +146,6 @@
     });
   }
 
-  // src/wait.ts
-  var import_ethers3 = __toESM(require_ethers(), 1);
-
   // ../../node_modules/.pnpm/mitt@3.0.1/node_modules/mitt/dist/mitt.mjs
   function mitt_default(n) {
     return { all: n = n || /* @__PURE__ */ new Map(), on: function(t, e) {
@@ -171,21 +166,6 @@
 
   // src/wait.ts
   var emitter = mitt_default();
-  for (const Response of [import_ethers3.TransactionResponse, import_ethers3.ContractTransactionResponse]) {
-    const waitForTransaction = Response.prototype.wait;
-    Response.prototype._wait = waitForTransaction;
-    Response.prototype.wait = async function(...args) {
-      try {
-        emitter.emit("before");
-        const receipt = await waitForTransaction.call(this, ...args);
-        emitter.emit("after", receipt);
-        return receipt;
-      } catch (error) {
-        emitter.emit("error", error);
-        throw error;
-      }
-    };
-  }
   async function wait(transaction) {
     try {
       emitter.emit("before");
@@ -197,9 +177,10 @@
       emitter.emit("after", receipt);
       return receipt;
     } catch (error) {
+      emitter.emit("after", null);
       emitter.emit("error", error);
       throw error;
     }
   }
-  var subscribeForTransaction = emitter.on.bind(emitter);
+  wait.subscribe = emitter.on.bind(emitter);
 })();

package/dist/index.js

@@ -29,11 +29,11 @@ function idprefix(errorCallString) {
 }
 
 // src/number.ts
-import { Bignumber, formatNumeric, numerfix, unum } from "@hairy/utils";
+import { BigNum, formatNumeric, numerfix } from "@hairy/utils";
 import { formatEther as _formatEther } from "ethers";
 function formatEther(value = "0", options = {}) {
   const { separator = false, decimals, delimiters = false, rounding, zeromove = true } = options;
-  const number = _formatEther(unum(numerfix(value)).toFixed(0));
+  const number = _formatEther(BigNum(numerfix(value)).toFixed(0));
   const groupSeparator = separator === false ? "" : ",";
   return formatNumeric(number, {
     format: { groupSeparator, ...options.format },
@@ -45,24 +45,8 @@ function formatEther(value = "0", options = {}) {
 }
 
 // src/wait.ts
-import { ContractTransactionResponse, TransactionResponse } from "ethers";
 import mitt from "mitt";
 var emitter = mitt();
-for (const Response of [TransactionResponse, ContractTransactionResponse]) {
-  const waitForTransaction = Response.prototype.wait;
-  Response.prototype._wait = waitForTransaction;
-  Response.prototype.wait = async function(...args) {
-    try {
-      emitter.emit("before");
-      const receipt = await waitForTransaction.call(this, ...args);
-      emitter.emit("after", receipt);
-      return receipt;
-    } catch (error) {
-      emitter.emit("error", error);
-      throw error;
-    }
-  };
-}
 async function wait(transaction) {
   try {
     emitter.emit("before");
@@ -74,16 +58,15 @@ async function wait(transaction) {
     emitter.emit("after", receipt);
     return receipt;
   } catch (error) {
+    emitter.emit("after", null);
     emitter.emit("error", error);
     throw error;
   }
 }
-var subscribeForTransaction = emitter.on.bind(emitter);
+wait.subscribe = emitter.on.bind(emitter);
 export {
-  Bignumber,
   Errors,
   formatEther,
   idprefix,
-  subscribeForTransaction,
   wait
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@hairy/ether-lib",
   "type": "module",
-  "version": "1.11.0",
+  "version": "1.13.0",
   "description": "Library for ether",
   "author": "Hairyf <wwu710632@gmail.com>",
   "license": "MIT",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "mitt": "^3.0.1",
-    "@hairy/utils": "1.11.0"
+    "@hairy/utils": "1.13.0"
   },
   "devDependencies": {
     "ethers": "^6"