@gardenfi/utils 2.1.2-beta.11 → 2.1.2-beta.13

package/dist/index93.js

@@ -1,49 +1,88 @@
-import { Eip712DomainNotFoundError as u } from "./index248.js";
-import { getAction as d } from "./index50.js";
-import { readContract as f } from "./index54.js";
-async function E(a, o) {
-  const { address: e, factory: r, factoryData: i } = o;
+import { parseAccount as N } from "./index48.js";
+import { BaseError as S } from "./index74.js";
+import { recoverAuthorizationAddress as _ } from "./index99.js";
+import { numberToHex as k } from "./index30.js";
+import { getEstimateGasError as I } from "./index100.js";
+import { extract as V } from "./index78.js";
+import { formatTransactionRequest as C } from "./index79.js";
+import { serializeStateOverride as j } from "./index81.js";
+import { assertRequest as D } from "./index82.js";
+import { prepareTransactionRequest as J } from "./index101.js";
+import { getBalance as K } from "./index102.js";
+async function st(r, i) {
+  var f, d, p;
+  const { account: u = r.account } = i, t = u ? N(u) : void 0;
   try {
-    const [n, t, s, c, m, p, y] = await d(a, f, "readContract")({
-      abi: g,
-      address: e,
-      functionName: "eip712Domain",
-      factory: r,
-      factoryData: i
-    });
-    return {
-      domain: {
-        name: t,
-        version: s,
-        chainId: Number(c),
-        verifyingContract: m,
-        salt: p
-      },
-      extensions: y,
-      fields: n
+    let x = function(c) {
+      const { block: s, request: e, rpcStateOverride: o } = c;
+      return r.request({
+        method: "eth_estimateGas",
+        params: o ? [e, s ?? "latest", o] : s ? [e, s] : [e]
+      });
     };
+    const { accessList: n, authorizationList: a, blobs: y, blobVersionedHashes: z, blockNumber: h, blockTag: P, data: l, gas: g, gasPrice: B, maxFeePerBlobGas: H, maxFeePerGas: F, maxPriorityFeePerGas: L, nonce: O, value: R, stateOverride: T, ...m } = await J(r, {
+      ...i,
+      parameters: (
+        // Some RPC Providers do not compute versioned hashes from blobs. We will need
+        // to compute them.
+        (t == null ? void 0 : t.type) === "local" ? void 0 : ["blobVersionedHashes"]
+      )
+    }), b = (h ? k(h) : void 0) || P, w = j(T), A = await (async () => {
+      if (m.to)
+        return m.to;
+      if (a && a.length > 0)
+        return await _({
+          authorization: a[0]
+        }).catch(() => {
+          throw new S("`to` is required. Could not infer from `authorizationList`");
+        });
+    })();
+    D(i);
+    const q = (p = (d = (f = r.chain) == null ? void 0 : f.formatters) == null ? void 0 : d.transactionRequest) == null ? void 0 : p.format, v = (q || C)({
+      // Pick out extra data that might exist on the chain's transaction request type.
+      ...V(m, { format: q }),
+      from: t == null ? void 0 : t.address,
+      accessList: n,
+      authorizationList: a,
+      blobs: y,
+      blobVersionedHashes: z,
+      data: l,
+      gas: g,
+      gasPrice: B,
+      maxFeePerBlobGas: H,
+      maxFeePerGas: F,
+      maxPriorityFeePerGas: L,
+      nonce: O,
+      to: A,
+      value: R
+    });
+    let G = BigInt(await x({ block: b, request: v, rpcStateOverride: w }));
+    if (a) {
+      const c = await K(r, { address: v.from }), s = await Promise.all(a.map(async (e) => {
+        const { address: o } = e, E = await x({
+          block: b,
+          request: {
+            authorizationList: void 0,
+            data: l,
+            from: t == null ? void 0 : t.address,
+            to: o,
+            value: k(c)
+          },
+          rpcStateOverride: w
+        }).catch(() => 100000n);
+        return 2n * BigInt(E);
+      }));
+      G += s.reduce((e, o) => e + o, 0n);
+    }
+    return G;
   } catch (n) {
-    const t = n;
-    throw t.name === "ContractFunctionExecutionError" && t.cause.name === "ContractFunctionZeroDataError" ? new u({ address: e }) : t;
+    throw I(n, {
+      ...i,
+      account: t,
+      chain: r.chain
+    });
   }
 }
-const g = [
-  {
-    inputs: [],
-    name: "eip712Domain",
-    outputs: [
-      { name: "fields", type: "bytes1" },
-      { name: "name", type: "string" },
-      { name: "version", type: "string" },
-      { name: "chainId", type: "uint256" },
-      { name: "verifyingContract", type: "address" },
-      { name: "salt", type: "bytes32" },
-      { name: "extensions", type: "uint256[]" }
-    ],
-    stateMutability: "view",
-    type: "function"
-  }
-];
 export {
-  E as getEip712Domain
+  st as estimateGas
 };

package/dist/index94.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./index30.cjs"),a=require("./index249.cjs");async function H(r,{blockCount:s,blockNumber:e,blockTag:n="latest",rewardPercentiles:i}){const t=e?o.numberToHex(e):void 0,u=await r.request({method:"eth_feeHistory",params:[o.numberToHex(s),t||n,i]},{dedupe:!!t});return a.formatFeeHistory(u)}exports.getFeeHistory=H;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("./index95.cjs"),G=require("./index63.cjs"),b=require("./index96.cjs"),p=require("./index97.cjs"),y=require("./index98.cjs");async function k(s,o){return m(s,o)}async function m(s,o){var f,g;const{block:i,chain:t=s.chain,request:e,type:l="eip1559"}=o||{},n=await(async()=>{var r,a;return typeof((r=t==null?void 0:t.fees)==null?void 0:r.baseFeeMultiplier)=="function"?t.fees.baseFeeMultiplier({block:i,client:s,request:e}):((a=t==null?void 0:t.fees)==null?void 0:a.baseFeeMultiplier)??1.2})();if(n<1)throw new u.BaseFeeScalarError;const F=10**(((f=n.toString().split(".")[1])==null?void 0:f.length)??0),c=r=>r*BigInt(Math.ceil(n*F))/BigInt(F),P=i||await G.getAction(s,p.getBlock,"getBlock")({});if(typeof((g=t==null?void 0:t.fees)==null?void 0:g.estimateFeesPerGas)=="function"){const r=await t.fees.estimateFeesPerGas({block:i,client:s,multiply:c,request:e,type:l});if(r!==null)return r}if(l==="eip1559"){if(typeof P.baseFeePerGas!="bigint")throw new u.Eip1559FeesNotSupportedError;const r=typeof(e==null?void 0:e.maxPriorityFeePerGas)=="bigint"?e.maxPriorityFeePerGas:await b.internal_estimateMaxPriorityFeePerGas(s,{block:P,chain:t,request:e}),a=c(P.baseFeePerGas);return{maxFeePerGas:(e==null?void 0:e.maxFeePerGas)??a+r,maxPriorityFeePerGas:r}}return{gasPrice:(e==null?void 0:e.gasPrice)??c(await G.getAction(s,y.getGasPrice,"getGasPrice")({}))}}exports.estimateFeesPerGas=k;exports.internal_estimateFeesPerGas=m;

package/dist/index94.js

@@ -1,16 +1,53 @@
-import { numberToHex as o } from "./index30.js";
-import { formatFeeHistory as m } from "./index249.js";
-async function H(r, { blockCount: n, blockNumber: e, blockTag: s = "latest", rewardPercentiles: i }) {
-  const t = e ? o(e) : void 0, a = await r.request({
-    method: "eth_feeHistory",
-    params: [
-      o(n),
-      t || s,
-      i
-    ]
-  }, { dedupe: !!t });
-  return m(a);
+import { BaseFeeScalarError as G, Eip1559FeesNotSupportedError as b } from "./index95.js";
+import { getAction as F } from "./index63.js";
+import { internal_estimateMaxPriorityFeePerGas as g } from "./index96.js";
+import { getBlock as y } from "./index97.js";
+import { getGasPrice as u } from "./index98.js";
+async function I(a, o) {
+  return w(a, o);
+}
+async function w(a, o) {
+  var P, p;
+  const { block: i, chain: t = a.chain, request: e, type: m = "eip1559" } = o || {}, n = await (async () => {
+    var r, s;
+    return typeof ((r = t == null ? void 0 : t.fees) == null ? void 0 : r.baseFeeMultiplier) == "function" ? t.fees.baseFeeMultiplier({
+      block: i,
+      client: a,
+      request: e
+    }) : ((s = t == null ? void 0 : t.fees) == null ? void 0 : s.baseFeeMultiplier) ?? 1.2;
+  })();
+  if (n < 1)
+    throw new G();
+  const l = 10 ** (((P = n.toString().split(".")[1]) == null ? void 0 : P.length) ?? 0), c = (r) => r * BigInt(Math.ceil(n * l)) / BigInt(l), f = i || await F(a, y, "getBlock")({});
+  if (typeof ((p = t == null ? void 0 : t.fees) == null ? void 0 : p.estimateFeesPerGas) == "function") {
+    const r = await t.fees.estimateFeesPerGas({
+      block: i,
+      client: a,
+      multiply: c,
+      request: e,
+      type: m
+    });
+    if (r !== null)
+      return r;
+  }
+  if (m === "eip1559") {
+    if (typeof f.baseFeePerGas != "bigint")
+      throw new b();
+    const r = typeof (e == null ? void 0 : e.maxPriorityFeePerGas) == "bigint" ? e.maxPriorityFeePerGas : await g(a, {
+      block: f,
+      chain: t,
+      request: e
+    }), s = c(f.baseFeePerGas);
+    return {
+      maxFeePerGas: (e == null ? void 0 : e.maxFeePerGas) ?? s + r,
+      maxPriorityFeePerGas: r
+    };
+  }
+  return {
+    gasPrice: (e == null ? void 0 : e.gasPrice) ?? c(await F(a, u, "getGasPrice")({}))
+  };
 }
 export {
-  H as getFeeHistory
+  I as estimateFeesPerGas,
+  w as internal_estimateFeesPerGas
 };

package/dist/index95.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./index194.cjs"),a=require("./index173.cjs");async function i(g,{filter:t}){const n="strict"in t&&t.strict,e=await t.request({method:"eth_getFilterChanges",params:[t.id]});if(typeof e[0]=="string")return e;const s=e.map(o=>a.formatLog(o));return!("abi"in t)||!t.abi?s:r.parseEventLogs({abi:t.abi,logs:s,strict:n})}exports.getFilterChanges=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./index212.cjs"),e=require("./index74.cjs");class a extends e.BaseError{constructor(){super("`baseFeeMultiplier` must be greater than 1.",{name:"BaseFeeScalarError"})}}class t extends e.BaseError{constructor(){super("Chain does not support EIP-1559 fees.",{name:"Eip1559FeesNotSupportedError"})}}class n extends e.BaseError{constructor({maxPriorityFeePerGas:o}){super(`\`maxFeePerGas\` cannot be less than the \`maxPriorityFeePerGas\` (${s.formatGwei(o)} gwei).`,{name:"MaxFeePerGasTooLowError"})}}exports.BaseFeeScalarError=a;exports.Eip1559FeesNotSupportedError=t;exports.MaxFeePerGasTooLowError=n;

package/dist/index95.js

@@ -1,19 +1,26 @@
-import { parseEventLogs as a } from "./index194.js";
-import { formatLog as i } from "./index173.js";
-async function m(e, { filter: t }) {
-  const n = "strict" in t && t.strict, o = await t.request({
-    method: "eth_getFilterChanges",
-    params: [t.id]
-  });
-  if (typeof o[0] == "string")
-    return o;
-  const s = o.map((r) => i(r));
-  return !("abi" in t) || !t.abi ? s : a({
-    abi: t.abi,
-    logs: s,
-    strict: n
-  });
+import { formatGwei as s } from "./index212.js";
+import { BaseError as e } from "./index74.js";
+class n extends e {
+  constructor() {
+    super("`baseFeeMultiplier` must be greater than 1.", {
+      name: "BaseFeeScalarError"
+    });
+  }
+}
+class p extends e {
+  constructor() {
+    super("Chain does not support EIP-1559 fees.", {
+      name: "Eip1559FeesNotSupportedError"
+    });
+  }
+}
+class c extends e {
+  constructor({ maxPriorityFeePerGas: o }) {
+    super(`\`maxFeePerGas\` cannot be less than the \`maxPriorityFeePerGas\` (${s(o)} gwei).`, { name: "MaxFeePerGasTooLowError" });
+  }
 }
 export {
-  m as getFilterChanges
+  n as BaseFeeScalarError,
+  p as Eip1559FeesNotSupportedError,
+  c as MaxFeePerGasTooLowError
 };

package/dist/index96.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./index194.cjs"),a=require("./index173.cjs");async function g(n,{filter:t}){const o=t.strict??!1,e=(await t.request({method:"eth_getFilterLogs",params:[t.id]})).map(s=>a.formatLog(s));return t.abi?r.parseEventLogs({abi:t.abi,logs:e,strict:o}):e}exports.getFilterLogs=g;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("./index95.cjs"),m=require("./index41.cjs"),n=require("./index63.cjs"),y=require("./index97.cjs"),G=require("./index98.cjs");async function F(e,i){return f(e,i)}async function f(e,i){var c,P;const{block:a,chain:t=e.chain,request:g}=i||{};try{const r=((c=t==null?void 0:t.fees)==null?void 0:c.maxPriorityFeePerGas)??((P=t==null?void 0:t.fees)==null?void 0:P.defaultPriorityFee);if(typeof r=="function"){const o=a||await n.getAction(e,y.getBlock,"getBlock")({}),u=await r({block:o,client:e,request:g});if(u===null)throw new Error;return u}if(typeof r<"u")return r;const s=await e.request({method:"eth_maxPriorityFeePerGas"});return m.hexToBigInt(s)}catch{const[r,s]=await Promise.all([a?Promise.resolve(a):n.getAction(e,y.getBlock,"getBlock")({}),n.getAction(e,G.getGasPrice,"getGasPrice")({})]);if(typeof r.baseFeePerGas!="bigint")throw new l.Eip1559FeesNotSupportedError;const o=s-r.baseFeePerGas;return o<0n?0n:o}}exports.estimateMaxPriorityFeePerGas=F;exports.internal_estimateMaxPriorityFeePerGas=f;

package/dist/index96.js

@@ -1,16 +1,44 @@
-import { parseEventLogs as a } from "./index194.js";
-import { formatLog as e } from "./index173.js";
-async function c(g, { filter: t }) {
-  const s = t.strict ?? !1, o = (await t.request({
-    method: "eth_getFilterLogs",
-    params: [t.id]
-  })).map((r) => e(r));
-  return t.abi ? a({
-    abi: t.abi,
-    logs: o,
-    strict: s
-  }) : o;
+import { Eip1559FeesNotSupportedError as y } from "./index95.js";
+import { hexToBigInt as p } from "./index41.js";
+import { getAction as n } from "./index63.js";
+import { getBlock as c } from "./index97.js";
+import { getGasPrice as F } from "./index98.js";
+async function k(e, i) {
+  return G(e, i);
+}
+async function G(e, i) {
+  var P, m;
+  const { block: a, chain: t = e.chain, request: u } = i || {};
+  try {
+    const r = ((P = t == null ? void 0 : t.fees) == null ? void 0 : P.maxPriorityFeePerGas) ?? ((m = t == null ? void 0 : t.fees) == null ? void 0 : m.defaultPriorityFee);
+    if (typeof r == "function") {
+      const o = a || await n(e, c, "getBlock")({}), f = await r({
+        block: o,
+        client: e,
+        request: u
+      });
+      if (f === null)
+        throw new Error();
+      return f;
+    }
+    if (typeof r < "u")
+      return r;
+    const s = await e.request({
+      method: "eth_maxPriorityFeePerGas"
+    });
+    return p(s);
+  } catch {
+    const [r, s] = await Promise.all([
+      a ? Promise.resolve(a) : n(e, c, "getBlock")({}),
+      n(e, F, "getGasPrice")({})
+    ]);
+    if (typeof r.baseFeePerGas != "bigint")
+      throw new y();
+    const o = s - r.baseFeePerGas;
+    return o < 0n ? 0n : o;
+  }
 }
 export {
-  c as getFilterLogs
+  k as estimateMaxPriorityFeePerGas,
+  G as internal_estimateMaxPriorityFeePerGas
 };

package/dist/index97.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});async function r(e){const t=await e.request({method:"eth_gasPrice"});return BigInt(t)}exports.getGasPrice=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("./index104.cjs"),m=require("./index30.cjs"),k=require("./index105.cjs");async function B(t,{blockHash:o,blockNumber:r,blockTag:l,includeTransactions:i}={}){var c,s,u;const d=l??"latest",n=i??!1,a=r!==void 0?m.numberToHex(r):void 0;let e=null;if(o?e=await t.request({method:"eth_getBlockByHash",params:[o,n]},{dedupe:!0}):e=await t.request({method:"eth_getBlockByNumber",params:[a||d,n]},{dedupe:!!a}),!e)throw new f.BlockNotFoundError({blockHash:o,blockNumber:r});return(((u=(s=(c=t.chain)==null?void 0:c.formatters)==null?void 0:s.block)==null?void 0:u.format)||k.formatBlock)(e)}exports.getBlock=B;

package/dist/index97.js

@@ -1,9 +1,20 @@
-async function r(e) {
-  const t = await e.request({
-    method: "eth_gasPrice"
-  });
-  return BigInt(t);
+import { BlockNotFoundError as i } from "./index104.js";
+import { numberToHex as l } from "./index30.js";
+import { formatBlock as p } from "./index105.js";
+async function T(e, { blockHash: t, blockNumber: r, blockTag: f, includeTransactions: u } = {}) {
+  var m, s, c;
+  const d = f ?? "latest", a = u ?? !1, n = r !== void 0 ? l(r) : void 0;
+  let o = null;
+  if (t ? o = await e.request({
+    method: "eth_getBlockByHash",
+    params: [t, a]
+  }, { dedupe: !0 }) : o = await e.request({
+    method: "eth_getBlockByNumber",
+    params: [n || d, a]
+  }, { dedupe: !!n }), !o)
+    throw new i({ blockHash: t, blockNumber: r });
+  return (((c = (s = (m = e.chain) == null ? void 0 : m.formatters) == null ? void 0 : s.block) == null ? void 0 : c.format) || p)(o);
 }
 export {
-  r as getGasPrice
+  T as getBlock
 };

package/dist/index98.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("./index190.cjs"),q=require("./index194.cjs"),m=require("./index30.cjs"),y=require("./index173.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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});async function r(e){const t=await e.request({method:"eth_gasPrice"});return BigInt(t)}exports.getGasPrice=r;

package/dist/index98.js

@@ -1,38 +1,9 @@
-import { encodeEventTopics as h } from "./index190.js";
-import { parseEventLogs as l } from "./index194.js";
-import { numberToHex as u } from "./index30.js";
-import { formatLog as y } from "./index173.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
-      }
-    ]
+async function r(e) {
+  const t = await e.request({
+    method: "eth_gasPrice"
   });
-  const p = s.map((d) => y(d));
-  return e ? l({
-    abi: e,
-    args: g,
-    logs: p,
-    strict: b
-  }) : p;
+  return BigInt(t);
 }
 export {
-  T as getLogs
+  r as getGasPrice
 };

package/dist/index99.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./index30.cjs"),u=require("./index256.cjs");async function i(o,{address:t,blockNumber:e,blockTag:r,storageKeys:n}){const a=r??"latest",c=e!==void 0?s.numberToHex(e):void 0,f=await o.request({method:"eth_getProof",params:[t,n,c||a]});return u.formatProof(f)}exports.getProof=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./index185.cjs"),s=require("./index43.cjs");async function i(e){const{authorization:r,signature:t}=e;return o.recoverAddress({hash:s.hashAuthorization(r),signature:t??r})}exports.recoverAuthorizationAddress=i;

package/dist/index99.js

@@ -1,12 +1,12 @@
-import { numberToHex as c } from "./index30.js";
-import { formatProof as s } from "./index256.js";
-async function d(t, { address: e, blockNumber: o, blockTag: r, storageKeys: n }) {
-  const f = r ?? "latest", a = o !== void 0 ? c(o) : void 0, m = await t.request({
-    method: "eth_getProof",
-    params: [e, n, a || f]
+import { recoverAddress as i } from "./index185.js";
+import { hashAuthorization as e } from "./index43.js";
+async function a(o) {
+  const { authorization: r, signature: t } = o;
+  return i({
+    hash: e(r),
+    signature: t ?? r
   });
-  return s(m);
 }
 export {
-  d as getProof
+  a as recoverAuthorizationAddress
 };

package/dist/src/lib/digestKey/digestKey.d.ts

@@ -1,9 +1,11 @@
+import { Err, Ok } from '../result';
+
 export declare class DigestKey {
     private _digestKey;
     private _userId;
     constructor(digestKey: string);
-    static from(digestKey: string): import('../result').Result<never, string> | import('../result').Result<DigestKey, never>;
-    static generateRandom(): import('../result').Result<never, string> | import('../result').Result<DigestKey, never>;
+    static from(digestKey: string): Err<string> | Ok<DigestKey>;
+    static generateRandom(): Err<string> | Ok<DigestKey>;
     private static isValidDigestKey;
     private static isValidPrivateKey;
     private static generateRandomDigestKey;

package/dist/src/lib/result.d.ts

@@ -1,16 +1,20 @@
-export declare class Result<T, E> {
-    #private;
-    constructor(ok: boolean, val: T, error?: E | undefined);
-    get ok(): boolean;
-    get error(): E | undefined;
-    get val(): T;
-}
+export type Ok<T> = {
+    ok: true;
+    val: T;
+    error?: undefined;
+};
+export type Err<E> = {
+    ok: false;
+    val?: undefined;
+    error: E;
+};
+export type Result<T, E> = Ok<T> | Err<E>;
+export declare const Ok: <T>(val: T) => Ok<T>;
 export type AsyncResult<T, E> = Promise<Result<T, E>>;
-export declare const Ok: <T>(val: T) => Result<T, never>;
 export declare const Void: undefined;
 /**
  * Constructs an error result with the given error value.
  *
  * If the error value is a string, it can be followed by any number of optional messages which will be concatenated
  */
-export declare const Err: <E>(error: E, ...optionalMsg: (E extends string ? any : never)[]) => Result<never, E>;
+export declare const Err: <E>(error: E, ...optionalMsg: (E extends string ? any : never)[]) => Err<E>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/utils",
-  "version": "2.1.2-beta.11",
+  "version": "2.1.2-beta.13",
   "type": "module",
   "scripts": {
     "build": "vite build",