@hinkal/common 0.0.104 → 0.0.107

package/functions/pre-transaction/getFlatFees.js

@@ -0,0 +1,203 @@
+import { isBeefyDeposit as S } from "../../types/beefy.types.js";
+import "../../types/circom-data.types.js";
+import { INTERACTION as a } from "../../types/hinkal.types.js";
+import "../../types/transactions.types.js";
+import "../../types/curve.types.js";
+import "ethers";
+import "axios";
+import "../../constants/chains.constants.js";
+import "circomlibjs";
+import "../../data-structures/crypto-keys/keys.js";
+import "../web3/events/getShieldedBalance.js";
+import "../../webworker/workerFactory.js";
+import "../../data-structures/crypto-keys/encryptDecryptUtxo.js";
+import "../utils/external-action.utils.js";
+import { getInteractionFromAction as I } from "./interaction-to-action.js";
+import { processGasEstimates as W } from "./process-gas-estimates.js";
+import "libsodium-wrappers";
+import "../../constants/reorg-depths.constants.js";
+import "../../constants/kyc.constants.js";
+import "../../constants/coingecko.constants.js";
+import "../../constants/vite.constants.js";
+import "../../data-structures/volatile-helper/VolatileHelper.js";
+import "../../data-structures/custom-token-registry/CustomTokenRegistry.js";
+import "../../constants/contracts.constants.js";
+import "../../constants/axelar.constants.js";
+import "../../constants/rewards.constants.js";
+import { getERC20Token as k } from "../utils/erc20tokenFunctions.js";
+import "../utils/convertIntegrationProviderToExternalActionId.js";
+import "../utils/userAgent.js";
+const Z = async (r, o, D, N, L, m) => {
+  let t;
+  const n = I(D, L);
+  if (n === a.NONE)
+    throw Error("No interaction was choosen");
+  let T, b, _;
+  switch (n) {
+    case a.WITHDRAW:
+      t = k(o[0], r);
+      break;
+    case a.SWAP:
+      t = k(o[1], r);
+      break;
+    case a.CURVE_DEPOSIT:
+      t = k(o[o.length - 1], r);
+      break;
+    case a.CURVE_WITHDRAW: {
+      if (_ = o.findIndex(
+        (P) => P.toLowerCase() === m?.toLowerCase()
+      ), console.log({ curveWithdrawGasTokenAddress: m, withdrawTokenIndex: _ }), _ === -1)
+        throw Error("Curve Withdraw Token Index not found");
+      t = k(o[_], r);
+      break;
+    }
+    case a.STAKING:
+    case a.UNSTAKING:
+      t = k(o[1], r);
+      break;
+    case a.CLAIMING:
+      t = k(o[1], r);
+      break;
+    case a.BEEFY:
+      T = S(L) ? 1 : 0, t = k(o[T], r);
+      break;
+    case a.BEEFY_STAKE:
+    case a.BEEFY_UNSTAKE:
+      t = k(o[1], r);
+      break;
+    case a.BEEFY_GET_REWARDS:
+      t = k(o[1], r);
+      break;
+    case a.LIDO_STAKE:
+      t = k(o[0], r);
+      break;
+    case a.LIDO_REQUEST:
+      t = k(o[1], r);
+      break;
+    case a.LIDO_CLAIM:
+      t = k(o[1], r);
+      break;
+    case a.PENDLE_TRANSACT:
+      t = k(o[0], r);
+      break;
+    case a.PENDLE_YT_IN_SWAP:
+      t = k(o[1], r);
+      break;
+    case a.PENDLE_YT_OUT_SWAP:
+      t = k(o[0], r);
+      break;
+    case a.PENDLE_PT_SWAP:
+      t = k(o[1], r);
+      break;
+    case a.PENDLE_MINT:
+      t = k(o[1], r);
+      break;
+    case a.PENDLE_REDEEM:
+      t = k(o[2], r);
+      break;
+    case a.PENDLE_CLAIM:
+      t = k(o[1], r);
+      break;
+    case a.VOLATILE_WITHDRAW:
+      t = k(o[0], r);
+      break;
+    case a.VOLATILE_SWAP:
+      t = k(o[1], r);
+      break;
+    case a.PENDLE_LP:
+      b = N.findIndex((P) => P > 0), t = k(o[b], r);
+      break;
+    case a.PENDLE_LP_CLAIM:
+      t = k(o[1], r);
+      break;
+    case a.EMPORIUM:
+  }
+  let E, p;
+  const i = N.length;
+  t && ({ priceOfTransactionInToken: E, priceOfTransactionInUSD: p } = await W(
+    r,
+    t,
+    D,
+    L,
+    i
+  ));
+  const e = new Array(i).fill(0n);
+  switch (n) {
+    case a.WITHDRAW:
+      e[0] = E || 0n;
+      break;
+    case a.SWAP:
+      e[1] = E || 0n;
+      break;
+    case a.CURVE_DEPOSIT:
+      e[e.length - 1] = E || 0n;
+      break;
+    case a.CURVE_WITHDRAW:
+      _ !== void 0 && (e[_] = E || 0n);
+      break;
+    case a.STAKING:
+    case a.UNSTAKING:
+      e[1] = E || 0n, e[0] = E || 0n;
+      break;
+    case a.CLAIMING:
+      e[1] = E || 0n;
+      break;
+    case a.BEEFY:
+      T && (e[T] = E || 0n);
+      break;
+    case a.BEEFY_STAKE:
+      e[1] = E || 0n, e[0] = E || 0n;
+      break;
+    case a.BEEFY_GET_REWARDS:
+      e[1] = E || 0n;
+      break;
+    case a.LIDO_STAKE:
+      e[0] = E || 0n;
+      break;
+    case a.LIDO_REQUEST:
+      e[1] = E || 0n;
+      break;
+    case a.LIDO_CLAIM:
+      e[1] = E || 0n;
+      break;
+    case a.PENDLE_TRANSACT:
+      e[0] = E || 0n;
+      break;
+    case a.PENDLE_YT_IN_SWAP:
+      e[1] = E || 0n;
+      break;
+    case a.PENDLE_YT_OUT_SWAP:
+      e[0] = E || 0n;
+      break;
+    case a.PENDLE_PT_SWAP:
+      e[1] = E || 0n;
+      break;
+    case a.PENDLE_MINT:
+      e[1] = E || 0n;
+      break;
+    case a.PENDLE_REDEEM:
+      e[2] = E || 0n;
+      break;
+    case a.PENDLE_CLAIM:
+      e[1] = E || 0n;
+      break;
+    case a.VOLATILE_WITHDRAW:
+      e[0] = E || 0n;
+      break;
+    case a.VOLATILE_SWAP:
+      e[1] = E || 0n;
+      break;
+    case a.PENDLE_LP:
+      b !== void 0 && (e[b] = E || 0n);
+      break;
+    case a.PENDLE_LP_CLAIM:
+      e[1] = E || 0n;
+      break;
+    case a.EMPORIUM:
+      break;
+  }
+  return { flatFees: e, priceOfTransactionInToken: E, feeUnit: t, priceOfTransactionInUSD: p };
+};
+export {
+  Z as getFlatFees
+};

