@gardenfi/swap 0.1.3-beta.2 → 0.1.3-beta.21

package/dist/index157.js

@@ -1,154 +1,106 @@
-import { DecodeLogDataMismatch as P, DecodeLogTopicsMismatch as T } from "./index174.js";
-import { InvalidInputRpcError as z } from "./index195.js";
-import { decodeEventLog as A } from "./index204.js";
-import { encodeEventTopics as O } from "./index212.js";
-import { formatLog as F } from "./index90.js";
-import { getAction as g } from "./index101.js";
-import { observe as D } from "./index299.js";
-import { poll as R } from "./index300.js";
-import { stringify as S } from "./index194.js";
-import { createContractEventFilter as U } from "./index120.js";
-import { getBlockNumber as j } from "./index131.js";
-import { getContractEvents as q } from "./index134.js";
-import { getFilterChanges as x } from "./index137.js";
-import { uninstallFilter as G } from "./index151.js";
-function ct(t, _) {
-  const { abi: b, address: f, args: p, batch: h = !0, eventName: c, fromBlock: l, onError: u, onLogs: N, poll: L, pollingInterval: w = t.pollingInterval, strict: v } = _;
-  return (typeof L < "u" ? L : typeof l == "bigint" ? !0 : !(t.transport.type === "webSocket" || t.transport.type === "ipc" || t.transport.type === "fallback" && (t.transport.transports[0].config.type === "webSocket" || t.transport.transports[0].config.type === "ipc"))) ? (() => {
-    const m = v ?? !1, C = S([
-      "watchContractEvent",
-      f,
-      p,
-      h,
-      t.uid,
-      c,
-      w,
-      m,
-      l
-    ]);
-    return D(C, { onLogs: N, onError: u }, (n) => {
-      let a;
-      l !== void 0 && (a = l - 1n);
-      let e, s = !1;
-      const k = R(async () => {
-        var d;
-        if (!s) {
+import { BlockNotFoundError as M } from "./index181.js";
+import { WaitForTransactionReceiptTimeoutError as O, TransactionNotFoundError as W, TransactionReceiptNotFoundError as q } from "./index189.js";
+import { getAction as u } from "./index104.js";
+import { observe as z } from "./index303.js";
+import { withResolvers as G } from "./index305.js";
+import { withRetry as B } from "./index241.js";
+import { stringify as H } from "./index197.js";
+import { getBlock as J } from "./index133.js";
+import { getTransaction as K } from "./index146.js";
+import { getTransactionReceipt as y } from "./index149.js";
+import { watchBlockNumber as L } from "./index158.js";
+async function er(t, b) {
+  const {
+    checkReplacement: F = !0,
+    confirmations: a = 1,
+    hash: m,
+    onReplaced: I,
+    retryCount: N = 6,
+    retryDelay: R = ({ count: e }) => ~~(1 << e) * 200,
+    // exponential backoff
+    timeout: h = 18e4
+  } = b, E = H(["waitForTransactionReceipt", t.uid, m]), j = (() => {
+    var e;
+    return b.pollingInterval ? b.pollingInterval : (e = t.chain) != null && e.experimental_preconfirmationTime ? t.chain.experimental_preconfirmationTime : t.pollingInterval;
+  })();
+  let l, i, r, s = !1, o, c;
+  const { promise: x, resolve: A, reject: v } = G(), w = h ? setTimeout(() => {
+    c == null || c(), o == null || o(), v(new O({ hash: m }));
+  }, h) : void 0;
+  return o = z(E, { onReplaced: I, resolve: A, reject: v }, async (e) => {
+    if (r = await u(t, y, "getTransactionReceipt")({ hash: m }).catch(() => {
+    }), r && a <= 1) {
+      clearTimeout(w), e.resolve(r), o == null || o();
+      return;
+    }
+    c = u(t, L, "watchBlockNumber")({
+      emitMissed: !0,
+      emitOnBegin: !0,
+      poll: !0,
+      pollingInterval: j,
+      async onBlockNumber(C) {
+        const p = (T) => {
+          clearTimeout(w), c == null || c(), T(), o == null || o();
+        };
+        let d = C;
+        if (!s)
           try {
-            e = await g(t, U, "createContractEventFilter")({
-              abi: b,
-              address: f,
-              args: p,
-              eventName: c,
-              strict: m,
-              fromBlock: l
-            });
-          } catch {
-          }
-          s = !0;
-          return;
-        }
-        try {
-          let r;
-          if (e)
-            r = await g(t, x, "getFilterChanges")({ filter: e });
-          else {
-            const o = await g(t, j, "getBlockNumber")({});
-            a && a < o ? r = await g(t, q, "getContractEvents")({
-              abi: b,
-              address: f,
-              args: p,
-              eventName: c,
-              fromBlock: a + 1n,
-              toBlock: o,
-              strict: m
-            }) : r = [], a = o;
-          }
-          if (r.length === 0)
-            return;
-          if (h)
-            n.onLogs(r);
-          else
-            for (const o of r)
-              n.onLogs([o]);
-        } catch (r) {
-          e && r instanceof z && (s = !1), (d = n.onError) == null || d.call(n, r);
-        }
-      }, {
-        emitOnBegin: !0,
-        interval: w
-      });
-      return async () => {
-        e && await g(t, G, "uninstallFilter")({ filter: e }), k();
-      };
-    });
-  })() : (() => {
-    const m = v ?? !1, C = S([
-      "watchContractEvent",
-      f,
-      p,
-      h,
-      t.uid,
-      c,
-      w,
-      m
-    ]);
-    let n = !0, a = () => n = !1;
-    return D(C, { onLogs: N, onError: u }, (e) => ((async () => {
-      try {
-        const s = (() => {
-          if (t.transport.type === "fallback") {
-            const r = t.transport.transports.find((o) => o.config.type === "webSocket" || o.config.type === "ipc");
-            return r ? r.value : t.transport;
-          }
-          return t.transport;
-        })(), k = c ? O({
-          abi: b,
-          eventName: c,
-          args: p
-        }) : [], { unsubscribe: d } = await s.subscribe({
-          params: ["logs", { address: f, topics: k }],
-          onData(r) {
-            var I;
-            if (!n)
+            if (r) {
+              if (a > 1 && (!r.blockNumber || d - r.blockNumber + 1n < a))
+                return;
+              p(() => e.resolve(r));
               return;
-            const o = r.result;
-            try {
-              const { eventName: i, args: y } = A({
-                abi: b,
-                data: o.data,
-                topics: o.topics,
-                strict: v
-              }), E = F(o, {
-                args: y,
-                eventName: i
-              });
-              e.onLogs([E]);
-            } catch (i) {
-              let y, E;
-              if (i instanceof P || i instanceof T) {
-                if (v)
+            }
+            if (F && !l && (s = !0, await B(async () => {
+              l = await u(t, K, "getTransaction")({ hash: m }), l.blockNumber && (d = l.blockNumber);
+            }, {
+              delay: R,
+              retryCount: N
+            }), s = !1), r = await u(t, y, "getTransactionReceipt")({ hash: m }), a > 1 && (!r.blockNumber || d - r.blockNumber + 1n < a))
+              return;
+            p(() => e.resolve(r));
+          } catch (T) {
+            if (T instanceof W || T instanceof q) {
+              if (!l) {
+                s = !1;
+                return;
+              }
+              try {
+                i = l, s = !0;
+                const k = await B(() => u(t, J, "getBlock")({
+                  blockNumber: d,
+                  includeTransactions: !0
+                }), {
+                  delay: R,
+                  retryCount: N,
+                  shouldRetry: ({ error: f }) => f instanceof M
+                });
+                s = !1;
+                const n = k.transactions.find(({ from: f, nonce: D }) => f === i.from && D === i.nonce);
+                if (!n || (r = await u(t, y, "getTransactionReceipt")({
+                  hash: n.hash
+                }), a > 1 && (!r.blockNumber || d - r.blockNumber + 1n < a)))
                   return;
-                y = i.abiItem.name, E = (I = i.abiItem.inputs) == null ? void 0 : I.some((B) => !("name" in B && B.name));
+                let g = "replaced";
+                n.to === i.to && n.value === i.value && n.input === i.input ? g = "repriced" : n.from === n.to && n.value === 0n && (g = "cancelled"), p(() => {
+                  var f;
+                  (f = e.onReplaced) == null || f.call(e, {
+                    reason: g,
+                    replacedTransaction: i,
+                    transaction: n,
+                    transactionReceipt: r
+                  }), e.resolve(r);
+                });
+              } catch (k) {
+                p(() => e.reject(k));
               }
-              const M = F(o, {
-                args: E ? [] : {},
-                eventName: y
-              });
-              e.onLogs([M]);
-            }
-          },
-          onError(r) {
-            var o;
-            (o = e.onError) == null || o.call(e, r);
+            } else
+              p(() => e.reject(T));
           }
-        });
-        a = d, n || a();
-      } catch (s) {
-        u == null || u(s);
       }
-    })(), () => a()));
-  })();
+    });
+  }), x;
 }
 export {
-  ct as watchContractEvent
+  er as waitForTransactionReceipt
 };

package/dist/index158.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("./index174.cjs"),M=require("./index195.cjs"),T=require("./index204.cjs"),B=require("./index212.cjs"),I=require("./index90.cjs"),g=require("./index101.cjs"),C=require("./index299.cjs"),O=require("./index300.cjs"),P=require("./index194.cjs"),j=require("./index121.cjs"),z=require("./index131.cjs"),R=require("./index137.cjs"),U=require("./index140.cjs"),$=require("./index151.cjs");function G(e,{address:b,args:d,batch:w=!0,event:u,events:m,fromBlock:f,onError:c,onLogs:q,poll:F,pollingInterval:L=e.pollingInterval,strict:k}){const S=typeof F<"u"?F:typeof f=="bigint"?!0:!(e.transport.type==="webSocket"||e.transport.type==="ipc"||e.transport.type==="fallback"&&(e.transport.transports[0].config.type==="webSocket"||e.transport.transports[0].config.type==="ipc")),N=k??!1;return S?(()=>{const p=P.stringify(["watchEvent",b,d,w,e.uid,u,L,f]);return C.observe(p,{onLogs:q,onError:c},s=>{let o;f!==void 0&&(o=f-1n);let n,i=!1;const h=O.poll(async()=>{var r;if(!i){try{n=await g.getAction(e,j.createEventFilter,"createEventFilter")({address:b,args:d,event:u,events:m,strict:N,fromBlock:f})}catch{}i=!0;return}try{let t;if(n)t=await g.getAction(e,R.getFilterChanges,"getFilterChanges")({filter:n});else{const a=await g.getAction(e,z.getBlockNumber,"getBlockNumber")({});o&&o!==a?t=await g.getAction(e,U.getLogs,"getLogs")({address:b,args:d,event:u,events:m,fromBlock:o+1n,toBlock:a}):t=[],o=a}if(t.length===0)return;if(w)s.onLogs(t);else for(const a of t)s.onLogs([a])}catch(t){n&&t instanceof M.InvalidInputRpcError&&(i=!1),(r=s.onError)==null||r.call(s,t)}},{emitOnBegin:!0,interval:L});return async()=>{n&&await g.getAction(e,$.uninstallFilter,"uninstallFilter")({filter:n}),h()}})})():(()=>{let p=!0,s=()=>p=!1;return(async()=>{try{const o=(()=>{if(e.transport.type==="fallback"){const r=e.transport.transports.find(t=>t.config.type==="webSocket"||t.config.type==="ipc");return r?r.value:e.transport}return e.transport})(),n=m??(u?[u]:void 0);let i=[];n&&(i=[n.flatMap(t=>B.encodeEventTopics({abi:[t],eventName:t.name,args:d}))],u&&(i=i[0]));const{unsubscribe:h}=await o.subscribe({params:["logs",{address:b,topics:i}],onData(r){var a;if(!p)return;const t=r.result;try{const{eventName:l,args:v}=T.decodeEventLog({abi:n??[],data:t.data,topics:t.topics,strict:N}),y=I.formatLog(t,{args:v,eventName:l});q([y])}catch(l){let v,y;if(l instanceof A.DecodeLogDataMismatch||l instanceof A.DecodeLogTopicsMismatch){if(k)return;v=l.abiItem.name,y=(a=l.abiItem.inputs)==null?void 0:a.some(E=>!("name"in E&&E.name))}const D=I.formatLog(t,{args:y?[]:{},eventName:v});q([D])}},onError(r){c==null||c(r)}});s=h,p||s()}catch(o){c==null||c(o)}})(),()=>s()})()}exports.watchEvent=G;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("./index74.cjs"),w=require("./index104.cjs"),N=require("./index303.cjs"),h=require("./index304.cjs"),g=require("./index197.cjs"),m=require("./index134.cjs");function q(r,{emitOnBegin:b=!1,emitMissed:f=!1,onBlockNumber:p,onError:a,poll:i,pollingInterval:k=r.pollingInterval}){const B=typeof i<"u"?i:!(r.transport.type==="webSocket"||r.transport.type==="ipc"||r.transport.type==="fallback"&&(r.transport.transports[0].config.type==="webSocket"||r.transport.transports[0].config.type==="ipc"));let e;return B?(()=>{const l=g.stringify(["watchBlockNumber",r.uid,b,f,k]);return N.observe(l,{onBlockNumber:p,onError:a},o=>h.poll(async()=>{var u;try{const t=await w.getAction(r,m.getBlockNumber,"getBlockNumber")({cacheTime:0});if(e!==void 0){if(t===e)return;if(t-e>1&&f)for(let s=e+1n;s<t;s++)o.onBlockNumber(s,e),e=s}(e===void 0||t>e)&&(o.onBlockNumber(t,e),e=t)}catch(t){(u=o.onError)==null||u.call(o,t)}},{emitOnBegin:b,interval:k}))})():(()=>{const l=g.stringify(["watchBlockNumber",r.uid,b,f]);return N.observe(l,{onBlockNumber:p,onError:a},o=>{let u=!0,t=()=>u=!1;return(async()=>{try{const s=(()=>{if(r.transport.type==="fallback"){const c=r.transport.transports.find(n=>n.config.type==="webSocket"||n.config.type==="ipc");return c?c.value:r.transport}return r.transport})(),{unsubscribe:d}=await s.subscribe({params:["newHeads"],onData(c){var y;if(!u)return;const n=v.hexToBigInt((y=c.result)==null?void 0:y.number);o.onBlockNumber(n,e),e=n},onError(c){var n;(n=o.onError)==null||n.call(o,c)}});t=d,u||t()}catch(s){a==null||a(s)}})(),()=>t()})})()}exports.watchBlockNumber=q;

package/dist/index158.js

@@ -1,141 +1,78 @@
-import { DecodeLogDataMismatch as B, DecodeLogTopicsMismatch as C } from "./index174.js";
-import { InvalidInputRpcError as T } from "./index195.js";
-import { decodeEventLog as z } from "./index204.js";
-import { encodeEventTopics as A } from "./index212.js";
-import { formatLog as E } from "./index90.js";
-import { getAction as l } from "./index101.js";
-import { observe as O } from "./index299.js";
-import { poll as P } from "./index300.js";
-import { stringify as R } from "./index194.js";
-import { createEventFilter as U } from "./index121.js";
-import { getBlockNumber as j } from "./index131.js";
-import { getFilterChanges as q } from "./index137.js";
-import { getLogs as x } from "./index140.js";
-import { uninstallFilter as G } from "./index151.js";
-function at(e, { address: b, args: g, batch: k = !0, event: c, events: v, fromBlock: u, onError: f, onLogs: w, poll: N, pollingInterval: F = e.pollingInterval, strict: L }) {
-  const M = typeof N < "u" ? N : typeof u == "bigint" ? !0 : !(e.transport.type === "webSocket" || e.transport.type === "ipc" || e.transport.type === "fallback" && (e.transport.transports[0].config.type === "webSocket" || e.transport.transports[0].config.type === "ipc")), I = L ?? !1;
-  return M ? (() => {
-    const m = R([
-      "watchEvent",
+import { hexToBigInt as w } from "./index74.js";
+import { getAction as g } from "./index104.js";
+import { observe as y } from "./index303.js";
+import { poll as h } from "./index304.js";
+import { stringify as N } from "./index197.js";
+import { getBlockNumber as v } from "./index134.js";
+function j(r, { emitOnBegin: b = !1, emitMissed: p = !1, onBlockNumber: l, onError: a, poll: k, pollingInterval: i = r.pollingInterval }) {
+  const B = typeof k < "u" ? k : !(r.transport.type === "webSocket" || r.transport.type === "ipc" || r.transport.type === "fallback" && (r.transport.transports[0].config.type === "webSocket" || r.transport.transports[0].config.type === "ipc"));
+  let t;
+  return B ? (() => {
+    const f = N([
+      "watchBlockNumber",
+      r.uid,
       b,
-      g,
-      k,
-      e.uid,
-      c,
-      F,
-      u
+      p,
+      i
     ]);
-    return O(m, { onLogs: w, onError: f }, (n) => {
-      let a;
-      u !== void 0 && (a = u - 1n);
-      let r, i = !1;
-      const h = P(async () => {
-        var o;
-        if (!i) {
-          try {
-            r = await l(e, U, "createEventFilter")({
-              address: b,
-              args: g,
-              event: c,
-              events: v,
-              strict: I,
-              fromBlock: u
-            });
-          } catch {
-          }
-          i = !0;
-          return;
-        }
-        try {
-          let t;
-          if (r)
-            t = await l(e, q, "getFilterChanges")({ filter: r });
-          else {
-            const s = await l(e, j, "getBlockNumber")({});
-            a && a !== s ? t = await l(e, x, "getLogs")({
-              address: b,
-              args: g,
-              event: c,
-              events: v,
-              fromBlock: a + 1n,
-              toBlock: s
-            }) : t = [], a = s;
-          }
-          if (t.length === 0)
+    return y(f, { onBlockNumber: l, onError: a }, (e) => h(async () => {
+      var u;
+      try {
+        const o = await g(r, v, "getBlockNumber")({ cacheTime: 0 });
+        if (t !== void 0) {
+          if (o === t)
             return;
-          if (k)
-            n.onLogs(t);
-          else
-            for (const s of t)
-              n.onLogs([s]);
-        } catch (t) {
-          r && t instanceof T && (i = !1), (o = n.onError) == null || o.call(n, t);
+          if (o - t > 1 && p)
+            for (let s = t + 1n; s < o; s++)
+              e.onBlockNumber(s, t), t = s;
         }
-      }, {
-        emitOnBegin: !0,
-        interval: F
-      });
-      return async () => {
-        r && await l(e, G, "uninstallFilter")({ filter: r }), h();
-      };
-    });
+        (t === void 0 || o > t) && (e.onBlockNumber(o, t), t = o);
+      } catch (o) {
+        (u = e.onError) == null || u.call(e, o);
+      }
+    }, {
+      emitOnBegin: b,
+      interval: i
+    }));
   })() : (() => {
-    let m = !0, n = () => m = !1;
-    return (async () => {
-      try {
-        const a = (() => {
-          if (e.transport.type === "fallback") {
-            const o = e.transport.transports.find((t) => t.config.type === "webSocket" || t.config.type === "ipc");
-            return o ? o.value : e.transport;
-          }
-          return e.transport;
-        })(), r = v ?? (c ? [c] : void 0);
-        let i = [];
-        r && (i = [r.flatMap((t) => A({
-          abi: [t],
-          eventName: t.name,
-          args: g
-        }))], c && (i = i[0]));
-        const { unsubscribe: h } = await a.subscribe({
-          params: ["logs", { address: b, topics: i }],
-          onData(o) {
-            var s;
-            if (!m)
-              return;
-            const t = o.result;
-            try {
-              const { eventName: p, args: d } = z({
-                abi: r ?? [],
-                data: t.data,
-                topics: t.topics,
-                strict: I
-              }), y = E(t, { args: d, eventName: p });
-              w([y]);
-            } catch (p) {
-              let d, y;
-              if (p instanceof B || p instanceof C) {
-                if (L)
-                  return;
-                d = p.abiItem.name, y = (s = p.abiItem.inputs) == null ? void 0 : s.some((D) => !("name" in D && D.name));
-              }
-              const S = E(t, {
-                args: y ? [] : {},
-                eventName: d
-              });
-              w([S]);
+    const f = N([
+      "watchBlockNumber",
+      r.uid,
+      b,
+      p
+    ]);
+    return y(f, { onBlockNumber: l, onError: a }, (e) => {
+      let u = !0, o = () => u = !1;
+      return (async () => {
+        try {
+          const s = (() => {
+            if (r.transport.type === "fallback") {
+              const c = r.transport.transports.find((n) => n.config.type === "webSocket" || n.config.type === "ipc");
+              return c ? c.value : r.transport;
             }
-          },
-          onError(o) {
-            f == null || f(o);
-          }
-        });
-        n = h, m || n();
-      } catch (a) {
-        f == null || f(a);
-      }
-    })(), () => n();
+            return r.transport;
+          })(), { unsubscribe: d } = await s.subscribe({
+            params: ["newHeads"],
+            onData(c) {
+              var m;
+              if (!u)
+                return;
+              const n = w((m = c.result) == null ? void 0 : m.number);
+              e.onBlockNumber(n, t), t = n;
+            },
+            onError(c) {
+              var n;
+              (n = e.onError) == null || n.call(e, c);
+            }
+          });
+          o = d, u || o();
+        } catch (s) {
+          a == null || a(s);
+        }
+      })(), () => o();
+    });
   })();
 }
 export {
-  at as watchEvent
+  j as watchBlockNumber
 };

package/dist/index159.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("./index101.cjs"),f=require("./index299.cjs"),h=require("./index300.cjs"),P=require("./index194.cjs"),p=require("./index122.cjs"),y=require("./index137.cjs"),T=require("./index151.cjs");function w(e,{batch:l=!0,onError:s,onTransactions:g,poll:b,pollingInterval:d=e.pollingInterval}){return(typeof b<"u"?b:e.transport.type!=="webSocket"&&e.transport.type!=="ipc")?(()=>{const a=P.stringify(["watchPendingTransactions",e.uid,l,d]);return f.observe(a,{onTransactions:g,onError:s},n=>{let t;const r=h.poll(async()=>{var c;try{if(!t)try{t=await u.getAction(e,p.createPendingTransactionFilter,"createPendingTransactionFilter")({});return}catch(o){throw r(),o}const i=await u.getAction(e,y.getFilterChanges,"getFilterChanges")({filter:t});if(i.length===0)return;if(l)n.onTransactions(i);else for(const o of i)n.onTransactions([o])}catch(i){(c=n.onError)==null||c.call(n,i)}},{emitOnBegin:!0,interval:d});return async()=>{t&&await u.getAction(e,T.uninstallFilter,"uninstallFilter")({filter:t}),r()}})})():(()=>{let a=!0,n=()=>a=!1;return(async()=>{try{const{unsubscribe:t}=await e.transport.subscribe({params:["newPendingTransactions"],onData(r){if(!a)return;const c=r.result;g([c])},onError(r){s==null||s(r)}});n=t,a||n()}catch(t){s==null||s(t)}})(),()=>n()})()}exports.watchPendingTransactions=w;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./index104.cjs"),q=require("./index303.cjs"),A=require("./index304.cjs"),S=require("./index197.cjs"),p=require("./index133.cjs");function v(r,{blockTag:f=r.experimental_blockTag??"latest",emitMissed:k=!1,emitOnBegin:g=!1,onBlock:y,onError:u,includeTransactions:h,poll:d,pollingInterval:m=r.pollingInterval}){const B=typeof d<"u"?d:!(r.transport.type==="webSocket"||r.transport.type==="ipc"||r.transport.type==="fallback"&&(r.transport.transports[0].config.type==="webSocket"||r.transport.transports[0].config.type==="ipc")),o=h??!1;let t;return B?(()=>{const c=S.stringify(["watchBlocks",r.uid,f,k,g,o,m]);return q.observe(c,{onBlock:y,onError:u},s=>A.poll(async()=>{var a;try{const e=await i.getAction(r,p.getBlock,"getBlock")({blockTag:f,includeTransactions:o});if(e.number!==null&&(t==null?void 0:t.number)!=null){if(e.number===t.number)return;if(e.number-t.number>1&&k)for(let l=(t==null?void 0:t.number)+1n;l<e.number;l++){const n=await i.getAction(r,p.getBlock,"getBlock")({blockNumber:l,includeTransactions:o});s.onBlock(n,t),t=n}}((t==null?void 0:t.number)==null||f==="pending"&&(e==null?void 0:e.number)==null||e.number!==null&&e.number>t.number)&&(s.onBlock(e,t),t=e)}catch(e){(a=s.onError)==null||a.call(s,e)}},{emitOnBegin:g,interval:m}))})():(()=>{let c=!0,s=!0,a=()=>c=!1;return(async()=>{try{g&&i.getAction(r,p.getBlock,"getBlock")({blockTag:f,includeTransactions:o}).then(n=>{c&&s&&(y(n,void 0),s=!1)}).catch(u);const e=(()=>{if(r.transport.type==="fallback"){const n=r.transport.transports.find(b=>b.config.type==="webSocket"||b.config.type==="ipc");return n?n.value:r.transport}return r.transport})(),{unsubscribe:l}=await e.subscribe({params:["newHeads"],async onData(n){var w;if(!c)return;const b=await i.getAction(r,p.getBlock,"getBlock")({blockNumber:(w=n.result)==null?void 0:w.number,includeTransactions:o}).catch(()=>{});c&&(y(b,t),s=!1,t=b)},onError(n){u==null||u(n)}});a=l,c||a()}catch(e){u==null||u(e)}})(),()=>a()})()}exports.watchBlocks=v;

package/dist/index159.js

@@ -1,72 +1,92 @@
-import { getAction as u } from "./index101.js";
-import { observe as b } from "./index299.js";
-import { poll as d } from "./index300.js";
-import { stringify as h } from "./index194.js";
-import { createPendingTransactionFilter as P } from "./index122.js";
-import { getFilterChanges as m } from "./index137.js";
-import { uninstallFilter as w } from "./index151.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",
+import { getAction as p } from "./index104.js";
+import { observe as S } from "./index303.js";
+import { poll as x } from "./index304.js";
+import { stringify as N } from "./index197.js";
+import { getBlock as i } from "./index133.js";
+function j(e, { blockTag: l = e.experimental_blockTag ?? "latest", emitMissed: k = !1, emitOnBegin: m = !1, onBlock: y, onError: u, includeTransactions: h, poll: d, pollingInterval: w = e.pollingInterval }) {
+  const B = typeof d < "u" ? d : !(e.transport.type === "webSocket" || e.transport.type === "ipc" || e.transport.type === "fallback" && (e.transport.transports[0].config.type === "webSocket" || e.transport.transports[0].config.type === "ipc")), c = h ?? !1;
+  let t;
+  return B ? (() => {
+    const a = N([
+      "watchBlocks",
       e.uid,
       l,
-      p
+      k,
+      m,
+      c,
+      w
     ]);
-    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 S(a, { onBlock: y, onError: u }, (s) => x(async () => {
+      var o;
+      try {
+        const r = await p(e, i, "getBlock")({
+          blockTag: l,
+          includeTransactions: c
+        });
+        if (r.number !== null && (t == null ? void 0 : t.number) != null) {
+          if (r.number === t.number)
             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);
+          if (r.number - t.number > 1 && k)
+            for (let f = (t == null ? void 0 : t.number) + 1n; f < r.number; f++) {
+              const n = await p(e, i, "getBlock")({
+                blockNumber: f,
+                includeTransactions: c
+              });
+              s.onBlock(n, t), t = n;
+            }
         }
-      }, {
-        emitOnBegin: !0,
-        interval: p
-      });
-      return async () => {
-        n && await u(e, w, "uninstallFilter")({ filter: n }), a();
-      };
-    });
+        // If no previous block exists, emit.
+        ((t == null ? void 0 : t.number) == null || // If the block tag is "pending" with no block number, emit.
+        l === "pending" && (r == null ? void 0 : r.number) == null || // If the next block number is greater than the previous block number, emit.
+        // We don't want to emit blocks in the past.
+        r.number !== null && r.number > t.number) && (s.onBlock(r, t), t = r);
+      } catch (r) {
+        (o = s.onError) == null || o.call(s, r);
+      }
+    }, {
+      emitOnBegin: m,
+      interval: w
+    }));
   })() : (() => {
-    let r = !0, t = () => r = !1;
+    let a = !0, s = !0, o = () => a = !1;
     return (async () => {
       try {
-        const { unsubscribe: n } = await e.transport.subscribe({
-          params: ["newPendingTransactions"],
-          onData(a) {
-            if (!r)
+        m && p(e, i, "getBlock")({
+          blockTag: l,
+          includeTransactions: c
+        }).then((n) => {
+          a && s && (y(n, void 0), s = !1);
+        }).catch(u);
+        const r = (() => {
+          if (e.transport.type === "fallback") {
+            const n = e.transport.transports.find((b) => b.config.type === "webSocket" || b.config.type === "ipc");
+            return n ? n.value : e.transport;
+          }
+          return e.transport;
+        })(), { unsubscribe: f } = await r.subscribe({
+          params: ["newHeads"],
+          async onData(n) {
+            var g;
+            if (!a)
               return;
-            const o = a.result;
-            f([o]);
+            const b = await p(e, i, "getBlock")({
+              blockNumber: (g = n.result) == null ? void 0 : g.number,
+              includeTransactions: c
+            }).catch(() => {
+            });
+            a && (y(b, t), s = !1, t = b);
           },
-          onError(a) {
-            s == null || s(a);
+          onError(n) {
+            u == null || u(n);
           }
         });
-        t = n, r || t();
-      } catch (n) {
-        s == null || s(n);
+        o = f, a || o();
+      } catch (r) {
+        u == null || u(r);
       }
-    })(), () => t();
+    })(), () => o();
   })();
 }
 export {
-  I as watchPendingTransactions
+  j as watchBlocks
 };