@hinkal/common 0.1.33 → 0.1.34

package/data-structures/Hinkal/hinkalActionPendle.mjs

@@ -1,120 +1,117 @@
-import { utils as W } from "ethers";
+import { utils as H } from "ethers";
 import { zeroAddress as R } from "../../constants/protocol.constants.mjs";
-import { networkRegistry as H } from "../../constants/chains.constants.mjs";
-import { getERC20Token as A } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { getFlatFees as O } from "../../functions/pre-transaction/getFlatFees.mjs";
-import { processAmountChanges as U } from "../../functions/pre-transaction/processAmountChanges.mjs";
-import { constructZkProof as b } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { outputUtxoProcessing as z } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { addPaddingToUtxos as L } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as N } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as $ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { transactCallDirect as D } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { networkRegistry as O } from "../../constants/chains.constants.mjs";
+import { getERC20Token as g } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { getFlatFees as U } from "../../functions/pre-transaction/getFlatFees.mjs";
+import { processAmountChanges as b } from "../../functions/pre-transaction/processAmountChanges.mjs";
+import { constructZkProof as k } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { outputUtxoProcessing as L } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { addPaddingToUtxos as N } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { estimateGasRelayer as $ } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { transactCallDirect as A } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
 import { ContractType as E } from "../../types/ethereum-network.types.mjs";
-import { defaultHookData as v } from "../../types/circom-data.types.mjs";
+import { defaultHookData as z } from "../../types/circom-data.types.mjs";
 import { ExternalActionId as G } from "../../types/external-action.types.mjs";