package/functions/pre-transaction/interaction-to-action.js

@@ -0,0 +1,57 @@
+import "../../types/circom-data.types.js";
+import { ExternalActionId as e } from "../../types/external-action.types.js";
+import { INTERACTION as u, CurveAction as C, ConvexAction as L, BeefyAction as T, LidoAction as s, PendleAction as f, VolatileAction as P, PendleLPAction as R } from "../../types/hinkal.types.js";
+import "../../types/transactions.types.js";
+import "../../types/curve.types.js";
+const m = (r, E) => {
+  if (r === e.Transact)
+    return u.WITHDRAW;
+  if ([e.Uniswap, e.Odos, e.OneInch].includes(
+    r
+  ))
+    return u.SWAP;
+  if ((r === e.Curve || r === e.CurveDynamic) && E === C.Deposit)
+    return u.CURVE_DEPOSIT;
+  if ((r === e.Curve || r === e.CurveDynamic) && [C.WithdrawInt, C.WithdrawUint].includes(E))
+    return u.CURVE_WITHDRAW;
+  if ((r === e.Curve || r === e.CurveDynamic) && E === C.WithdrawImbalance)
+    return u.CURVE_WITHDRAW_INBALANCED;
+  if ((r === e.CurveCRV || r === e.CurveCRVRewards) && E === C.Stake || r === e.Convex && E === L.StakeLP)
+    return u.STAKING;
+  if ((r === e.CurveCRV || r === e.CurveCRVRewards) && E === C.Unstake || r === e.Convex && E === L.UnStakeLP)
+    return u.UNSTAKING;
+  if ((r === e.CurveCRV || r === e.CurveCRVRewards) && E === C.GetCRV || r === e.Convex && E === L.ClaimRewardsLP)
+    return u.CLAIMING;
+  if (r === e.Beefy)
+    return u.BEEFY;
+  if (r === e.BeefyStake && E === T.Stake)
+    return u.BEEFY_STAKE;
+  if (r === e.BeefyStake && E === T.Unstake)
+    return u.BEEFY_UNSTAKE;
+  if (r === e.BeefyStake && E === T.GetRewards)
+    return u.BEEFY_GET_REWARDS;
+  if ((r === e.LidoETH || r === e.LidoMATIC) && E === s.Stake)
+    return u.LIDO_STAKE;
+  if ((r === e.LidoETHNFT || r === e.LidoMATICNFT) && E === s.Request)
+    return u.LIDO_REQUEST;
+  if ((r === e.LidoETHNFT || r === e.LidoMATICNFT) && E === s.Claim)
+    return u.LIDO_CLAIM;
+  if (r === e.Pendle)
+    return E === f.SwapFromYt ? u.PENDLE_YT_IN_SWAP : E === f.SwapToYt ? u.PENDLE_YT_OUT_SWAP : E === f.SwapPt ? u.PENDLE_PT_SWAP : E === f.Checkpoint ? u.PENDLE_CLAIM : u.PENDLE_TRANSACT;
+  if (r === e.Volatile) {
+    if (E === P.Withdraw)
+      return u.VOLATILE_WITHDRAW;
+    if (E === P.Swap)
+      return u.VOLATILE_SWAP;
+  } else if (r === e.PendleLP) {
+    if (E === R.AddOrRemoveLiquidity)
+      return u.PENDLE_LP;
+    if (E === R.Checkpoint)
+      return u.PENDLE_LP_CLAIM;
+  } else if (r === e.Emporium)
+    return u.EMPORIUM;
+  return u.NONE;
+};
+export {
+  m as getInteractionFromAction
+};

