@gardenfi/utils 2.4.3 → 2.4.5-beta.1

package/dist/index97.js

@@ -1,72 +1,19 @@
-import { getAction as u } from "./index32.js";
-import { observe as b } from "./index42.js";
-import { poll as d } from "./index43.js";
-import { stringify as h } from "./index45.js";
-import { createPendingTransactionFilter as P } from "./index65.js";
-import { getFilterChanges as m } from "./index78.js";
-import { uninstallFilter as w } from "./index90.js";
-function I(e, { batch: l = !0, onError: s, onTransactions: f, poll: g, pollingInterval: p = e.pollingInterval }) {
-  return (typeof g < "u" ? g : e.transport.type !== "webSocket" && e.transport.type !== "ipc") ? (() => {
-    const r = h([
-      "watchPendingTransactions",
-      e.uid,
-      l,
-      p
-    ]);
-    return b(r, { onTransactions: f, onError: s }, (t) => {
-      let n;
-      const a = d(async () => {
-        var o;
-        try {
-          if (!n)
-            try {
-              n = await u(e, P, "createPendingTransactionFilter")({});
-              return;
-            } catch (c) {
-              throw a(), c;
-            }
-          const i = await u(e, m, "getFilterChanges")({ filter: n });
-          if (i.length === 0)
-            return;
-          if (l)
-            t.onTransactions(i);
-          else
-            for (const c of i)
-              t.onTransactions([c]);
-        } catch (i) {
-          (o = t.onError) == null || o.call(t, i);
-        }
-      }, {
-        emitOnBegin: !0,
-        interval: p
-      });
-      return async () => {
-        n && await u(e, w, "uninstallFilter")({ filter: n }), a();
-      };
-    });
-  })() : (() => {
-    let r = !0, t = () => r = !1;
-    return (async () => {
-      try {
-        const { unsubscribe: n } = await e.transport.subscribe({
-          params: ["newPendingTransactions"],
-          onData(a) {
-            if (!r)
-              return;
-            const o = a.result;
-            f([o]);
-          },
-          onError(a) {
-            s == null || s(a);
-          }
-        });
-        t = n, r || t();
-      } catch (n) {
-        s == null || s(n);
-      }
-    })(), () => t();
-  })();
+import { getAbiItem as p } from "./index98.js";
+import { getAction as v } from "./index46.js";
+import { getLogs as l } from "./index99.js";
+async function y(n, r) {
+  const { abi: t, address: s, args: c, blockHash: i, eventName: e, fromBlock: m, toBlock: a, strict: f } = r, o = e ? p({ abi: t, name: e }) : void 0, g = o ? void 0 : t.filter((d) => d.type === "event");
+  return v(n, l, "getLogs")({
+    address: s,
+    args: c,
+    blockHash: i,
+    event: o,
+    events: g,
+    fromBlock: m,
+    toBlock: a,
+    strict: f
+  });
 }
 export {
-  I as watchPendingTransactions
+  y as getContractEvents
 };

package/dist/index98.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("./index226.cjs"),f=require("./index283.cjs"),h=require("./index284.cjs"),M=require("./index253.cjs");async function S(a,r){const{address:i,domain:t,message:s,nonce:n,scheme:d,signature:c,time:o=new Date,...g}=r,e=f.parseSiweMessage(s);if(!e.address||!h.validateSiweMessage({address:i,domain:t,message:e,nonce:n,scheme:d,time:o}))return!1;const u=l.hashMessage(s);return M.verifyHash(a,{address:e.address,hash:u,signature:c,...g})}exports.verifySiweMessage=S;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const y=require("./index116.cjs"),g=require("./index172.cjs"),p=require("./index226.cjs"),m=require("./index223.cjs"),b=require("./index222.cjs");function A(s){const{abi:o,args:n=[],name:t}=s,u=g.isHex(t,{strict:!1}),i=o.filter(e=>u?e.type==="function"?b.toFunctionSelector(e)===t:e.type==="event"?m.toEventSelector(e)===t:!1:"name"in e&&e.name===t);if(i.length===0)return;if(i.length===1)return i[0];let r;for(const e of i){if(!("inputs"in e))continue;if(!n||n.length===0){if(!e.inputs||e.inputs.length===0)return e;continue}if(!e.inputs||e.inputs.length===0||e.inputs.length!==n.length)continue;if(n.every((c,d)=>{const a="inputs"in e&&e.inputs[d];return a?f(c,a):!1})){if(r&&"inputs"in r&&r.inputs){const c=l(e.inputs,r.inputs,n);if(c)throw new y.AbiItemAmbiguityError({abiItem:e,type:c[0]},{abiItem:r,type:c[1]})}r=e}}return r||i[0]}function f(s,o){const n=typeof s,t=o.type;switch(t){case"address":return p.isAddress(s,{strict:!1});case"bool":return n==="boolean";case"function":return n==="string";case"string":return n==="string";default:return t==="tuple"&&"components"in o?Object.values(o.components).every((u,i)=>f(Object.values(s)[i],u)):/^u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?$/.test(t)?n==="number"||n==="bigint":/^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(t)?n==="string"||s instanceof Uint8Array:/[a-z]+[1-9]{0,3}(\[[0-9]{0,}\])+$/.test(t)?Array.isArray(s)&&s.every(u=>f(u,{...o,type:t.replace(/(\[[0-9]{0,}\])$/,"")})):!1}}function l(s,o,n){for(const t in s){const u=s[t],i=o[t];if(u.type==="tuple"&&i.type==="tuple"&&"components"in u&&"components"in i)return l(u.components,i.components,n[t]);const r=[u.type,i.type];if(r.includes("address")&&r.includes("bytes20")?!0:r.includes("address")&&r.includes("string")?p.isAddress(n[t],{strict:!1}):r.includes("address")&&r.includes("bytes")?p.isAddress(n[t],{strict:!1}):!1)return r}}exports.getAbiItem=A;exports.getAmbiguousTypes=l;exports.isArgOfType=f;

package/dist/index98.js

@@ -1,26 +1,76 @@
-import { hashMessage as g } from "./index226.js";
-import { parseSiweMessage as l } from "./index283.js";
-import { validateSiweMessage as p } from "./index284.js";
-import { verifyHash as h } from "./index253.js";
-async function S(a, r) {
-  const { address: i, domain: t, message: s, nonce: o, scheme: n, signature: d, time: m = /* @__PURE__ */ new Date(), ...f } = r, e = l(s);
-  if (!e.address || !p({
-    address: i,
-    domain: t,
-    message: e,
-    nonce: o,
-    scheme: n,
-    time: m
-  }))
-    return !1;
-  const c = g(s);
-  return h(a, {
-    address: e.address,
-    hash: c,
-    signature: d,
-    ...f
-  });
+import { AbiItemAmbiguityError as y } from "./index116.js";
+import { isHex as d } from "./index172.js";
+import { isAddress as f } from "./index226.js";
+import { toEventSelector as g } from "./index223.js";
+import { toFunctionSelector as b } from "./index222.js";
+function x(s) {
+  const { abi: o, args: n = [], name: e } = s, u = d(e, { strict: !1 }), i = o.filter((t) => u ? t.type === "function" ? b(t) === e : t.type === "event" ? g(t) === e : !1 : "name" in t && t.name === e);
+  if (i.length === 0)
+    return;
+  if (i.length === 1)
+    return i[0];
+  let r;
+  for (const t of i) {
+    if (!("inputs" in t))
+      continue;
+    if (!n || n.length === 0) {
+      if (!t.inputs || t.inputs.length === 0)
+        return t;
+      continue;
+    }
+    if (!t.inputs || t.inputs.length === 0 || t.inputs.length !== n.length)
+      continue;
+    if (n.every((c, m) => {
+      const l = "inputs" in t && t.inputs[m];
+      return l ? p(c, l) : !1;
+    })) {
+      if (r && "inputs" in r && r.inputs) {
+        const c = a(t.inputs, r.inputs, n);
+        if (c)
+          throw new y({
+            abiItem: t,
+            type: c[0]
+          }, {
+            abiItem: r,
+            type: c[1]
+          });
+      }
+      r = t;
+    }
+  }
+  return r || i[0];
+}
+function p(s, o) {
+  const n = typeof s, e = o.type;
+  switch (e) {
+    case "address":
+      return f(s, { strict: !1 });
+    case "bool":
+      return n === "boolean";
+    case "function":
+      return n === "string";
+    case "string":
+      return n === "string";
+    default:
+      return e === "tuple" && "components" in o ? Object.values(o.components).every((u, i) => p(Object.values(s)[i], u)) : /^u?int(8|16|24|32|40|48|56|64|72|80|88|96|104|112|120|128|136|144|152|160|168|176|184|192|200|208|216|224|232|240|248|256)?$/.test(e) ? n === "number" || n === "bigint" : /^bytes([1-9]|1[0-9]|2[0-9]|3[0-2])?$/.test(e) ? n === "string" || s instanceof Uint8Array : /[a-z]+[1-9]{0,3}(\[[0-9]{0,}\])+$/.test(e) ? Array.isArray(s) && s.every((u) => p(u, {
+        ...o,
+        // Pop off `[]` or `[M]` from end of type
+        type: e.replace(/(\[[0-9]{0,}\])$/, "")
+      })) : !1;
+  }
+}
+function a(s, o, n) {
+  for (const e in s) {
+    const u = s[e], i = o[e];
+    if (u.type === "tuple" && i.type === "tuple" && "components" in u && "components" in i)
+      return a(u.components, i.components, n[e]);
+    const r = [u.type, i.type];
+    if (r.includes("address") && r.includes("bytes20") ? !0 : r.includes("address") && r.includes("string") ? f(n[e], { strict: !1 }) : r.includes("address") && r.includes("bytes") ? f(n[e], { strict: !1 }) : !1)
+      return r;
+  }
 }
 export {
-  S as verifySiweMessage
+  x as getAbiItem,
+  a as getAmbiguousTypes,
+  p as isArgOfType
 };

package/dist/index99.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("./index48.cjs"),h=require("./index66.cjs"),x=require("./index67.cjs"),I=require("./index71.cjs"),C=require("./index86.cjs"),q=require("./index140.cjs"),A=require("./index207.cjs"),H=require("./index211.cjs"),B=require("./index210.cjs"),V=require("./index212.cjs"),p=require("./index32.cjs"),_=require("./index200.cjs"),S=require("./index189.cjs"),E=require("./index74.cjs"),w=["blobVersionedHashes","chainId","fees","gas","nonce","type"],b=new Map;async function M(n,a){const{account:l=n.account,blobs:c,chain:d,gas:G,kzg:m,nonce:T,nonceManager:P,parameters:o=w,type:F}=a,i=l&&k.parseAccount(l),e={...a,...i?{from:i==null?void 0:i.address}:{}};let u;async function y(){return u||(u=await p.getAction(n,I.getBlock,"getBlock")({blockTag:"latest"}),u)}let f;async function g(){return f||(d?d.id:typeof a.chainId<"u"?a.chainId:(f=await p.getAction(n,E.getChainId,"getChainId")({}),f))}if(o.includes("nonce")&&typeof T>"u"&&i)if(P){const t=await g();e.nonce=await P.consume({address:i.address,chainId:t,client:n})}else e.nonce=await p.getAction(n,C.getTransactionCount,"getTransactionCount")({address:i.address,blockTag:"pending"});if((o.includes("blobVersionedHashes")||o.includes("sidecars"))&&c&&m){const t=A.blobsToCommitments({blobs:c,kzg:m});if(o.includes("blobVersionedHashes")){const s=B.commitmentsToVersionedHashes({commitments:t,to:"hex"});e.blobVersionedHashes=s}if(o.includes("sidecars")){const s=H.blobsToProofs({blobs:c,commitments:t,kzg:m}),r=V.toBlobSidecars({blobs:c,commitments:t,proofs:s,to:"hex"});e.sidecars=r}}if(o.includes("chainId")&&(e.chainId=await g()),(o.includes("fees")||o.includes("type"))&&typeof F>"u")try{e.type=S.getTransactionType(e)}catch{let t=b.get(n.uid);if(typeof t>"u"){const s=await y();t=typeof(s==null?void 0:s.baseFeePerGas)=="bigint",b.set(n.uid,t)}e.type=t?"eip1559":"legacy"}if(o.includes("fees"))if(e.type!=="legacy"&&e.type!=="eip2930"){if(typeof e.maxFeePerGas>"u"||typeof e.maxPriorityFeePerGas>"u"){const t=await y(),{maxFeePerGas:s,maxPriorityFeePerGas:r}=await h.internal_estimateFeesPerGas(n,{block:t,chain:d,request:e});if(typeof a.maxPriorityFeePerGas>"u"&&a.maxFeePerGas&&a.maxFeePerGas<r)throw new q.MaxFeePerGasTooLowError({maxPriorityFeePerGas:r});e.maxPriorityFeePerGas=r,e.maxFeePerGas=s}}else{if(typeof a.maxFeePerGas<"u"||typeof a.maxPriorityFeePerGas<"u")throw new q.Eip1559FeesNotSupportedError;if(typeof a.gasPrice>"u"){const t=await y(),{gasPrice:s}=await h.internal_estimateFeesPerGas(n,{block:t,chain:d,request:e,type:"legacy"});e.gasPrice=s}}return o.includes("gas")&&typeof G>"u"&&(e.gas=await p.getAction(n,x.estimateGas,"estimateGas")({...e,account:i&&{address:i.address,type:"json-rpc"}})),_.assertRequest(e),delete e.parameters,e}exports.defaultParameters=w;exports.eip1559NetworkCache=b;exports.prepareTransactionRequest=M;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("./index73.cjs"),q=require("./index105.cjs"),m=require("./index33.cjs"),y=require("./index106.cjs");async function T(i,{address:a,blockHash:g,fromBlock:o,toBlock:s,event:n,events:c,args:u,strict:L}={}){const b=L??!1,t=c??(n?[n]:void 0);let e=[];t&&(e=[t.flatMap(p=>l.encodeEventTopics({abi:[p],eventName:p.name,args:c?void 0:u}))],n&&(e=e[0]));let r;g?r=await i.request({method:"eth_getLogs",params:[{address:a,topics:e,blockHash:g}]}):r=await i.request({method:"eth_getLogs",params:[{address:a,topics:e,fromBlock:typeof o=="bigint"?m.numberToHex(o):o,toBlock:typeof s=="bigint"?m.numberToHex(s):s}]});const d=r.map(f=>y.formatLog(f));return t?q.parseEventLogs({abi:t,args:u,logs:d,strict:b}):d}exports.getLogs=T;

package/dist/index99.js

@@ -1,112 +1,38 @@
-import { parseAccount as F } from "./index48.js";
-import { internal_estimateFeesPerGas as b } from "./index66.js";
-import { estimateGas as k } from "./index67.js";
-import { getBlock as I } from "./index71.js";
-import { getTransactionCount as T } from "./index86.js";
-import { MaxFeePerGasTooLowError as C, Eip1559FeesNotSupportedError as H } from "./index140.js";
-import { blobsToCommitments as q } from "./index207.js";
-import { blobsToProofs as V } from "./index211.js";
-import { commitmentsToVersionedHashes as _ } from "./index210.js";
-import { toBlobSidecars as B } from "./index212.js";
-import { getAction as p } from "./index32.js";
-import { assertRequest as E } from "./index200.js";
-import { getTransactionType as M } from "./index189.js";
-import { getChainId as N } from "./index74.js";
-const A = [
-  "blobVersionedHashes",
-  "chainId",
-  "fees",
-  "gas",
-  "nonce",
-  "type"
-], w = /* @__PURE__ */ new Map();
-async function X(s, a) {
-  const { account: u = s.account, blobs: c, chain: d, gas: g, kzg: y, nonce: G, nonceManager: h, parameters: i = A, type: x } = a, n = u && F(u), e = { ...a, ...n ? { from: n == null ? void 0 : n.address } : {} };
-  let f;
-  async function l() {
-    return f || (f = await p(s, I, "getBlock")({ blockTag: "latest" }), f);
-  }
-  let m;
-  async function P() {
-    return m || (d ? d.id : typeof a.chainId < "u" ? a.chainId : (m = await p(s, N, "getChainId")({}), m));
-  }
-  if (i.includes("nonce") && typeof G > "u" && n)
-    if (h) {
-      const t = await P();
-      e.nonce = await h.consume({
-        address: n.address,
-        chainId: t,
-        client: s
-      });
-    } else
-      e.nonce = await p(s, T, "getTransactionCount")({
-        address: n.address,
-        blockTag: "pending"
-      });
-  if ((i.includes("blobVersionedHashes") || i.includes("sidecars")) && c && y) {
-    const t = q({ blobs: c, kzg: y });
-    if (i.includes("blobVersionedHashes")) {
-      const o = _({
-        commitments: t,
-        to: "hex"
-      });
-      e.blobVersionedHashes = o;
-    }
-    if (i.includes("sidecars")) {
-      const o = V({ blobs: c, commitments: t, kzg: y }), r = B({
-        blobs: c,
-        commitments: t,
-        proofs: o,
-        to: "hex"
-      });
-      e.sidecars = r;
-    }
-  }
-  if (i.includes("chainId") && (e.chainId = await P()), (i.includes("fees") || i.includes("type")) && typeof x > "u")
-    try {
-      e.type = M(e);
-    } catch {
-      let t = w.get(s.uid);
-      if (typeof t > "u") {
-        const o = await l();
-        t = typeof (o == null ? void 0 : o.baseFeePerGas) == "bigint", w.set(s.uid, t);
+import { encodeEventTopics as h } from "./index73.js";
+import { parseEventLogs as l } from "./index105.js";
+import { numberToHex as u } from "./index33.js";
+import { formatLog as y } from "./index106.js";
+async function T(n, { address: a, blockHash: m, fromBlock: o, toBlock: i, event: r, events: f, args: g, strict: L } = {}) {
+  const b = L ?? !1, e = f ?? (r ? [r] : void 0);
+  let t = [];
+  e && (t = [e.flatMap((c) => h({
+    abi: [c],
+    eventName: c.name,
+    args: f ? void 0 : g
+  }))], r && (t = t[0]));
+  let s;
+  m ? s = await n.request({
+    method: "eth_getLogs",
+    params: [{ address: a, topics: t, blockHash: m }]
+  }) : s = await n.request({
+    method: "eth_getLogs",
+    params: [
+      {
+        address: a,
+        topics: t,
+        fromBlock: typeof o == "bigint" ? u(o) : o,
+        toBlock: typeof i == "bigint" ? u(i) : i
       }
-      e.type = t ? "eip1559" : "legacy";
-    }
-  if (i.includes("fees"))
-    if (e.type !== "legacy" && e.type !== "eip2930") {
-      if (typeof e.maxFeePerGas > "u" || typeof e.maxPriorityFeePerGas > "u") {
-        const t = await l(), { maxFeePerGas: o, maxPriorityFeePerGas: r } = await b(s, {
-          block: t,
-          chain: d,
-          request: e
-        });
-        if (typeof a.maxPriorityFeePerGas > "u" && a.maxFeePerGas && a.maxFeePerGas < r)
-          throw new C({
-            maxPriorityFeePerGas: r
-          });
-        e.maxPriorityFeePerGas = r, e.maxFeePerGas = o;
-      }
-    } else {
-      if (typeof a.maxFeePerGas < "u" || typeof a.maxPriorityFeePerGas < "u")
-        throw new H();
-      if (typeof a.gasPrice > "u") {
-        const t = await l(), { gasPrice: o } = await b(s, {
-          block: t,
-          chain: d,
-          request: e,
-          type: "legacy"
-        });
-        e.gasPrice = o;
-      }
-    }
-  return i.includes("gas") && typeof g > "u" && (e.gas = await p(s, k, "estimateGas")({
-    ...e,
-    account: n && { address: n.address, type: "json-rpc" }
-  })), E(e), delete e.parameters, e;
+    ]
+  });
+  const p = s.map((d) => y(d));
+  return e ? l({
+    abi: e,
+    args: g,
+    logs: p,
+    strict: b
+  }) : p;
 }
 export {
-  A as defaultParameters,
-  w as eip1559NetworkCache,
-  X as prepareTransactionRequest
+  T as getLogs
 };

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@gardenfi/utils",
-  "version": "2.4.3",
+  "version": "2.4.5-beta.1",
   "type": "module",
   "scripts": {
     "build": "vite build",
     "test": "vitest run",
-    "dev": "vite build --watch"
+    "dev": "vite build --watch",
+    "link": "yarn link"
   },
   "files": [
     "dist"