-import { PendleAction as e } from "../../types/hinkal.types.mjs";
+import { PendleAction as r } from "../../types/hinkal.types.mjs";
 import { transactionErrorCodes as K } from "../../error-handling/error-codes.constants.mjs";
 const _ = (t) => {
-  let o = [];
-  return t === e.Deposit ? o = [!1, !0] : t === e.Withdraw ? o = [!1, !0] : t === e.SwapFromYt ? o = [!1, !0, !0] : t === e.SwapToYt ? o = [!1, !1, !0] : t === e.SwapPt ? o = [!1, !0] : t === e.Mint ? o = [!1, !0, !1, !0] : t === e.Redeem ? o = [!1, !1, !0, !0] : t === e.Checkpoint && (o = [!1, !0]), o;
-}, B = (t, o) => {
-  const { pendleAction: n, ytAddress: s, userAddress: u, evmData: d } = t, a = d ?? "0x00", i = u ?? R;
+  let e = [];
+  return t === r.Deposit ? e = [!1, !0] : t === r.Withdraw ? e = [!1, !0] : t === r.SwapFromYt ? e = [!1, !0, !0] : t === r.SwapToYt ? e = [!1, !1, !0] : t === r.SwapPt ? e = [!1, !0] : t === r.Mint ? e = [!1, !0, !1, !0] : t === r.Redeem ? e = [!1, !1, !0, !0] : t === r.Checkpoint && (e = [!1, !0]), e;
+}, B = (t, e) => {
+  const { pendleAction: s, ytAddress: a, userAddress: c, evmData: d } = t, i = d ?? "0x00", n = c ?? R;
   if ([
-    e.Deposit,
-    e.Withdraw,
-    e.SwapFromYt,
-    e.SwapToYt,
-    e.SwapPt,
-    e.Mint,
-    e.Redeem,
-    e.Checkpoint
+    r.Deposit,
+    r.Withdraw,
+    r.SwapFromYt,
+    r.SwapToYt,
+    r.SwapPt,
+    r.Mint,
+    r.Redeem,
+    r.Checkpoint
   ].includes(t.pendleAction))
-    return W.defaultAbiCoder.encode(
+    return H.defaultAbiCoder.encode(
       ["uint8", "address", "uint256", "uint256", "address", "bool", "bytes"],
       [
-        n,
         s,
-        o[0][0].amount,
-        o[0][0].timeStamp,
-        i,
+        a,
+        e[0][0].amount,
+        e[0][0].timeStamp,
+        n,
         !0,
-        a
+        i
       ]
     );
   throw new Error("Not implemented");
-}, mt = async (t, o, n, s, u, d = !1) => {
-  const a = G.Pendle, { pendleAction: i } = s, c = [...await L(t, o, n)], C = `swapperMO${n.length.toString()}x${c[0].length}x1`;
-  console.log({ inputUtxosArray: c, circuitName: C, pendleMetadata: s });
-  const { flatFees: w, feeUnit: T } = await O(
+}, ut = async (t, e, s, a, c, d = !1) => {
+  const i = G.Pendle, { pendleAction: n } = a, f = [...await N(t, e, s)], T = `swapperMO${s.length.toString()}x${f[0].length}x1`, { flatFees: w, feeUnit: D } = await U(
     t.getCurrentChainId(),
-    o,
-    a,
-    n,
+    e,
     i,
-    u
+    s,
+    n,
+    c
   );
-  console.log("hinkalActionPendle flatFees:", w), n = U({
-    erc20Addresses: o,
-    amountChanges: n,
+  s = b({
+    erc20Addresses: e,
+    amountChanges: s,
     flatFees: w,
-    feeUnit: T,
-    externalActionId: a,
-    action: i,
-    gasTokenAddress: u
+    feeUnit: D,
+    externalActionId: i,
+    action: n,
+    gasTokenAddress: c
   });
-  const g = [];
-  for (let r = 0; r < o.length; r += 1) {
-    const { outputUtxos: p } = z(t.userKeys, c[r], n[r]);
-    g.push(p);
+  const x = [];
+  for (let o = 0; o < e.length; o += 1) {
+    const { outputUtxos: p } = L(t.userKeys, f[o], s[o]);
+    x.push(p);
   }
-  const P = _(i), { contractData: S } = H[t.getCurrentChainId()], I = S?.pendleExternalActionInstanceAddress, h = B(s, c), x = i === e.Deposit || s.isRelayerOff ? R : await t.getRandomRelay();
-  if (!x)
+  const S = _(n), { contractData: I } = O[t.getCurrentChainId()], P = I?.pendleExternalActionInstanceAddress, Y = B(a, f), y = n === r.Deposit || a.isRelayerOff ? R : await t.getRandomRelay();
+  if (!y)
     throw Error(K.RELAYER_NOT_AVAILABLE);
-  const Y = `0x0${i.toString(16)}`, k = { ...v, preHookMetadata: Y }, { zkCallData: f, circomData: l, dimData: m } = await b(
+  const W = `0x0${n.toString(16)}`, h = { ...z, preHookMetadata: W }, { zkCallData: m, circomData: u, dimData: l } = await k(
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    c,
-    g,
-    t.userKeys,
-    C,
-    a,
-    I,
-    h,
+    f,
     x,
-    t.getCurrentChainId(),
+    t.userKeys,
+    T,
+    i,
     P,
+    Y,
+    y,
+    t.getCurrentChainId(),
+    S,
     w,
-    k
+    h
   );
-  if (console.log("hinkalActionPendle: zkCallData, dimData, circomData:", { zkCallData: f, dimData: m, circomData: l }), d)
-    return await N(t, f, m, l);
-  const y = t.getCurrentChainId();
-  if (i === e.Deposit) {
-    console.log("inside pendle deposit");
-    const r = A(s.ytAddress, y);
-    if (!r)
+  if (d)
+    return await $(t, m, l, u);
+  const C = t.getCurrentChainId();
+  if (n === r.Deposit) {
+    const o = g(a.ytAddress, C);
+    if (!o)
       throw Error("Yt Token not found");
     const p = t.getContractWithSigner(E.PendleGeneralExternalAction), F = t.getContractWithSigner(E.HinkalWrapper);
-    return await D(
+    return await A(
       t,
-      n[0],
-      r,
-      f,
-      l,
+      s[0],
+      o,
       m,
+      u,
+      l,
       p,
       F
     );
   }
-  if (i === e.Withdraw && s.isRelayerOff) {
-    const r = A(s.ytAddress, y);
-    if (!r)
+  if (n === r.Withdraw && a.isRelayerOff) {
+    const o = g(a.ytAddress, C);
+    if (!o)
       throw Error("Yt Token not found");
-    return await D(t, n[0], r, f, l, m);
+    return await A(t, s[0], o, m, u, l);
   }
-  return await $(t.getCurrentChainId(), f, m, l);
+  return await v(t.getCurrentChainId(), m, l, u);
 };
 export {
-  mt as hinkalActionPendle
+  ut as hinkalActionPendle
 };

package/data-structures/Hinkal/hinkalActionPendleLP.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const D=require("ethers"),E=require("../../types/circom-data.types.cjs"),k=require("../../types/external-action.types.cjs"),A=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const g=require("../../functions/web3/events/getShieldedBalance.cjs"),U=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),I=require("../../functions/pre-transaction/getFlatFees.cjs"),_=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),b=require("../../functions/pre-transaction/processAmountChanges.cjs"),F=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),S=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),T=require("../../constants/chains.constants.cjs"),G=require("../../error-handling/error-codes.constants.cjs"),O=(e,t)=>{if(e===A.PendleLPAction.AddOrRemoveLiquidity)return t.length===3?[!1,!0,!1]:[!1,!0,!1,!1];if(e===A.PendleLPAction.Checkpoint)return[!1,!0];throw new Error("Unknown PendleLPAction not implemented")},v=(e,t)=>{const{pendleLPAction:n,lpAddress:r,evmData:o}=e;return D.ethers.utils.defaultAbiCoder.encode(["uint8","address","uint256","uint256","bytes"],[n,r,t[0][0].amount,t[0][0].timeStamp,o])},M=async(e,t,n,r,o,y=!1)=>{const i=k.ExternalActionId.PendleLP,{pendleLPAction:c}=r,s=[...await g.addPaddingToUtxos(e,t,n)],f=`swapperMO${n.length.toString()}x${s[0].length}x1`,{flatFees:l,feeUnit:C}=await I.getFlatFees(e.getCurrentChainId(),t,i,n,c,o);console.log("hinkalActionPendle flatFees:",l),n=b.processAmountChanges({erc20Addresses:t,amountChanges:n,flatFees:l,feeUnit:C,externalActionId:i,action:c,gasTokenAddress:o});const P=[];for(let a=0;a<t.length;a+=1){const{outputUtxos:R}=_.outputUtxoProcessing(e.userKeys,s[a],n[a]);P.push(R)}const q=O(c,t),{contractData:x}=T.networkRegistry[e.getCurrentChainId()],h=x?.pendleLPExternalActionInstanceAddress,w=v(r,s),p=await e.getRandomRelay();if(!p)throw Error(G.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const L={...E.defaultHookData},{zkCallData:u,circomData:d,dimData:m}=await U.constructZkProof(e.merkleTreeHinkal,e.merkleTreeAccessToken,s,P,e.userKeys,f,i,h,w,p,e.getCurrentChainId(),q,l,L);return console.log("hinkalActionPendle: zkCallData, dimData, circomData:",{zkCallData:u,dimData:m,circomData:d}),y?await F.estimateGasRelayer(e,u,m,d):await S.transactCallRelayer(e.getCurrentChainId(),u,m,d)},z=async(e,t,n)=>{const r=[...await g.addPaddingToUtxos(e,[t],[-1n*n])];return{amount:r[0][0].amount,timestamp:r[0][0].timeStamp}};exports.hinkalActionPendleLP=M;exports.hinkalGetPendleLPClaimableParams=z;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const E=require("ethers"),U=require("../../types/circom-data.types.cjs"),D=require("../../types/external-action.types.cjs"),y=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const A=require("../../functions/web3/events/getShieldedBalance.cjs"),I=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),_=require("../../functions/pre-transaction/getFlatFees.cjs"),b=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),k=require("../../functions/pre-transaction/processAmountChanges.cjs"),S=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),T=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),F=require("../../constants/chains.constants.cjs"),G=require("../../error-handling/error-codes.constants.cjs"),O=(t,e)=>{if(t===y.PendleLPAction.AddOrRemoveLiquidity)return e.length===3?[!1,!0,!1]:[!1,!0,!1,!1];if(t===y.PendleLPAction.Checkpoint)return[!1,!0];throw new Error("Unknown PendleLPAction not implemented")},v=(t,e)=>{const{pendleLPAction:n,lpAddress:r,evmData:o}=t;return E.ethers.utils.defaultAbiCoder.encode(["uint8","address","uint256","uint256","bytes"],[n,r,e[0][0].amount,e[0][0].timeStamp,o])},M=async(t,e,n,r,o,g=!1)=>{const i=D.ExternalActionId.PendleLP,{pendleLPAction:c}=r,s=[...await A.addPaddingToUtxos(t,e,n)],f=`swapperMO${n.length.toString()}x${s[0].length}x1`,{flatFees:l,feeUnit:C}=await _.getFlatFees(t.getCurrentChainId(),e,i,n,c,o);n=k.processAmountChanges({erc20Addresses:e,amountChanges:n,flatFees:l,feeUnit:C,externalActionId:i,action:c,gasTokenAddress:o});const u=[];for(let a=0;a<e.length;a+=1){const{outputUtxos:h}=b.outputUtxoProcessing(t.userKeys,s[a],n[a]);u.push(h)}const q=O(c,e),{contractData:x}=F.networkRegistry[t.getCurrentChainId()],w=x?.pendleLPExternalActionInstanceAddress,L=v(r,s),d=await t.getRandomRelay();if(!d)throw Error(G.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const R={...U.defaultHookData},{zkCallData:m,circomData:P,dimData:p}=await I.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,s,u,t.userKeys,f,i,w,L,d,t.getCurrentChainId(),q,l,R);return g?await S.estimateGasRelayer(t,m,p,P):await T.transactCallRelayer(t.getCurrentChainId(),m,p,P)},B=async(t,e,n)=>{const r=[...await A.addPaddingToUtxos(t,[e],[-1n*n])];return{amount:r[0][0].amount,timestamp:r[0][0].timeStamp}};exports.hinkalActionPendleLP=M;exports.hinkalGetPendleLPClaimableParams=B;

package/data-structures/Hinkal/hinkalActionPendleLP.mjs

@@ -1,75 +1,75 @@
-import { ethers as I } from "ethers";
+import { ethers as D } from "ethers";
 import { defaultHookData as U } from "../../types/circom-data.types.mjs";
 import { ExternalActionId as h } from "../../types/external-action.types.mjs";
 import { PendleLPAction as A } from "../../types/hinkal.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
-import { addPaddingToUtxos as P } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { constructZkProof as k } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { getFlatFees as F } from "../../functions/pre-transaction/getFlatFees.mjs";
-import { outputUtxoProcessing as O } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { processAmountChanges as T } from "../../functions/pre-transaction/processAmountChanges.mjs";
-import { estimateGasRelayer as b } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as S } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { addPaddingToUtxos as y } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { constructZkProof as O } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { getFlatFees as T } from "../../functions/pre-transaction/getFlatFees.mjs";
+import { outputUtxoProcessing as b } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { processAmountChanges as F } from "../../functions/pre-transaction/processAmountChanges.mjs";
+import { estimateGasRelayer as S } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as k } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { networkRegistry as v } from "../../constants/chains.constants.mjs";
-import { transactionErrorCodes as z } from "../../error-handling/error-codes.constants.mjs";
-const G = (t, e) => {
+import { transactionErrorCodes as G } from "../../error-handling/error-codes.constants.mjs";
+const H = (t, e) => {
   if (t === A.AddOrRemoveLiquidity)
     return e.length === 3 ? [!1, !0, !1] : [!1, !0, !1, !1];
   if (t === A.Checkpoint)
     return [!1, !0];
   throw new Error("Unknown PendleLPAction not implemented");
-}, H = (t, e) => {
+}, K = (t, e) => {
   const { pendleLPAction: o, lpAddress: r, evmData: a } = t;
-  return I.utils.defaultAbiCoder.encode(
+  return D.utils.defaultAbiCoder.encode(
     ["uint8", "address", "uint256", "uint256", "bytes"],
     [o, r, e[0][0].amount, e[0][0].timeStamp, a]
   );
-}, et = async (t, e, o, r, a, g = !1) => {
-  const s = h.PendleLP, { pendleLPAction: c } = r, i = [...await P(t, e, o)], y = `swapperMO${o.length.toString()}x${i[0].length}x1`, { flatFees: m, feeUnit: C } = await F(
+}, et = async (t, e, o, r, a, P = !1) => {
+  const s = h.PendleLP, { pendleLPAction: m } = r, i = [...await y(t, e, o)], x = `swapperMO${o.length.toString()}x${i[0].length}x1`, { flatFees: c, feeUnit: C } = await T(
     t.getCurrentChainId(),
     e,
     s,
     o,
-    c,
+    m,
     a
   );
-  console.log("hinkalActionPendle flatFees:", m), o = T({
+  o = F({
     erc20Addresses: e,
     amountChanges: o,
-    flatFees: m,
+    flatFees: c,
     feeUnit: C,
     externalActionId: s,
-    action: c,
+    action: m,
     gasTokenAddress: a
   });
-  const u = [];
+  const l = [];
   for (let n = 0; n < e.length; n += 1) {
-    const { outputUtxos: R } = O(t.userKeys, i[n], o[n]);
-    u.push(R);
+    const { outputUtxos: I } = b(t.userKeys, i[n], o[n]);
+    l.push(I);
   }
-  const x = G(c, e), { contractData: w } = v[t.getCurrentChainId()], E = w?.pendleLPExternalActionInstanceAddress, D = H(r, i), d = await t.getRandomRelay();
-  if (!d)
-    throw Error(z.RELAYER_NOT_AVAILABLE);
-  const L = { ...U }, { zkCallData: l, circomData: p, dimData: f } = await k(
+  const g = H(m, e), { contractData: w } = v[t.getCurrentChainId()], E = w?.pendleLPExternalActionInstanceAddress, L = K(r, i), p = await t.getRandomRelay();
+  if (!p)
+    throw Error(G.RELAYER_NOT_AVAILABLE);
+  const R = { ...U }, { zkCallData: u, circomData: f, dimData: d } = await O(
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
     i,
-    u,
+    l,
     t.userKeys,
-    y,
+    x,
     s,
     E,
-    D,
-    d,
+    L,
+    p,
     t.getCurrentChainId(),
-    x,
-    m,
-    L
+    g,
+    c,
+    R
   );
-  return console.log("hinkalActionPendle: zkCallData, dimData, circomData:", { zkCallData: l, dimData: f, circomData: p }), g ? await b(t, l, f, p) : await S(t.getCurrentChainId(), l, f, p);
+  return P ? await S(t, u, d, f) : await k(t.getCurrentChainId(), u, d, f);
 }, ot = async (t, e, o) => {
-  const r = [...await P(t, [e], [-1n * o])];
+  const r = [...await y(t, [e], [-1n * o])];
   return { amount: r[0][0].amount, timestamp: r[0][0].timeStamp };
 };
 export {

package/data-structures/Hinkal/hinkalActionStake.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../constants/protocol.constants.cjs"),p=require("../../functions/staking/index.cjs"),f=require("../../functions/utils/erc20tokenFunctions.cjs"),B=require("../../functions/web3/etherFunctions.cjs"),O=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),_=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),y=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const g=require("../../types/ethereum-network.types.cjs"),M=require("../../types/external-action.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const S=require("../../types/hinkal.stake.types.cjs");require("ethers");const j=require("../crypto-keys/keys.cjs");require("../crypto-keys/encryptDecryptUtxo.cjs");const w=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),z=async(t,x,o,s,i)=>{const C=await t.getEthereumAddress(),a=f.getERC20Token(x[0],t.getCurrentChainId());if(!a)throw Error("Deposit Action: No Token Found");const u=s===S.HinkalStakeMode.Stake,n=s===S.HinkalStakeMode.Unstake,{symbol:E}=a;console.log(`${s} token ${E} Start`);const{erc20TokenAddress:H}=a,r=[...await N.addPaddingToUtxos(t,x,o,2,void 0,s!==S.HinkalStakeMode.Deposit)];if(u||n){r[0][0]=y.Utxo.createFrom(r[0][0],{amount:o[0]*(u?1n:-1n),isStakeOrUnstakeInput:!0});for(let e=0;e<r.length;e+=1)for(let c=0;c<r[e].length;c+=1)e===0&&c===0||(r[e][c]=y.Utxo.createFrom(r[e][c],{amount:0n}))}const{outputUtxos:P}=O.outputUtxoProcessing(t.userKeys,r[0],o[0]),d=[P.map(e=>y.Utxo.createFrom(e,{isStake:u,isUnstakeOutput:n}))];n&&(d[0][0]=y.Utxo.createFrom(d[0][0],{amount:0n,isUnstakeOutput:n}));const h=[!1],l=B.randomBigInt(30),K=j.UserKeys.getEncryptionKeyPair(t.userKeys.getShieldedPrivateKey()),D=p.encryptStake(l,i,T.ownerPublicKey),F=p.encryptStake(l,i,K.publicKey),I=n?0n:p.createStakeCommitment(!0,i,l,H,o[0],BigInt(d[0][0].timeStamp)),v=u?0:1,W=p.encodeHStakeMetadata(v,I,C,D,F),q=t.getContractWithSigner(g.ContractType.HinkalWrapper2),k=t.getContractWithSigner(g.ContractType.HinkalStakeExternalAction);console.log("external action address",k.address);const{zkCallData:A,dimData:U,circomData:m}=await _.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,r,d,t.userKeys,"swapperME1x2x1",M.ExternalActionId.HinkalStake,k.address,W,T.zeroAddress,t.getCurrentChainId(),h,void 0,void 0,{stakedTokenRecipient:i,stakeBlinding:l,mode:s,depositorAddress:C});if(console.log(m),n){const e=f.getHToken(a,t.getCurrentChainId());if(!e)throw new Error("hToken not found");const b=(await t.getContractWithFetcher(g.ContractType.HToken,e.erc20TokenAddress).previewWithdraw(-o[0])).toBigInt();return w.transactCallDirect(t,b,e,A,m,U,k,q)}return w.transactCallDirect(t,o[0],a,A,m,U,k,q)};exports.hinkalActionStake=z;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../constants/protocol.constants.cjs"),p=require("../../functions/staking/index.cjs"),f=require("../../functions/utils/erc20tokenFunctions.cjs"),B=require("../../functions/web3/etherFunctions.cjs"),O=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),_=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),b=require("../../functions/web3/events/getShieldedBalance.cjs"),l=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const S=require("../../types/ethereum-network.types.cjs"),M=require("../../types/external-action.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");const m=require("../../types/hinkal.stake.types.cjs");require("ethers");const j=require("../crypto-keys/keys.cjs");require("../crypto-keys/encryptDecryptUtxo.cjs");const w=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),z=async(t,g,o,s,a)=>{const C=await t.getEthereumAddress(),i=f.getERC20Token(g[0],t.getCurrentChainId());if(!i)throw Error("Deposit Action: No Token Found");const u=s===m.HinkalStakeMode.Stake,n=s===m.HinkalStakeMode.Unstake,{erc20TokenAddress:E}=i,r=[...await b.addPaddingToUtxos(t,g,o,2,void 0,s!==m.HinkalStakeMode.Deposit)];if(u||n){r[0][0]=l.Utxo.createFrom(r[0][0],{amount:o[0]*(u?1n:-1n),isStakeOrUnstakeInput:!0});for(let e=0;e<r.length;e+=1)for(let c=0;c<r[e].length;c+=1)e===0&&c===0||(r[e][c]=l.Utxo.createFrom(r[e][c],{amount:0n}))}const{outputUtxos:H}=O.outputUtxoProcessing(t.userKeys,r[0],o[0]),d=[H.map(e=>l.Utxo.createFrom(e,{isStake:u,isUnstakeOutput:n}))];n&&(d[0][0]=l.Utxo.createFrom(d[0][0],{amount:0n,isUnstakeOutput:n}));const P=[!1],k=B.randomBigInt(30),h=j.UserKeys.getEncryptionKeyPair(t.userKeys.getShieldedPrivateKey()),K=p.encryptStake(k,a,T.ownerPublicKey),D=p.encryptStake(k,a,h.publicKey),F=n?0n:p.createStakeCommitment(!0,a,k,E,o[0],BigInt(d[0][0].timeStamp)),I=u?0:1,v=p.encodeHStakeMetadata(I,F,C,K,D),x=t.getContractWithSigner(S.ContractType.HinkalWrapper2),y=t.getContractWithSigner(S.ContractType.HinkalStakeExternalAction),{zkCallData:q,dimData:A,circomData:U}=await _.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,r,d,t.userKeys,"swapperME1x2x1",M.ExternalActionId.HinkalStake,y.address,v,T.zeroAddress,t.getCurrentChainId(),P,void 0,void 0,{stakedTokenRecipient:a,stakeBlinding:k,mode:s,depositorAddress:C});if(n){const e=f.getHToken(i,t.getCurrentChainId());if(!e)throw new Error("hToken not found");const W=(await t.getContractWithFetcher(S.ContractType.HToken,e.erc20TokenAddress).previewWithdraw(-o[0])).toBigInt();return w.transactCallDirect(t,W,e,q,U,A,y,x)}return w.transactCallDirect(t,o[0],i,q,U,A,y,x)};exports.hinkalActionStake=z;

package/data-structures/Hinkal/hinkalActionStake.mjs

@@ -1,122 +1,118 @@
-import { ownerPublicKey as h, zeroAddress as B } from "../../constants/protocol.constants.mjs";
-import { encryptStake as T, createStakeCommitment as O, encodeHStakeMetadata as b } from "../../functions/staking/index.mjs";
-import { getERC20Token as N, getHToken as z } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { randomBigInt as $ } from "../../functions/web3/etherFunctions.mjs";
-import { outputUtxoProcessing as j } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as Z } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as q } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { Utxo as f } from "../utxo/Utxo.mjs";
+import { ownerPublicKey as v, zeroAddress as h } from "../../constants/protocol.constants.mjs";
+import { encryptStake as T, createStakeCommitment as B, encodeHStakeMetadata as O } from "../../functions/staking/index.mjs";
+import { getERC20Token as b, getHToken as z } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { randomBigInt as j } from "../../functions/web3/etherFunctions.mjs";
+import { outputUtxoProcessing as M } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as N } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as Z } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { Utxo as u } from "../utxo/Utxo.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as k } from "../../types/ethereum-network.types.mjs";
-import { ExternalActionId as G } from "../../types/external-action.types.mjs";
+import { ExternalActionId as q } from "../../types/external-action.types.mjs";
 import "../../types/transactions.types.mjs";
 import "../../types/curve.types.mjs";
-import { HinkalStakeMode as g } from "../../types/hinkal.stake.types.mjs";
+import { HinkalStakeMode as y } from "../../types/hinkal.stake.types.mjs";
 import "ethers";
-import { UserKeys as J } from "../crypto-keys/keys.mjs";
+import { UserKeys as G } from "../crypto-keys/keys.mjs";
 import "../crypto-keys/encryptDecryptUtxo.mjs";
 import { transactCallDirect as w } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-const ut = async (t, y, e, a, c) => {
-  const A = await t.getEthereumAddress(), s = N(y[0], t.getCurrentChainId());
-  if (!s)
+const pt = async (t, g, e, a, s) => {
+  const A = await t.getEthereumAddress(), c = b(g[0], t.getCurrentChainId());
+  if (!c)
     throw Error("Deposit Action: No Token Found");
-  const m = a === g.Stake, n = a === g.Unstake, { symbol: U } = s;
-  console.log(`${a} token ${U} Start`);
-  const { erc20TokenAddress: E } = s, r = [
-    ...await q(
+  const m = a === y.Stake, n = a === y.Unstake, { erc20TokenAddress: U } = c, r = [
+    ...await Z(
       t,
-      y,
+      g,
       e,
       2,
       void 0,
-      a !== g.Deposit
+      a !== y.Deposit
     )
   ];
   if (m || n) {
-    r[0][0] = f.createFrom(r[0][0], {
+    r[0][0] = u.createFrom(r[0][0], {
       amount: e[0] * (m ? 1n : -1n),
       isStakeOrUnstakeInput: !0
     });
     for (let o = 0; o < r.length; o += 1)
       for (let i = 0; i < r[o].length; i += 1)
-        o === 0 && i === 0 || (r[o][i] = f.createFrom(r[o][i], { amount: 0n }));
+        o === 0 && i === 0 || (r[o][i] = u.createFrom(r[o][i], { amount: 0n }));
   }
-  const { outputUtxos: K } = j(t.userKeys, r[0], e[0]), p = [
-    K.map(
-      (o) => f.createFrom(o, {
+  const { outputUtxos: E } = M(t.userKeys, r[0], e[0]), p = [
+    E.map(
+      (o) => u.createFrom(o, {
         isStake: m,
         isUnstakeOutput: n
       })
     )
   ];
-  n && (p[0][0] = f.createFrom(p[0][0], {
+  n && (p[0][0] = u.createFrom(p[0][0], {
     amount: 0n,
     isUnstakeOutput: n
   }));
-  const H = [!1], d = $(30), I = J.getEncryptionKeyPair(t.userKeys.getShieldedPrivateKey()), P = T(d, c, h), D = T(d, c, I.publicKey), F = n ? 0n : O(
+  const K = [!1], d = j(30), H = G.getEncryptionKeyPair(t.userKeys.getShieldedPrivateKey()), I = T(d, s, v), P = T(d, s, H.publicKey), D = n ? 0n : B(
     !0,
-    c,
+    s,
     d,
-    E,
+    U,
     e[0],
     BigInt(p[0][0].timeStamp)
-  ), W = b(
+  ), F = O(
     m ? 0 : 1,
-    F,
+    D,
     A,
-    P,
-    D
-  ), C = t.getContractWithSigner(k.HinkalWrapper2), u = t.getContractWithSigner(k.HinkalStakeExternalAction);
-  console.log("external action address", u.address);
-  const { zkCallData: S, dimData: x, circomData: l } = await Z(
+    I,
+    P
+  ), C = t.getContractWithSigner(k.HinkalWrapper2), f = t.getContractWithSigner(k.HinkalStakeExternalAction), { zkCallData: S, dimData: l, circomData: x } = await N(
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
     r,
     p,
     t.userKeys,
     "swapperME1x2x1",
-    G.HinkalStake,
-    u.address,
-    W,
-    B,
+    q.HinkalStake,
+    f.address,
+    F,
+    h,
     t.getCurrentChainId(),
-    H,
+    K,
     void 0,
     void 0,
     {
-      stakedTokenRecipient: c,
+      stakedTokenRecipient: s,
       stakeBlinding: d,
       mode: a,
       depositorAddress: A
     }
   );
-  if (console.log(l), n) {
-    const o = z(s, t.getCurrentChainId());
+  if (n) {
+    const o = z(c, t.getCurrentChainId());
     if (!o)
       throw new Error("hToken not found");
-    const v = (await t.getContractWithFetcher(k.HToken, o.erc20TokenAddress).previewWithdraw(-e[0])).toBigInt();
+    const W = (await t.getContractWithFetcher(k.HToken, o.erc20TokenAddress).previewWithdraw(-e[0])).toBigInt();
     return w(
       t,
-      v,
+      W,
       o,
       S,
-      l,
       x,
-      u,
+      l,
+      f,
       C
     );
   }
   return w(
     t,
     e[0],
-    s,
+    c,
     S,
-    l,
     x,
-    u,
+    l,
+    f,
     C
   );
 };
 export {
-  ut as hinkalActionStake
+  pt as hinkalActionStake
 };

package/data-structures/Hinkal/hinkalActionVolatile.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const V=require("../../constants/protocol.constants.cjs"),P=require("../../functions/utils/erc20tokenFunctions.cjs"),U=require("../../functions/pre-transaction/getFlatFees.cjs"),m=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),H=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),C=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),W=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),b=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),E=require("../volatile-helper/VolatileHelper.cjs"),n=require("../../types/hinkal.types.cjs"),q=require("../../types/ethereum-network.types.cjs"),M=require("../../types/external-action.types.cjs"),z=require("../../error-handling/error-codes.constants.cjs"),G=async(t,a,e,D,R)=>{const{action:o,isRelayerOff:i,recipientAddress:T,baseExternalActionId:I,baseExternalActionMetadata:F}=D,A=P.getERC20Token(a[0],t.getCurrentChainId());if(!A)throw Error("Deposit Action: No Token Found");const l=[...e],S=[...a];let y=[],g=e.map(()=>0n);({erc20Addresses:a,amountChanges:e,onChainCreation:y}=await E.VolatileHelper.processVolatileData(t.getCurrentChainId(),o,a,e)),console.log("pre-amounts",e);const c=await E.VolatileHelper.getVolatileExternalData(t,o,l,T,I,F);if(!c)throw Error("No External Action Data");(o===n.VolatileAction.Withdraw&&!i||o===n.VolatileAction.Swap)&&({flatFees:g}=await U.getFlatFees(t.getCurrentChainId(),S,M.ExternalActionId.Volatile,l,o),o===n.VolatileAction.Swap&&(e[1]=0n),console.log("hinkalActionVolatile flatFees:",{flatFees:g,erc20Addresses:a,amountChanges:e,originalAmountChanges:l,externalActionData:c}));const d=[...await N.addPaddingToUtxos(t,a,e)],_=`swapperM${e.length.toString()}x${d[0].length}x1`,f=[];for(let r=0;r<a.length;r+=1){const{outputUtxos:x}=m.outputUtxoProcessing(t.userKeys,d[r],e[r]);f.push(x)}const w=o===n.VolatileAction.Deposit||i?V.zeroAddress:await t.getRandomRelay();if(!i&&!w)throw Error(z.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{zkCallData:s,circomData:u,dimData:p}=await H.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,d,f,t.userKeys,_,c.externalActionId,c.externalAddress,c.externalActionMetadata,i?V.zeroAddress:w,t.getCurrentChainId(),y,g);if(console.log("after proof generation"),o===n.VolatileAction.Deposit){const r=t.getContractWithSigner(q.ContractType.VolatileVault),x=t.getContractWithSigner(q.ContractType.HinkalWrapper);return console.log("here",{contractToApprove:r}),await C.transactCallDirect(t,l[0],A,s,u,p,r,x)}return o===n.VolatileAction.Withdraw&&i?await C.transactCallDirect(t,e[0],A,s,u,p):R?await b.estimateGasRelayer(t,s,p,u):await W.transactCallRelayer(t.getCurrentChainId(),s,p,u)};exports.hinkalActionVolatile=G;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const V=require("../../constants/protocol.constants.cjs"),m=require("../../functions/utils/erc20tokenFunctions.cjs"),P=require("../../functions/pre-transaction/getFlatFees.cjs"),U=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),H=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),f=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),W=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),b=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),E=require("../volatile-helper/VolatileHelper.cjs"),n=require("../../types/hinkal.types.cjs"),q=require("../../types/ethereum-network.types.cjs"),M=require("../../types/external-action.types.cjs"),z=require("../../error-handling/error-codes.constants.cjs"),G=async(t,a,e,D,R)=>{const{action:r,isRelayerOff:i,recipientAddress:T,baseExternalActionId:I,baseExternalActionMetadata:S}=D,p=m.getERC20Token(a[0],t.getCurrentChainId());if(!p)throw Error("Deposit Action: No Token Found");const A=[...e],F=[...a];let g=[],y=e.map(()=>0n);({erc20Addresses:a,amountChanges:e,onChainCreation:g}=await E.VolatileHelper.processVolatileData(t.getCurrentChainId(),r,a,e));const c=await E.VolatileHelper.getVolatileExternalData(t,r,A,T,I,S);if(!c)throw Error("No External Action Data");(r===n.VolatileAction.Withdraw&&!i||r===n.VolatileAction.Swap)&&({flatFees:y}=await P.getFlatFees(t.getCurrentChainId(),F,M.ExternalActionId.Volatile,A,r),r===n.VolatileAction.Swap&&(e[1]=0n));const d=[...await N.addPaddingToUtxos(t,a,e)],_=`swapperM${e.length.toString()}x${d[0].length}x1`,w=[];for(let o=0;o<a.length;o+=1){const{outputUtxos:x}=U.outputUtxoProcessing(t.userKeys,d[o],e[o]);w.push(x)}const C=r===n.VolatileAction.Deposit||i?V.zeroAddress:await t.getRandomRelay();if(!i&&!C)throw Error(z.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{zkCallData:s,circomData:l,dimData:u}=await H.constructZkProof(t.merkleTreeHinkal,t.merkleTreeAccessToken,d,w,t.userKeys,_,c.externalActionId,c.externalAddress,c.externalActionMetadata,i?V.zeroAddress:C,t.getCurrentChainId(),g,y);if(r===n.VolatileAction.Deposit){const o=t.getContractWithSigner(q.ContractType.VolatileVault),x=t.getContractWithSigner(q.ContractType.HinkalWrapper);return await f.transactCallDirect(t,A[0],p,s,l,u,o,x)}return r===n.VolatileAction.Withdraw&&i?await f.transactCallDirect(t,e[0],p,s,l,u):R?await b.estimateGasRelayer(t,s,u,l):await W.transactCallRelayer(t.getCurrentChainId(),s,u,l)};exports.hinkalActionVolatile=G;