package/functions/pre-transaction/outputUtxoProcessing.js

@@ -0,0 +1,45 @@
+import { Utxo as s } from "../../data-structures/utxo/Utxo.js";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.js";
+import "ethers";
+import "axios";
+import "../../constants/chains.constants.js";
+import "../../types/circom-data.types.js";
+import "../../types/transactions.types.js";
+import "../../types/curve.types.js";
+import "../../data-structures/crypto-keys/keys.js";
+import "../../data-structures/crypto-keys/encryptDecryptUtxo.js";
+import "../web3/events/getShieldedBalance.js";
+import "../../webworker/workerFactory.js";
+import "../utils/external-action.utils.js";
+import "../../data-structures/custom-token-registry/CustomTokenRegistry.js";
+import "../utils/convertIntegrationProviderToExternalActionId.js";
+import "../../constants/coingecko.constants.js";
+import "../../constants/vite.constants.js";
+import "../utils/userAgent.js";
+import "circomlibjs";
+import "../../constants/reorg-depths.constants.js";
+import "../../constants/kyc.constants.js";
+import "../../data-structures/volatile-helper/VolatileHelper.js";
+import "libsodium-wrappers";
+import "../../constants/contracts.constants.js";
+import "../../constants/axelar.constants.js";
+import "../../constants/rewards.constants.js";
+const b = (i, r, o, m, p) => {
+  let t = 0n;
+  if (r.forEach((e) => {
+    t += e.amount;
+  }), o < 0n && t + o < 0n)
+    throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);
+  return { outputUtxos: [
+    new s({
+      amount: t + o,
+      erc20TokenAddress: r[0].erc20TokenAddress,
+      shieldedPrivateKey: i.getShieldedPrivateKey(),
+      timeStamp: m,
+      tokenId: p
+    })
+  ] };
+};
+export {
+  b as outputUtxoProcessing
+};

