@gardenfi/swap 0.1.0 → 0.1.1

package/dist/index155.js

@@ -1,78 +1,106 @@
-import { hexToBigInt as w } from "./index71.js";
-import { getAction as g } from "./index101.js";
-import { observe as y } from "./index300.js";
-import { poll as h } from "./index301.js";
-import { stringify as N } from "./index194.js";
-import { getBlockNumber as v } from "./index131.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,
-      p,
-      i
-    ]);
-    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 (o - t > 1 && p)
-            for (let s = t + 1n; s < o; s++)
-              e.onBlockNumber(s, t), t = s;
-        }
-        (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
-    }));
-  })() : (() => {
-    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;
-            }
-            return r.transport;
-          })(), { unsubscribe: d } = await s.subscribe({
-            params: ["newHeads"],
-            onData(c) {
-              var m;
-              if (!u)
+import { BlockNotFoundError as M } from "./index179.js";
+import { WaitForTransactionReceiptTimeoutError as O, TransactionNotFoundError as W, TransactionReceiptNotFoundError as q } from "./index187.js";
+import { getAction as u } from "./index101.js";
+import { observe as z } from "./index299.js";
+import { withResolvers as G } from "./index301.js";
+import { withRetry as B } from "./index239.js";
+import { stringify as H } from "./index195.js";
+import { getBlock as J } from "./index131.js";
+import { getTransaction as K } from "./index144.js";
+import { getTransactionReceipt as y } from "./index147.js";
+import { watchBlockNumber as L } from "./index156.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 {
+            if (r) {
+              if (a > 1 && (!r.blockNumber || d - r.blockNumber + 1n < a))
                 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);
+              p(() => e.resolve(r));
+              return;
             }
-          });
-          o = d, u || o();
-        } catch (s) {
-          a == null || a(s);
-        }
-      })(), () => o();
+            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;
+                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));
+              }
+            } else
+              p(() => e.reject(T));
+          }
+      }
     });
-  })();
+  }), x;
 }
 export {
-  j as watchBlockNumber
+  er as waitForTransactionReceipt
 };

package/dist/index156.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./index101.cjs"),q=require("./index300.cjs"),A=require("./index301.cjs"),S=require("./index194.cjs"),p=require("./index130.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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const v=require("./index71.cjs"),w=require("./index101.cjs"),N=require("./index299.cjs"),h=require("./index300.cjs"),g=require("./index195.cjs"),m=require("./index132.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/index156.js

@@ -1,92 +1,78 @@
-import { getAction as p } from "./index101.js";
-import { observe as S } from "./index300.js";
-import { poll as x } from "./index301.js";
-import { stringify as N } from "./index194.js";
-import { getBlock as i } from "./index130.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;
+import { hexToBigInt as w } from "./index71.js";
+import { getAction as g } from "./index101.js";
+import { observe as y } from "./index299.js";
+import { poll as h } from "./index300.js";
+import { stringify as N } from "./index195.js";
+import { getBlockNumber as v } from "./index132.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 a = N([
-      "watchBlocks",
-      e.uid,
-      l,
-      k,
-      m,
-      c,
-      w
+    const f = N([
+      "watchBlockNumber",
+      r.uid,
+      b,
+      p,
+      i
     ]);
-    return S(a, { onBlock: y, onError: u }, (s) => x(async () => {
-      var o;
+    return y(f, { onBlockNumber: l, onError: a }, (e) => h(async () => {
+      var u;
       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)
+        const o = await g(r, v, "getBlockNumber")({ cacheTime: 0 });
+        if (t !== void 0) {
+          if (o === t)
             return;
-          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;
-            }
+          if (o - t > 1 && p)
+            for (let s = t + 1n; s < o; s++)
+              e.onBlockNumber(s, t), t = s;
         }
-        // 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);
+        (t === void 0 || o > t) && (e.onBlockNumber(o, t), t = o);
+      } catch (o) {
+        (u = e.onError) == null || u.call(e, o);
       }
     }, {
-      emitOnBegin: m,
-      interval: w
+      emitOnBegin: b,
+      interval: i
     }));
   })() : (() => {
-    let a = !0, s = !0, o = () => a = !1;
-    return (async () => {
-      try {
-        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 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(n) {
-            u == null || u(n);
-          }
-        });
-        o = f, a || o();
-      } catch (r) {
-        u == null || u(r);
-      }
-    })(), () => o();
+    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;
+            }
+            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 {
-  j as watchBlocks
+  j as watchBlockNumber
 };

package/dist/index157.cjs

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

@@ -1,154 +1,92 @@
-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 "./index300.js";
-import { poll as R } from "./index301.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,
+import { getAction as p } from "./index101.js";
+import { observe as S } from "./index299.js";
+import { poll as x } from "./index300.js";
+import { stringify as N } from "./index195.js";
+import { getBlock as i } from "./index131.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,
+      k,
       m,
-      l
+      c,
+      w
     ]);
-    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) {
-          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 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 (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);
+          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: w
-      });
-      return async () => {
-        e && await g(t, G, "uninstallFilter")({ filter: e }), k();
-      };
-    });
+        // 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
+    }));
   })() : (() => {
-    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 () => {
+    let a = !0, s = !0, o = () => a = !1;
+    return (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;
+        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 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)
+          return e.transport;
+        })(), { unsubscribe: f } = await r.subscribe({
+          params: ["newHeads"],
+          async onData(n) {
+            var g;
+            if (!a)
               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)
-                  return;
-                y = i.abiItem.name, E = (I = i.abiItem.inputs) == null ? void 0 : I.some((B) => !("name" in B && B.name));
-              }
-              const M = F(o, {
-                args: E ? [] : {},
-                eventName: y
-              });
-              e.onLogs([M]);
-            }
+            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(r) {
-            var o;
-            (o = e.onError) == null || o.call(e, r);
+          onError(n) {
+            u == null || u(n);
           }
         });
-        a = d, n || a();
-      } catch (s) {
-        u == null || u(s);
+        o = f, a || o();
+      } catch (r) {
+        u == null || u(r);
       }
-    })(), () => a()));
+    })(), () => o();
   })();
 }
 export {
-  ct as watchContractEvent
+  j as watchBlocks
 };