@gardenfi/utils 2.5.0 → 2.5.2

package/dist/index4.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./index3.cjs"),t=require("./index5.cjs"),d=require("./index19.cjs"),w=require("./index20.cjs"),f=require("./index21.cjs"),g=require("./index22.cjs"),m=async(u,a,o,e)=>{if(!e.account)return t.Err("No account found");const n=d.getContract({address:s.with0x(a),abi:g.erc20Abi,client:e});try{const c=await n.read.allowance([s.with0x(e.account.address),s.with0x(o)]);if(BigInt(c)<BigInt(u)){const r=await n.write.approve([s.with0x(o),w.maxUint256],{account:e.account,chain:e.chain}),i=await p(e,r);return i.ok?!i.val||i.val.status!=="success"?t.Err("Failed to approve"):t.Ok(r):t.Err(i.error)}return t.Ok("Already approved")}catch(c){return t.Err("Failed to approve: "+c)}},p=async(u,a,o=2e3,e=12e4)=>{const n=Math.ceil(e/o);for(let c=0;c<n;c++){try{const r=await f.getTransactionReceipt(u,{hash:a});if(r)return t.Ok(r)}catch(r){if(!r.message.includes(`Transaction receipt with hash "${a}" could not be found.`))return t.Err(r.message)}c<n-1&&await new Promise(r=>setTimeout(r,o))}return t.Err(`Timed out waiting for receipt of ${a}`)};exports.checkAllowanceAndApprove=m;exports.waitForTransactionReceipt=p;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("./index3.cjs"),e=require("./index5.cjs"),g=require("./index19.cjs"),l=require("./index20.cjs"),A=require("./index21.cjs"),h=require("./index22.cjs"),m=async(a,o,i,t)=>{if(!t.account)return e.Err("No account found");const n=g.getContract({address:u.with0x(o),abi:h.erc20Abi,client:t});try{const c=u.with0x(t.account.address),r=u.with0x(i),f=await n.read.allowance([c,r]);if(BigInt(f)<BigInt(a)){const p=await n.write.approve([r,l.maxUint256],{account:t.account,chain:t.chain}),s=await w(t,p);if(!s.ok)return e.Err(s.error);if(!s.val||s.val.status!=="success")return e.Err("Failed to approve");const d=await n.read.allowance([c,r]);return d<a?e.Err(`Insufficient allowance after approval. Needed ${a.toString()}, got ${d.toString()}.`):e.Ok(p)}return e.Ok("Already approved")}catch(c){return e.Err("Failed to approve: "+c)}},w=async(a,o,i=2e3,t=12e4)=>{const n=Math.ceil(t/i);for(let c=0;c<n;c++){try{const r=await A.getTransactionReceipt(a,{hash:o});if(r)return e.Ok(r)}catch(r){if(!r.message.includes(`Transaction receipt with hash "${o}" could not be found.`))return e.Err(r.message)}c<n-1&&await new Promise(r=>setTimeout(r,i))}return e.Err(`Timed out waiting for receipt of ${o}`)};exports.checkAllowanceAndApprove=m;exports.waitForTransactionReceipt=w;

package/dist/index4.js

@@ -1,53 +1,53 @@
-import { with0x as s } from "./index3.js";
-import { Err as e, Ok as u } from "./index5.js";
-import { getContract as m } from "./index19.js";
-import { maxUint256 as f } from "./index20.js";
-import { getTransactionReceipt as d } from "./index21.js";
-import { erc20Abi as w } from "./index22.js";
-const b = async (p, a, c, t) => {
-  if (!t.account) return e("No account found");
-  const i = m({
-    address: s(a),
-    abi: w,
+import { with0x as p } from "./index3.js";
+import { Err as o, Ok as f } from "./index5.js";
+import { getContract as w } from "./index19.js";
+import { maxUint256 as g } from "./index20.js";
+import { getTransactionReceipt as l } from "./index21.js";
+import { erc20Abi as v } from "./index22.js";
+const k = async (c, n, i, t) => {
+  if (!t.account) return o("No account found");
+  const a = w({
+    address: p(n),
+    abi: v,
     client: t
   });
   try {
-    const o = await i.read.allowance([
-      s(t.account.address),
-      s(c)
-    ]);
-    if (BigInt(o) < BigInt(p)) {
-      const r = await i.write.approve(
-        [s(c), f],
-        {
-          account: t.account,
-          chain: t.chain
-        }
-      ), n = await g(t, r);
-      return n.ok ? !n.val || n.val.status !== "success" ? e("Failed to approve") : u(r) : e(n.error);
+    const e = p(t.account.address), r = p(i), m = await a.read.allowance([e, r]);
+    if (BigInt(m) < BigInt(c)) {
+      const u = await a.write.approve([r, g], {
+        account: t.account,
+        chain: t.chain
+      }), s = await A(t, u);
+      if (!s.ok) return o(s.error);
+      if (!s.val || s.val.status !== "success")
+        return o("Failed to approve");
+      const d = await a.read.allowance([e, r]);
+      return d < c ? o(
+        `Insufficient allowance after approval. Needed ${c.toString()}, got ${d.toString()}.`
+      ) : f(u);
     }
-    return u("Already approved");
-  } catch (o) {
-    return e("Failed to approve: " + o);
+    return f("Already approved");
+  } catch (e) {
+    return o("Failed to approve: " + e);
   }
-}, g = async (p, a, c = 2e3, t = 12e4) => {
-  const i = Math.ceil(t / c);
-  for (let o = 0; o < i; o++) {
+}, A = async (c, n, i = 2e3, t = 12e4) => {
+  const a = Math.ceil(t / i);
+  for (let e = 0; e < a; e++) {
     try {
-      const r = await d(p, { hash: a });
+      const r = await l(c, { hash: n });
       if (r)
-        return u(r);
+        return f(r);
     } catch (r) {
       if (!r.message.includes(
-        `Transaction receipt with hash "${a}" could not be found.`
+        `Transaction receipt with hash "${n}" could not be found.`
       ))
-        return e(r.message);
+        return o(r.message);
     }
-    o < i - 1 && await new Promise((r) => setTimeout(r, c));
+    e < a - 1 && await new Promise((r) => setTimeout(r, i));
   }
-  return e(`Timed out waiting for receipt of ${a}`);
+  return o(`Timed out waiting for receipt of ${n}`);
 };
 export {
-  b as checkAllowanceAndApprove,
-  g as waitForTransactionReceipt
+  k as checkAllowanceAndApprove,
+  A as waitForTransactionReceipt
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/utils",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "type": "module",
   "scripts": {
     "build": "vite build",