package/functions/pre-transaction/process-gas-estimates.js

@@ -0,0 +1,57 @@
+import "../../constants/chains.constants.js";
+import "../../types/circom-data.types.js";
+import "../../types/transactions.types.js";
+import "../../types/curve.types.js";
+import { getAmountInWei as T } from "../web3/etherFunctions.js";
+import "ethers";
+import "circomlibjs";
+import { getValueFirstNDigit as l } from "../utils/amounts.utils.js";
+import "../../data-structures/crypto-keys/keys.js";
+import "axios";
+import "../../data-structures/crypto-keys/encryptDecryptUtxo.js";
+import "../web3/events/getShieldedBalance.js";
+import "../../webworker/workerFactory.js";
+import "../utils/external-action.utils.js";
+import "../../data-structures/custom-token-registry/CustomTokenRegistry.js";
+import "../utils/convertIntegrationProviderToExternalActionId.js";
+import "../utils/userAgent.js";
+import "../../constants/reorg-depths.constants.js";
+import "../../constants/kyc.constants.js";
+import "../../constants/coingecko.constants.js";
+import { logError as p } from "../../error-handling/logError.js";
+import "../../data-structures/volatile-helper/VolatileHelper.js";
+import "libsodium-wrappers";
+import "../../constants/vite.constants.js";
+import "../../constants/contracts.constants.js";
+import "../../constants/axelar.constants.js";
+import "../../constants/rewards.constants.js";
+import { getGasEstimates as E } from "../../API/getGasEstimates.js";
+const K = async (s, t, e, a, n, c) => {
+  let i, o, r;
+  try {
+    ({
+      status: i,
+      priceOfTransactionInUSD: o,
+      priceOfTransactionInToken: r
+    } = await E(
+      s,
+      t.erc20TokenAddress,
+      e,
+      a,
+      n,
+      c
+    ));
+  } catch (f) {
+    p("processGasEstimates error:", f);
+  }
+  const m = r ? T(t, l(r, t.decimals)) : void 0;
+  return p("processGasEstimates: ", {
+    status: i,
+    priceOfTransactionInUSD: o,
+    priceOfTransactionInTokenEstimate: r,
+    priceOfTransactionInToken: m
+  }), { priceOfTransactionInUSD: o, priceOfTransactionInToken: m };
+};
+export {
+  K as processGasEstimates
+};

package/functions/pre-transaction/processAmountChanges.js

