@coinbase/cdp-hooks 0.0.84 → 0.0.85

package/dist/esm/index246.js

@@ -1,11 +1,33 @@
-function i() {
-  let e = () => {
-  }, n = () => {
+import { fromNumber as a } from "./index283.js";
+import { toRpc as e } from "./index284.js";
+function n(t) {
+  return {
+    ...typeof t.baseFeePerGas == "bigint" && {
+      baseFeePerGas: a(t.baseFeePerGas)
+    },
+    ...typeof t.blobBaseFee == "bigint" && {
+      blobBaseFee: a(t.blobBaseFee)
+    },
+    ...typeof t.feeRecipient == "string" && {
+      feeRecipient: t.feeRecipient
+    },
+    ...typeof t.gasLimit == "bigint" && {
+      gasLimit: a(t.gasLimit)
+    },
+    ...typeof t.number == "bigint" && {
+      number: a(t.number)
+    },
+    ...typeof t.prevRandao == "bigint" && {
+      prevRandao: a(t.prevRandao)
+    },
+    ...typeof t.time == "bigint" && {
+      time: a(t.time)
+    },
+    ...t.withdrawals && {
+      withdrawals: t.withdrawals.map(e)
+    }
   };
-  return { promise: new Promise((r, o) => {
-    e = r, n = o;
-  }), resolve: e, reject: n };
 }
 export {
-  i as withResolvers
+  n as toRpc
 };

package/dist/esm/index247.js

@@ -1,15 +1,4 @@
-function r() {
-  return {
-    current: 0,
-    take() {
-      return this.current++;
-    },
-    reset() {
-      this.current = 0;
-    }
-  };
-}
-const t = /* @__PURE__ */ r();
+const a = "0x82ad56cb";
 export {
-  t as idCache
+  a as aggregate3Signature
 };

package/dist/esm/index248.js

@@ -1,12 +1,16 @@
-import { panicReasons as a } from "./index117.js";
-import { BaseError as s } from "./index113.js";
-import { ContractFunctionRevertedError as t } from "./index116.js";
-function d(e, o) {
-  if (!(e instanceof s))
-    return !1;
-  const r = e.walk((n) => n instanceof t);
-  return r instanceof t ? !!(r.data?.errorName === "ResolverNotFound" || r.data?.errorName === "ResolverWildcardNotSupported" || r.data?.errorName === "ResolverNotContract" || r.data?.errorName === "ResolverError" || r.data?.errorName === "HttpError" || r.reason?.includes("Wildcard on non-extended resolvers is not supported") || o === "reverse" && r.reason === a[50]) : !1;
+import { CallExecutionError as c } from "./index116.js";
+import { UnknownNodeError as i } from "./index132.js";
+import { getNodeError as u } from "./index256.js";
+function a(r, { docsPath: t, ...o }) {
+  const e = (() => {
+    const n = u(r, o);
+    return n instanceof i ? r : n;
+  })();
+  return new c(e, {
+    docsPath: t,
+    ...o
+  });
 }
 export {
-  d as isNullUniversalResolverError
+  a as getCallError
 };

package/dist/esm/index249.js

@@ -1,19 +1,15 @@
-import { stringToBytes as i } from "./index139.js";
-import { encodeLabelhash as h } from "./index281.js";
-import { labelhash as f } from "./index138.js";
-function y(s) {
-  const o = s.replace(/^\.|\.$/gm, "");
-  if (o.length === 0)
-    return new Uint8Array(1);
-  const e = new Uint8Array(i(o).byteLength + 2);
-  let t = 0;
-  const l = o.split(".");
-  for (let r = 0; r < l.length; r++) {
-    let n = i(l[r]);
-    n.byteLength > 255 && (n = i(h(f(l[r])))), e[t] = n.length, e.set(n, t + 1), t += n.length + 1;
+function y(t, { format: r }) {
+  if (!r)
+    return {};
+  const e = {};
+  function i(c) {
+    const s = Object.keys(c);
+    for (const n of s)
+      n in t && (e[n] = t[n]), c[n] && typeof c[n] == "object" && !Array.isArray(c[n]) && i(c[n]);
   }
-  return e.byteLength !== t + 1 ? e.slice(0, t + 1) : e;
+  const o = r(t || {});
+  return i(o), e;
 }
 export {
-  y as packetToBytes
+  y as extract
 };

package/dist/esm/index250.js

@@ -1,25 +1,50 @@
-import { parseAvatarUri as o, parseNftUri as f, getNftTokenUri as v, resolveAvatarUri as l, getJsonImage as A, getMetadataAvatarUri as N } from "./index282.js";
-async function b(r, { gatewayUrls: t, record: e }) {
-  return /eip155:/i.test(e) ? U(r, { gatewayUrls: t, record: e }) : o({ uri: e, gatewayUrls: t });
+import { InvalidAddressError as a } from "./index135.js";
+import { InvalidBytesLengthError as d } from "./index136.js";
+import { AccountStateConflictError as u, StateAssignmentConflictError as h } from "./index123.js";
+import { isAddress as l } from "./index162.js";
+import { numberToHex as c } from "./index140.js";
+function s(r) {
+  if (!(!r || r.length === 0))
+    return r.reduce((t, { slot: e, value: n }) => {
+      if (e.length !== 66)
+        throw new d({
+          size: e.length,
+          targetSize: 66,
+          type: "hex"
+        });
+      if (n.length !== 66)
+        throw new d({
+          size: n.length,
+          targetSize: 66,
+          type: "hex"
+        });
+      return t[e] = n, t;
+    }, {});
 }
-async function U(r, { gatewayUrls: t, record: e }) {
-  const i = f(e), s = await v(r, { nft: i }), { uri: a, isOnChain: c, isEncoded: p } = l({ uri: s, gatewayUrls: t });
-  if (c && (a.includes("data:application/json;base64,") || a.startsWith("{"))) {
-    const d = p ? (
-      // if it is encoded, decode it
-      atob(a.replace("data:application/json;base64,", ""))
-    ) : (
-      // if it isn't encoded assume it is a JSON string, but it could be anything (it will error if it is)
-      a
-    ), u = JSON.parse(d);
-    return o({ uri: A(u), gatewayUrls: t });
+function m(r) {
+  const { balance: t, nonce: e, state: n, stateDiff: o, code: f } = r, i = {};
+  if (f !== void 0 && (i.code = f), t !== void 0 && (i.balance = c(t)), e !== void 0 && (i.nonce = c(e)), n !== void 0 && (i.state = s(n)), o !== void 0) {
+    if (i.state)
+      throw new h();
+    i.stateDiff = s(o);
   }
-  let n = i.tokenID;
-  return i.namespace === "erc1155" && (n = n.replace("0x", "").padStart(64, "0")), N({
-    gatewayUrls: t,
-    uri: a.replace(/(?:0x)?{id}/, n)
-  });
+  return i;
+}
+function A(r) {
+  if (!r)
+    return;
+  const t = {};
+  for (const { address: e, ...n } of r) {
+    if (!l(e, { strict: !1 }))
+      throw new a({ address: e });
+    if (t[e])
+      throw new u({ address: e });
+    t[e] = m(n);
+  }
+  return t;
 }
 export {
-  b as parseAvatarRecord
+  m as serializeAccountStateOverride,
+  s as serializeStateMapping,
+  A as serializeStateOverride
 };

package/dist/esm/index251.js

@@ -1,33 +1,12 @@
-import { fromNumber as a } from "./index283.js";
-import { toRpc as e } from "./index284.js";
-function n(t) {
-  return {
-    ...typeof t.baseFeePerGas == "bigint" && {
-      baseFeePerGas: a(t.baseFeePerGas)
-    },
-    ...typeof t.blobBaseFee == "bigint" && {
-      blobBaseFee: a(t.blobBaseFee)
-    },
-    ...typeof t.feeRecipient == "string" && {
-      feeRecipient: t.feeRecipient
-    },
-    ...typeof t.gasLimit == "bigint" && {
-      gasLimit: a(t.gasLimit)
-    },
-    ...typeof t.number == "bigint" && {
-      number: a(t.number)
-    },
-    ...typeof t.prevRandao == "bigint" && {
-      prevRandao: a(t.prevRandao)
-    },
-    ...typeof t.time == "bigint" && {
-      time: a(t.time)
-    },
-    ...t.withdrawals && {
-      withdrawals: t.withdrawals.map(e)
-    }
-  };
+import { recoverAddress as i } from "./index180.js";
+import { hashAuthorization as e } from "./index285.js";
+async function a(o) {
+  const { authorization: r, signature: t } = o;
+  return i({
+    hash: e(r),
+    signature: t ?? r
+  });
 }
 export {
-  n as toRpc
+  a as recoverAuthorizationAddress
 };

package/dist/esm/index252.js

@@ -1,4 +1,16 @@
-const a = "0x82ad56cb";
+import { EstimateGasExecutionError as i } from "./index131.js";
+import { UnknownNodeError as m } from "./index132.js";
+import { getNodeError as s } from "./index256.js";
+function a(r, { docsPath: e, ...o }) {
+  const n = (() => {
+    const t = s(r, o);
+    return t instanceof m ? r : t;
+  })();
+  return new i(n, {
+    docsPath: e,
+    ...o
+  });
+}
 export {
-  a as aggregate3Signature
+  a as getEstimateGasError
 };

package/dist/esm/index253.js

@@ -1,16 +1,17 @@
-import { CallExecutionError as c } from "./index116.js";
-import { UnknownNodeError as i } from "./index132.js";
-import { getNodeError as u } from "./index261.js";
-function a(r, { docsPath: t, ...o }) {
-  const e = (() => {
-    const n = u(r, o);
-    return n instanceof i ? r : n;
-  })();
-  return new c(e, {
-    docsPath: t,
-    ...o
-  });
+import { BaseError as t } from "./index113.js";
+class r extends t {
+  constructor({ address: o }) {
+    super(`No EIP-712 domain found on contract "${o}".`, {
+      metaMessages: [
+        "Ensure that:",
+        `- The contract is deployed at the address "${o}".`,
+        "- `eip712Domain()` function exists on the contract.",
+        "- `eip712Domain()` function matches signature to ERC-5267 specification."
+      ],
+      name: "Eip712DomainNotFoundError"
+    });
+  }
 }
 export {
-  a as getCallError
+  r as Eip712DomainNotFoundError
 };

package/dist/esm/index254.js

@@ -1,15 +1,11 @@
-function y(t, { format: r }) {
-  if (!r)
-    return {};
-  const e = {};
-  function i(c) {
-    const s = Object.keys(c);
-    for (const n of s)
-      n in t && (e[n] = t[n]), c[n] && typeof c[n] == "object" && !Array.isArray(c[n]) && i(c[n]);
-  }
-  const o = r(t || {});
-  return i(o), e;
+function r(a) {
+  return {
+    baseFeePerGas: a.baseFeePerGas.map((e) => BigInt(e)),
+    gasUsedRatio: a.gasUsedRatio,
+    oldestBlock: BigInt(a.oldestBlock),
+    reward: a.reward?.map((e) => e.map((t) => BigInt(t)))
+  };
 }
 export {
-  y as extract
+  r as formatFeeHistory
 };

package/dist/esm/index255.js

@@ -1,50 +1,18 @@
-import { InvalidAddressError as a } from "./index135.js";
-import { InvalidBytesLengthError as d } from "./index136.js";
-import { AccountStateConflictError as u, StateAssignmentConflictError as h } from "./index123.js";
-import { isAddress as l } from "./index162.js";
-import { numberToHex as c } from "./index140.js";
-function s(r) {
-  if (!(!r || r.length === 0))
-    return r.reduce((t, { slot: e, value: n }) => {
-      if (e.length !== 66)
-        throw new d({
-          size: e.length,
-          targetSize: 66,
-          type: "hex"
-        });
-      if (n.length !== 66)
-        throw new d({
-          size: n.length,
-          targetSize: 66,
-          type: "hex"
-        });
-      return t[e] = n, t;
-    }, {});
+import { hexToNumber as a } from "./index173.js";
+function t(e) {
+  return e.map((n) => ({
+    ...n,
+    value: BigInt(n.value)
+  }));
 }
-function m(r) {
-  const { balance: t, nonce: e, state: n, stateDiff: o, code: f } = r, i = {};
-  if (f !== void 0 && (i.code = f), t !== void 0 && (i.balance = c(t)), e !== void 0 && (i.nonce = c(e)), n !== void 0 && (i.state = s(n)), o !== void 0) {
-    if (i.state)
-      throw new h();
-    i.stateDiff = s(o);
-  }
-  return i;
-}
-function A(r) {
-  if (!r)
-    return;
-  const t = {};
-  for (const { address: e, ...n } of r) {
-    if (!l(e, { strict: !1 }))
-      throw new a({ address: e });
-    if (t[e])
-      throw new u({ address: e });
-    t[e] = m(n);
-  }
-  return t;
+function o(e) {
+  return {
+    ...e,
+    balance: e.balance ? BigInt(e.balance) : void 0,
+    nonce: e.nonce ? a(e.nonce) : void 0,
+    storageProof: e.storageProof ? t(e.storageProof) : void 0
+  };
 }
 export {
-  m as serializeAccountStateOverride,
-  s as serializeStateMapping,
-  A as serializeStateOverride
+  o as formatProof
 };

package/dist/esm/index256.js

@@ -1,12 +1,27 @@
-import { recoverAddress as i } from "./index180.js";
-import { hashAuthorization as e } from "./index285.js";
-async function a(o) {
-  const { authorization: r, signature: t } = o;
-  return i({
-    hash: e(r),
-    signature: t ?? r
+import { BaseError as a } from "./index113.js";
+import { ExecutionRevertedError as s, FeeCapTooHighError as r, FeeCapTooLowError as i, NonceTooHighError as c, NonceTooLowError as u, NonceMaxValueError as d, InsufficientFundsError as f, IntrinsicGasTooHighError as w, IntrinsicGasTooLowError as E, TransactionTypeNotSupportedError as m, TipAboveFeeCapError as g, UnknownNodeError as F } from "./index132.js";
+function G(e, n) {
+  const o = (e.details || "").toLowerCase(), t = e instanceof a ? e.walk((x) => x?.code === s.code) : e;
+  return t instanceof a ? new s({
+    cause: e,
+    message: t.details
+  }) : s.nodeMessage.test(o) ? new s({
+    cause: e,
+    message: e.details
+  }) : r.nodeMessage.test(o) ? new r({
+    cause: e,
+    maxFeePerGas: n?.maxFeePerGas
+  }) : i.nodeMessage.test(o) ? new i({
+    cause: e,
+    maxFeePerGas: n?.maxFeePerGas
+  }) : c.nodeMessage.test(o) ? new c({ cause: e, nonce: n?.nonce }) : u.nodeMessage.test(o) ? new u({ cause: e, nonce: n?.nonce }) : d.nodeMessage.test(o) ? new d({ cause: e, nonce: n?.nonce }) : f.nodeMessage.test(o) ? new f({ cause: e }) : w.nodeMessage.test(o) ? new w({ cause: e, gas: n?.gas }) : E.nodeMessage.test(o) ? new E({ cause: e, gas: n?.gas }) : m.nodeMessage.test(o) ? new m({ cause: e }) : g.nodeMessage.test(o) ? new g({
+    cause: e,
+    maxFeePerGas: n?.maxFeePerGas,
+    maxPriorityFeePerGas: n?.maxPriorityFeePerGas
+  }) : new F({
+    cause: e
   });
 }
 export {
-  a as recoverAuthorizationAddress
+  G as getNodeError
 };

package/dist/esm/index257.js

@@ -1,16 +1,14 @@
-import { EstimateGasExecutionError as i } from "./index131.js";
-import { UnknownNodeError as m } from "./index132.js";
-import { getNodeError as s } from "./index261.js";
-function a(r, { docsPath: e, ...o }) {
-  const n = (() => {
-    const t = s(r, o);
-    return t instanceof m ? r : t;
-  })();
-  return new i(n, {
-    docsPath: e,
-    ...o
-  });
+import { from as t } from "./index286.js";
+import { encode as m } from "./index287.js";
+import { concat as c } from "./index283.js";
+function s(o, e) {
+  const { bytecode: r, args: n } = e;
+  return c(r, o.inputs?.length && n?.length ? m(o.inputs, n) : "0x");
+}
+function u(o) {
+  return t(o);
 }
 export {
-  a as getEstimateGasError
+  s as encode,
+  u as from
 };

package/dist/esm/index258.js

@@ -1,17 +1,27 @@
-import { BaseError as t } from "./index113.js";
-class r extends t {
-  constructor({ address: o }) {
-    super(`No EIP-712 domain found on contract "${o}".`, {
-      metaMessages: [
-        "Ensure that:",
-        `- The contract is deployed at the address "${o}".`,
-        "- `eip712Domain()` function exists on the contract.",
-        "- `eip712Domain()` function matches signature to ERC-5267 specification."
-      ],
-      name: "Eip712DomainNotFoundError"
-    });
-  }
+import { from as c, fromAbi as m, NotFoundError as i, getSelector as s } from "./index286.js";
+import { encode as u } from "./index287.js";
+import { concat as d } from "./index283.js";
+function S(o, ...t) {
+  const { overloads: r } = o, e = r ? p([o, ...r], o.name, {
+    args: t[0]
+  }) : o, n = l(e), f = t.length > 0 ? u(e.inputs, t[0]) : void 0;
+  return f ? d(n, f) : n;
+}
+function $(o, t = {}) {
+  return c(o, t);
+}
+function p(o, t, r) {
+  const e = m(o, t, r);
+  if (e.type !== "function")
+    throw new i({ name: t, type: "function" });
+  return e;
+}
+function l(o) {
+  return s(o);
 }
 export {
-  r as Eip712DomainNotFoundError
+  S as encodeData,
+  $ as from,
+  p as fromAbi,
+  l as getSelector
 };

package/dist/esm/index259.js

@@ -1,11 +1,54 @@
-function r(a) {
-  return {
-    baseFeePerGas: a.baseFeePerGas.map((e) => BigInt(e)),
-    gasUsedRatio: a.gasUsedRatio,
-    oldestBlock: BigInt(a.oldestBlock),
-    reward: a.reward?.map((e) => e.map((t) => BigInt(t)))
-  };
+import { universalSignatureValidatorAbi as d } from "./index103.js";
+import { universalSignatureValidatorByteCode as l } from "./index105.js";
+import { CallExecutionError as g } from "./index116.js";
+import { encodeDeployData as y } from "./index165.js";
+import { getAddress as S } from "./index150.js";
+import { isAddressEqual as h } from "./index172.js";
+import { isHex as v } from "./index176.js";
+import { bytesToHex as x } from "./index140.js";
+import { getAction as b } from "./index237.js";
+import { isErc6492Signature as A } from "./index186.js";
+import { recoverAddress as w } from "./index180.js";
+import { serializeErc6492Signature as E } from "./index187.js";
+import { serializeSignature as V } from "./index184.js";
+import { call as D } from "./index55.js";
+import { encodeFunctionData as H } from "./index168.js";
+import { hexToBool as z } from "./index173.js";
+async function Q(o, p) {
+  const { address: i, factory: n, factoryData: s, hash: a, signature: r, universalSignatureVerifierAddress: f = o.chain?.contracts?.universalSignatureVerifier?.address, ...m } = p, t = v(r) ? r : typeof r == "object" && "r" in r && "s" in r ? V(r) : x(r), c = await (async () => !n && !s || A(t) ? t : E({
+    address: n,
+    data: s,
+    signature: t
+  }))();
+  try {
+    const e = f ? {
+      to: f,
+      data: H({
+        abi: d,
+        functionName: "isValidSig",
+        args: [i, a, c]
+      }),
+      ...m
+    } : {
+      data: y({
+        abi: d,
+        args: [i, a, c],
+        bytecode: l
+      }),
+      ...m
+    }, { data: u } = await b(o, D, "call")(e);
+    return z(u ?? "0x0");
+  } catch (e) {
+    try {
+      if (h(S(i), await w({ hash: a, signature: r })))
+        return !0;
+    } catch {
+    }
+    if (e instanceof g)
+      return !1;
+    throw e;
+  }
 }
 export {
-  r as formatFeeHistory
+  Q as verifyHash
 };

package/dist/esm/index260.js

@@ -1,18 +1,20 @@
-import { hexToNumber as a } from "./index173.js";
-function t(e) {
-  return e.map((n) => ({
-    ...n,
-    value: BigInt(n.value)
-  }));
-}
-function o(e) {
+function x(e) {
+  const { scheme: n, statement: t, ...c } = e.match(f)?.groups ?? {}, { chainId: s, expirationTime: i, issuedAt: o, notBefore: r, requestId: a, ...d } = e.match(p)?.groups ?? {}, u = e.split("Resources:")[1]?.split(`
+- `).slice(1);
   return {
-    ...e,
-    balance: e.balance ? BigInt(e.balance) : void 0,
-    nonce: e.nonce ? a(e.nonce) : void 0,
-    storageProof: e.storageProof ? t(e.storageProof) : void 0
+    ...c,
+    ...d,
+    ...s ? { chainId: Number(s) } : {},
+    ...i ? { expirationTime: new Date(i) } : {},
+    ...o ? { issuedAt: new Date(o) } : {},
+    ...r ? { notBefore: new Date(r) } : {},
+    ...a ? { requestId: a } : {},
+    ...u ? { resources: u } : {},
+    ...n ? { scheme: n } : {},
+    ...t ? { statement: t } : {}
   };
 }
+const f = /^(?:(?<scheme>[a-zA-Z][a-zA-Z0-9+-.]*):\/\/)?(?<domain>[a-zA-Z0-9+-.]*(?::[0-9]{1,5})?) (?:wants you to sign in with your Ethereum account:\n)(?<address>0x[a-fA-F0-9]{40})\n\n(?:(?<statement>.*)\n\n)?/, p = /(?:URI: (?<uri>.+))\n(?:Version: (?<version>.+))\n(?:Chain ID: (?<chainId>\d+))\n(?:Nonce: (?<nonce>[a-zA-Z0-9]+))\n(?:Issued At: (?<issuedAt>.+))(?:\nExpiration Time: (?<expirationTime>.+))?(?:\nNot Before: (?<notBefore>.+))?(?:\nRequest ID: (?<requestId>.+))?/;
 export {
-  o as formatProof
+  x as parseSiweMessage
 };

package/dist/esm/index261.js

@@ -1,27 +1,17 @@
-import { BaseError as a } from "./index113.js";
-import { ExecutionRevertedError as s, FeeCapTooHighError as r, FeeCapTooLowError as i, NonceTooHighError as c, NonceTooLowError as u, NonceMaxValueError as d, InsufficientFundsError as f, IntrinsicGasTooHighError as w, IntrinsicGasTooLowError as E, TransactionTypeNotSupportedError as m, TipAboveFeeCapError as g, UnknownNodeError as F } from "./index132.js";
-function G(e, n) {
-  const o = (e.details || "").toLowerCase(), t = e instanceof a ? e.walk((x) => x?.code === s.code) : e;
-  return t instanceof a ? new s({
-    cause: e,
-    message: t.details
-  }) : s.nodeMessage.test(o) ? new s({
-    cause: e,
-    message: e.details
-  }) : r.nodeMessage.test(o) ? new r({
-    cause: e,
-    maxFeePerGas: n?.maxFeePerGas
-  }) : i.nodeMessage.test(o) ? new i({
-    cause: e,
-    maxFeePerGas: n?.maxFeePerGas
-  }) : c.nodeMessage.test(o) ? new c({ cause: e, nonce: n?.nonce }) : u.nodeMessage.test(o) ? new u({ cause: e, nonce: n?.nonce }) : d.nodeMessage.test(o) ? new d({ cause: e, nonce: n?.nonce }) : f.nodeMessage.test(o) ? new f({ cause: e }) : w.nodeMessage.test(o) ? new w({ cause: e, gas: n?.gas }) : E.nodeMessage.test(o) ? new E({ cause: e, gas: n?.gas }) : m.nodeMessage.test(o) ? new m({ cause: e }) : g.nodeMessage.test(o) ? new g({
-    cause: e,
-    maxFeePerGas: n?.maxFeePerGas,
-    maxPriorityFeePerGas: n?.maxPriorityFeePerGas
-  }) : new F({
-    cause: e
-  });
+import { isAddress as f } from "./index162.js";
+import { isAddressEqual as o } from "./index172.js";
+function l(n) {
+  const { address: r, domain: s, message: e, nonce: t, scheme: a, time: i = /* @__PURE__ */ new Date() } = n;
+  if (s && e.domain !== s || t && e.nonce !== t || a && e.scheme !== a || e.expirationTime && i >= e.expirationTime || e.notBefore && i < e.notBefore)
+    return !1;
+  try {
+    if (!e.address || !f(e.address, { strict: !1 }) || r && !o(e.address, r))
+      return !1;
+  } catch {
+    return !1;
+  }
+  return !0;
 }
 export {
-  G as getNodeError
+  l as validateSiweMessage
 };