@gardenfi/utils 2.1.1 → 2.1.2

package/dist/index9.js

@@ -1,56 +1,64 @@
-import { CookieJar as f } from "tough-cookie";
+import { CookieJar as u } from "tough-cookie";
 import m from "fetch-cookie";
-import { Ok as a, Err as r } from "./index17.js";
-import { MemoryStorage as u } from "./index13.js";
-import { StoreKeys as w } from "./index14.js";
-import { createWalletClient as g, http as p } from "viem";
-import { add0x as k, parseJwt as y, Authorization as C } from "./index3.js";
+import { Ok as s, Err as r } from "./index17.js";
+import { MemoryStorage as w } from "./index13.js";
+import { StoreKeys as d } from "./index14.js";
+import { createWalletClient as g, http as k } from "viem";
+import { add0x as p, parseJwt as y, Authorization as C } from "./index3.js";
 import { mainnet as T } from "./index20.js";
 import { privateKeyToAccount as v } from "./index19.js";
 import { createSiweMessage as S } from "./index21.js";
-class d {
+class f {
   constructor(e, n, t) {
-    if (this.url = e.endpoint("siwe"), this.walletClient = n, this.domain = (t == null ? void 0 : t.domain) || "app.garden.finance", this.domain.startsWith("https://") && (this.domain = this.domain.split("https://")[1]), this.signingStatement = (t == null ? void 0 : t.signingStatement) ?? "Garden.fi", this.store = (t == null ? void 0 : t.store) ?? (typeof window < "u" ? window.localStorage : new u()), typeof window > "u") {
-      const i = new f();
+    if (this.url = e.endpoint("siwe"), this.walletClient = n, this.domain = (t == null ? void 0 : t.domain) || "app.garden.finance", this.domain.startsWith("https://") && (this.domain = this.domain.split("https://")[1]), this.signingStatement = (t == null ? void 0 : t.signingStatement) ?? "Garden.fi", this.store = (t == null ? void 0 : t.store) ?? (typeof window < "u" ? window.localStorage : new w()), typeof window > "u") {
+      const i = new u();
       this.fetchWithCookies = m(fetch, i);
     } else
       this.fetchWithCookies = window.fetch.bind(window);
   }
   static fromDigestKey(e, n, t) {
     const i = g({
-      account: v(k(n.digestKey)),
-      transport: p(),
+      account: v(p(n.digestKey)),
+      transport: k(),
       chain: T
     });
-    return new d(e, i, t);
+    return new f(e, i, t);
   }
   verifyToken(e, n) {
     try {
       const t = y(e);
-      if (!t) return a(!1);
+      if (!t) return s(!1);
       const i = Math.floor(Date.now() / 1e3) + 120;
-      return a(
+      return s(
         t.exp > i && t.user_id.toLowerCase() === n.toLowerCase()
       );
     } catch {
-      return a(!1);
+      return s(!1);
     }
   }
   async getToken() {
-    var i;
-    if (!((i = this.walletClient.account) != null && i.address))
+    var c;
+    if (!((c = this.walletClient.account) != null && c.address))
       return r("Wallet client does not have an account");
-    const e = await this.signStatement();
-    if (e.error)
-      return r(e.error);
-    let n;
+    const e = this.store.getItem(d.AUTH_TOKEN);
+    if (e) {
+      const o = this.verifyToken(
+        e,
+        this.walletClient.account.address
+      );
+      if (o.ok && o.val) return s(e);
+    }
+    const n = await this.signStatement();
+    if (n.error)
+      return r(n.error);
+    let t;
     try {
-      const o = await (await this.fetchWithCookies(
+      const a = await (await this.fetchWithCookies(
         this.url.endpoint("tokens"),
         {
           method: "POST",
           body: JSON.stringify({
-            ...e.val
+            ...n.val
           }),
           headers: {
             "Content-Type": "application/json"
@@ -58,37 +66,37 @@ class d {
           credentials: "include"
         }
       )).json();
-      if (o.error || !o.result)
-        return r(o.error ?? "Failed to get token");
-      n = o.result;
-    } catch (s) {
-      return r("Failed to get token", s);
+      if (a.error || !a.result)
+        return r(a.error ?? "Failed to get token");
+      t = a.result;
+    } catch (o) {
+      return r("Failed to get token", o);
     }
-    if (!this.verifyToken(n, this.walletClient.account.address).val)
+    if (!this.verifyToken(t, this.walletClient.account.address).val)
       throw new Error("Token verification failed");
-    return this.store.setItem(w.AUTH_TOKEN, n), a(n);
+    return this.store.setItem(d.AUTH_TOKEN, t), s(t);
   }
   async signStatement() {
-    var l;
-    if (!((l = this.walletClient.account) != null && l.address))
+    var a;
+    if (!((a = this.walletClient.account) != null && a.address))
       return r("Wallet client does not have a valid account");
     const e = /* @__PURE__ */ new Date(), n = new Date(e.getTime() + 300 * 1e3);
     let t;
     try {
-      const c = await (await this.fetchWithCookies(this.url.endpoint("challenges"), {
+      const l = await (await this.fetchWithCookies(this.url.endpoint("challenges"), {
         method: "POST",
         headers: {
           "Content-Type": "application/json"
         },
         credentials: "include"
       })).json();
-      if (c.error || !c.result)
+      if (l.error || !l.result)
         return r("Failed to get nonce");
-      t = c.result;
+      t = l.result;
     } catch (h) {
       return r("Failed to get nonce", h);
     }
-    const i = await this.walletClient.getChainId(), s = S({
+    const i = await this.walletClient.getChainId(), c = S({
       domain: this.domain,
       address: this.walletClient.account.address,
       statement: this.signingStatement,
@@ -99,19 +107,19 @@ class d {
       notBefore: n
     }), o = await this.walletClient.signMessage({
       account: this.walletClient.account,
-      message: s
+      message: c
     });
-    return a({
-      message: s,
+    return s({
+      message: c,
       signature: o,
       nonce: t
     });
   }
   async getAuthHeaders() {
     const e = await this.getToken();
-    return e.error ? r(e.error) : a({ Authorization: C(e.val) });
+    return e.error ? r(e.error) : s({ Authorization: C(e.val) });
   }
 }
 export {
-  d as Siwe
+  f as Siwe
 };

package/dist/index91.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index65.cjs");class i extends e.BaseError{constructor({chainId:r}){super(typeof r=="number"?`Chain ID "${r}" is invalid.`:"Chain ID is invalid.",{name:"InvalidChainIdError"})}}exports.InvalidChainIdError=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const e=require("./index71.cjs");class i extends e.BaseError{constructor({chainId:r}){super(typeof r=="number"?`Chain ID "${r}" is invalid.`:"Chain ID is invalid.",{name:"InvalidChainIdError"})}}exports.InvalidChainIdError=i;

package/dist/index91.js

@@ -1,4 +1,4 @@
-import { BaseError as i } from "./index65.js";
+import { BaseError as i } from "./index71.js";
 class o extends i {
   constructor({ chainId: r }) {
     super(typeof r == "number" ? `Chain ID "${r}" is invalid.` : "Chain ID is invalid.", { name: "InvalidChainIdError" });

package/dist/index93.cjs

@@ -1,4 +1,4 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./index75.cjs"),n=require("./index65.cjs");class o extends n.BaseError{constructor({expectedLength:r,givenLength:e,type:t}){super([`ABI encoding array length mismatch for type ${t}.`,`Expected length: ${r}`,`Given length: ${e}`].join(`
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./index89.cjs"),n=require("./index71.cjs");class o extends n.BaseError{constructor({expectedLength:r,givenLength:e,type:t}){super([`ABI encoding array length mismatch for type ${t}.`,`Expected length: ${r}`,`Given length: ${e}`].join(`
 `),{name:"AbiEncodingArrayLengthMismatchError"})}}class a extends n.BaseError{constructor({expectedSize:r,value:e}){super(`Size of bytes "${e}" (bytes${i.size(e)}) does not match expected size (bytes${r}).`,{name:"AbiEncodingBytesSizeMismatchError"})}}class c extends n.BaseError{constructor({expectedLength:r,givenLength:e}){super(["ABI encoding params/values length mismatch.",`Expected length (params): ${r}`,`Given length (values): ${e}`].join(`
 `),{name:"AbiEncodingLengthMismatchError"})}}class d extends n.BaseError{constructor({expectedSize:r,givenSize:e}){super(`Expected bytes${r}, got bytes${e}.`,{name:"BytesSizeMismatchError"})}}class E extends n.BaseError{constructor(r,{docsPath:e}){super([`Type "${r}" is not a valid encoding type.`,"Please provide a valid ABI type."].join(`
 `),{docsPath:e,name:"InvalidAbiEncodingType"})}}class g extends n.BaseError{constructor(r){super([`Value "${r}" is not a valid array.`].join(`

package/dist/index93.js

@@ -1,5 +1,5 @@
-import { size as i } from "./index75.js";
-import { BaseError as n } from "./index65.js";
+import { size as i } from "./index89.js";
+import { BaseError as n } from "./index71.js";
 class c extends n {
   constructor({ expectedLength: e, givenLength: r, type: s }) {
     super([

package/dist/index94.cjs

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("./index95.cjs"),t=require("./index65.cjs");class i extends t.BaseError{constructor({cause:r,maxFeePerGas:e}={}){super(`The fee cap (\`maxFeePerGas\`${e?` = ${a.formatGwei(e)} gwei`:""}) cannot be higher than the maximum allowed value (2^256-1).`,{cause:r,name:"FeeCapTooHighError"})}}Object.defineProperty(i,"nodeMessage",{enumerable:!0,configurable:!0,writable:!0,value:/max fee per gas higher than 2\^256-1|fee cap higher than 2\^256-1/});class n extends t.BaseError{constructor({cause:r,maxPriorityFeePerGas:e,maxFeePerGas:o}={}){super([`The provided tip (\`maxPriorityFeePerGas\`${e?` = ${a.formatGwei(e)} gwei`:""}) cannot be higher than the fee cap (\`maxFeePerGas\`${o?` = ${a.formatGwei(o)} gwei`:""}).`].join(`
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("./index95.cjs"),t=require("./index71.cjs");class i extends t.BaseError{constructor({cause:r,maxFeePerGas:e}={}){super(`The fee cap (\`maxFeePerGas\`${e?` = ${a.formatGwei(e)} gwei`:""}) cannot be higher than the maximum allowed value (2^256-1).`,{cause:r,name:"FeeCapTooHighError"})}}Object.defineProperty(i,"nodeMessage",{enumerable:!0,configurable:!0,writable:!0,value:/max fee per gas higher than 2\^256-1|fee cap higher than 2\^256-1/});class n extends t.BaseError{constructor({cause:r,maxPriorityFeePerGas:e,maxFeePerGas:o}={}){super([`The provided tip (\`maxPriorityFeePerGas\`${e?` = ${a.formatGwei(e)} gwei`:""}) cannot be higher than the fee cap (\`maxFeePerGas\`${o?` = ${a.formatGwei(o)} gwei`:""}).`].join(`
 `),{cause:r,name:"TipAboveFeeCapError"})}}Object.defineProperty(n,"nodeMessage",{enumerable:!0,configurable:!0,writable:!0,value:/max priority fee per gas higher than max fee per gas|tip higher than fee cap/});exports.FeeCapTooHighError=i;exports.TipAboveFeeCapError=n;

package/dist/index94.js

@@ -1,5 +1,5 @@
 import { formatGwei as a } from "./index95.js";
-import { BaseError as o } from "./index65.js";
+import { BaseError as o } from "./index71.js";
 class n extends o {
   constructor({ cause: r, maxFeePerGas: e } = {}) {
     super(`The fee cap (\`maxFeePerGas\`${e ? ` = ${a(e)} gwei` : ""}) cannot be higher than the maximum allowed value (2^256-1).`, {

package/dist/index98.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./index118.cjs"),y=require("./index111.cjs"),u=require("./index108.cjs"),B=require("./index75.cjs"),h=require("./index36.cjs"),d=require("./index24.cjs");function f(t){const a=t.to??(typeof t.data=="string"?"hex":"bytes"),n=typeof t.data=="string"?h.hexToBytes(t.data):t.data,s=B.size(n);if(!s)throw new y.EmptyBlobError;if(s>o.maxBytesPerTransaction)throw new y.BlobSizeTooLargeError({maxSize:o.maxBytesPerTransaction,size:s});const r=[];let b=!0,i=0;for(;b;){const e=u.createCursor(new Uint8Array(o.bytesPerBlob));let l=0;for(;l<o.fieldElementsPerBlob;){const c=n.slice(i,i+(o.bytesPerFieldElement-1));if(e.pushByte(0),e.pushBytes(c),c.length<31){e.pushByte(128),b=!1;break}l++,i+=31}r.push(e)}return a==="bytes"?r.map(e=>e.bytes):r.map(e=>d.bytesToHex(e.bytes))}exports.toBlobs=f;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("./index118.cjs"),y=require("./index112.cjs"),u=require("./index108.cjs"),B=require("./index89.cjs"),h=require("./index36.cjs"),d=require("./index24.cjs");function f(t){const a=t.to??(typeof t.data=="string"?"hex":"bytes"),n=typeof t.data=="string"?h.hexToBytes(t.data):t.data,s=B.size(n);if(!s)throw new y.EmptyBlobError;if(s>o.maxBytesPerTransaction)throw new y.BlobSizeTooLargeError({maxSize:o.maxBytesPerTransaction,size:s});const r=[];let b=!0,i=0;for(;b;){const e=u.createCursor(new Uint8Array(o.bytesPerBlob));let l=0;for(;l<o.fieldElementsPerBlob;){const c=n.slice(i,i+(o.bytesPerFieldElement-1));if(e.pushByte(0),e.pushBytes(c),c.length<31){e.pushByte(128),b=!1;break}l++,i+=31}r.push(e)}return a==="bytes"?r.map(e=>e.bytes):r.map(e=>d.bytesToHex(e.bytes))}exports.toBlobs=f;

package/dist/index98.js

@@ -1,7 +1,7 @@
 import { maxBytesPerTransaction as y, bytesPerBlob as a, fieldElementsPerBlob as f, bytesPerFieldElement as p } from "./index118.js";
-import { EmptyBlobError as c, BlobSizeTooLargeError as h } from "./index111.js";
+import { EmptyBlobError as c, BlobSizeTooLargeError as h } from "./index112.js";
 import { createCursor as B } from "./index108.js";
-import { size as u } from "./index75.js";
+import { size as u } from "./index89.js";
 import { hexToBytes as x } from "./index36.js";
 import { bytesToHex as d } from "./index24.js";
 function S(e) {

package/dist/index99.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./index57.cjs"),e=require("./index65.cjs");class i extends e.BaseError{constructor({domain:r}){super(`Invalid domain "${s.stringify(r)}".`,{metaMessages:["Must be a valid EIP-712 domain."]})}}class o extends e.BaseError{constructor({primaryType:r,types:a}){super(`Invalid primary type \`${r}\` must be one of \`${JSON.stringify(Object.keys(a))}\`.`,{docsPath:"/api/glossary/Errors#typeddatainvalidprimarytypeerror",metaMessages:["Check that the primary type is a key in `types`."]})}}class n extends e.BaseError{constructor({type:r}){super(`Struct type "${r}" is invalid.`,{metaMessages:["Struct type must not be a Solidity type."],name:"InvalidStructTypeError"})}}exports.InvalidDomainError=i;exports.InvalidPrimaryTypeError=o;exports.InvalidStructTypeError=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("./index57.cjs"),e=require("./index71.cjs");class i extends e.BaseError{constructor({domain:r}){super(`Invalid domain "${s.stringify(r)}".`,{metaMessages:["Must be a valid EIP-712 domain."]})}}class o extends e.BaseError{constructor({primaryType:r,types:a}){super(`Invalid primary type \`${r}\` must be one of \`${JSON.stringify(Object.keys(a))}\`.`,{docsPath:"/api/glossary/Errors#typeddatainvalidprimarytypeerror",metaMessages:["Check that the primary type is a key in `types`."]})}}class n extends e.BaseError{constructor({type:r}){super(`Struct type "${r}" is invalid.`,{metaMessages:["Struct type must not be a Solidity type."],name:"InvalidStructTypeError"})}}exports.InvalidDomainError=i;exports.InvalidPrimaryTypeError=o;exports.InvalidStructTypeError=n;

package/dist/index99.js

@@ -1,5 +1,5 @@
 import { stringify as a } from "./index57.js";
-import { BaseError as t } from "./index65.js";
+import { BaseError as t } from "./index71.js";
 class n extends t {
   constructor({ domain: r }) {
     super(`Invalid domain "${a(r)}".`, {

package/package.json

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