@@ -0,0 +1,229 @@
+import "../../constants/chains.constants.js";
+import { getAmountAfterRelayAndFlatFees as k, getAmountAfterRelayAndFlatFeesAndSlippage as b, getAmountAfterSlippage as L } from "../../constants/fees.constants.js";
+import "../../constants/contracts.constants.js";
+import "../../constants/kyc.constants.js";
+import "../../constants/vite.constants.js";
+import "../../constants/coingecko.constants.js";
+import "../../constants/axelar.constants.js";
+import "../../constants/rewards.constants.js";
+import "../../constants/reorg-depths.constants.js";
+import { FeeOverTransactionValueError as S } from "../../error-handling/customErrors/FeeOverTransactionValueError.js";
+import { absBigInt as W } from "../utils/amounts.utils.js";
+import "ethers";
+import "axios";
+import "circomlibjs";
+import "../../data-structures/crypto-keys/keys.js";
+import "../../data-structures/crypto-keys/encryptDecryptUtxo.js";
+import { isBeefyDeposit as R } from "../../types/beefy.types.js";
+import "../../types/circom-data.types.js";
+import { INTERACTION as p } from "../../types/hinkal.types.js";
+import { SlippageType as _ } from "../../types/slippage.types.js";
+import "../../types/transactions.types.js";
+import "../../types/curve.types.js";
+import "../web3/events/getShieldedBalance.js";
+import "../utils/external-action.utils.js";
+import "../../data-structures/custom-token-registry/CustomTokenRegistry.js";
+import "../utils/convertIntegrationProviderToExternalActionId.js";
+import { getInteractionFromAction as d } from "./interaction-to-action.js";
+import "../utils/userAgent.js";
+import "../../webworker/workerFactory.js";
+import "libsodium-wrappers";
+import "../../data-structures/volatile-helper/VolatileHelper.js";
+const A = (T, r, E) => {
+  const N = W(T) - r;
+  if (r < 0n)
+    throw new S({
+      totalFeeWEI: N,
+      feeUnit: E
+    });
+  return r;
+}, h = ({
+  erc20Addresses: T = [],
+  amountChanges: r,
+  flatFees: E,
+  feeUnit: c,
+  externalActionId: N,
+  action: D,
+  gasTokenAddress: w
+}) => {
+  const P = d(N, D);
+  if (P === p.NONE)
+    throw Error("No interaction was choosen");
+  switch (P) {
+    case p.WITHDRAW: {
+      A(
+        r[0],
+        k(r[0], E[0], !0),
+        c
+      );
+      break;
+    }
+    case p.SWAP: {
+      r[1] = A(
+        r[1],
+        b(r[1], E[1], _.Swap),
+        c
+      );
+      break;
+    }
+    case p.CURVE_DEPOSIT: {
+      const i = r.length - 1;
+      r[i] = A(
+        r[i],
+        b(r[i], E[i], _.CurveDeposit),
+        c
+      );
+      break;
+    }
+    case p.CURVE_WITHDRAW:
+      E.forEach((i, I) => {
+        i > 0n ? r[I] = A(
+          r[I],
+          b(r[I], i, _.CurveWithdraw),
+          c
+        ) : i === 0n && r[I] > 0n && I !== E.length - 1 && (r[I] = L(r[I], _.CurveWithdraw));
+      });
+      break;
+    case p.CURVE_WITHDRAW_INBALANCED:
+      break;
+    case p.STAKING:
+      r[0] = A(
+        r[0],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.UNSTAKING:
+      r[1] = A(
+        r[1],
+        k(r[0], E[0]),
+        c
+      );
+      break;
+    case p.CLAIMING:
+      r[1] = A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.BEEFY: {
+      const i = R(D) ? 1 : 0;
+      r[i] = A(
+        r[i],
+        b(
+          r[i],
+          E[i],
+          _.Beefy
+        ),
+        c
+      );
+      break;
+    }
+    case p.BEEFY_STAKE:
+      r[0] = A(
+        r[0],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.BEEFY_UNSTAKE:
+      r[1] = A(
+        r[1],
+        k(r[0], E[0]),
+        c
+      );
+      break;
+    case p.BEEFY_GET_REWARDS:
+      r[1] = A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.LIDO_STAKE:
+      r[0] = A(
+        r[0],
+        k(r[0], E[0]),
+        c
+      );
+      break;
+    case p.LIDO_REQUEST:
+      A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.LIDO_CLAIM:
+      r[1] = A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.PENDLE_TRANSACT:
+      r[0] < 0n && A(
+        r[0],
+        k(r[0], E[0], !0),
+        c
+      );
+      break;
+    case p.PENDLE_YT_IN_SWAP:
+      r[1] = A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.PENDLE_YT_OUT_SWAP:
+      break;
+    case p.PENDLE_PT_SWAP:
+      r[1] = A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.PENDLE_MINT:
+      r[1] = A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.PENDLE_REDEEM:
+      r[2] = A(
+        r[2],
+        k(r[2], E[2]),
+        c
+      );
+      break;
+    case p.PENDLE_CLAIM:
+      r[1] = A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+    case p.PENDLE_LP: {
+      const i = r.findIndex((I) => I > 0n);
+      r[i] = A(
+        r[i],
+        b(r[i], E[i], _.Pendle)
+      );
+      break;
+    }
+    case p.PENDLE_LP_CLAIM:
+      r[1] = A(
+        r[1],
+        k(r[1], E[1]),
+        c
+      );
+      break;
+  }
+  return r;
+};
+export {
+  h as processAmountChanges
+};

package/functions/private-wallet/emporium.helpers.js

@@ -0,0 +1,19 @@
+import { ethers as e, BigNumber as d } from "ethers";
+const p = (t, i, s, r, y) => {
+  let a = new Uint8Array(), l = new Uint8Array();
+  typeof t == "object" && "address" in t ? (a = e.utils.arrayify(t.address), i && (l = e.utils.arrayify(t.interface.encodeFunctionData(i, s)))) : a = e.utils.arrayify(t);
+  const n = e.utils.arrayify([r ? 1 : 0]), o = e.utils.zeroPad(e.utils.arrayify(d.from(y ?? 0n)), 16), u = e.utils.concat([a, n, o, l]);
+  return e.utils.hexlify(u);
+}, m = (t, i) => e.utils.defaultAbiCoder.encode(
+  ["tuple(bytes32 walletSalt, bytes[] ops)"],
+  [
+    {
+      walletSalt: i ?? e.utils.hexlify(new Uint8Array(32)),
+      ops: t
+    }
+  ]
+);
+export {
+  p as emporiumOp,
+  m as encodeEmporiumMetadata
+};

package/functions/private-wallet/opProducer.js

@@ -0,0 +1,24 @@
+import { abi as m } from "../../externalABIs/ERC20.json.js";
+import { abi as s } from "../../externalABIs/ISwapRouter.json.js";
+import { ethers as p } from "ethers";
+import { emporiumOp as b } from "./emporium.helpers.js";
+var f = /* @__PURE__ */ ((r) => (r[r.Erc20Token = 0] = "Erc20Token", r[r.Uniswap = 1] = "Uniswap", r))(f || {});
+const E = (r, t, a, i, c, e) => {
+  let o = "";
+  switch (r) {
+    case 0:
+      o = m;
+      break;
+    case 1:
+      o = s;
+      break;
+  }
+  if (!o)
+    throw Error("No ABI match in produceOp");
+  const n = new p.Contract(t, o);
+  return b(n, a, i, c, e);
+};
+export {
+  f as OpType,
+  E as produceOp
+};

package/functions/protocols/convex.protocols.js

@@ -0,0 +1,41 @@
+import { getNonLocalhostChainId as r, chainIds as t } from "../../constants/chains.constants.js";
+import "../../types/circom-data.types.js";
+import "../../types/transactions.types.js";
+import "../../types/curve.types.js";
+import "ethers";
+import "circomlibjs";
+import "../../data-structures/crypto-keys/keys.js";
+import "axios";
+import "../../data-structures/crypto-keys/encryptDecryptUtxo.js";
+import "../web3/events/getShieldedBalance.js";
+import "../../webworker/workerFactory.js";
+import "../utils/external-action.utils.js";
+import "../../data-structures/custom-token-registry/CustomTokenRegistry.js";
+import "../utils/convertIntegrationProviderToExternalActionId.js";
+import "../../constants/coingecko.constants.js";
+import "../../constants/vite.constants.js";
+import "../utils/userAgent.js";
+import "../../constants/reorg-depths.constants.js";
+import "../../constants/kyc.constants.js";
+import "../../data-structures/volatile-helper/VolatileHelper.js";
+import "libsodium-wrappers";
+import "../../constants/contracts.constants.js";
+import "../../constants/axelar.constants.js";
+import "../../constants/rewards.constants.js";
+const N = (o) => {
+  switch (r(o)) {
+    case t.polygon:
+      return "0x4257ea7637c355f81616050cbb6a9b709fd72683";
+    case t.arbMainnet:
+      return "0xb952a807345991bd529fdded05009f5e80fe8f45";
+    case t.ethMainnet:
+      return "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B";
+    case t.optimism:
+      return "0x81ab7e0d570b01411fcc4afd3d50ec8c241cb74b";
+    default:
+      return "0x4e3FBD56CD56c3e72c1403e103b45Db9da5B9D2B";
+  }
+};
+export {
+  N as getCVX
+};