@reyaxyz/sdk 0.54.1 → 0.56.0

package/dist/services/executeTransaction.js

@@ -81,7 +81,7 @@ function estimateGas(signer, data, value, chainId, targetContract) {
                 case 5:
                     if (Object.values(common_1.ReyaChainId).includes(chainId)) {
                         maxPriorityFeePerGas = BigInt('0');
-                        maxFeePerGas = BigInt('0');
+                        maxFeePerGas = BigInt('100000000');
                         return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit, maxPriorityFeePerGas: maxPriorityFeePerGas, maxFeePerGas: maxFeePerGas })];
                     }
                     return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit })];

package/dist/services/executeTransaction.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport {\n  BroadcastTransactionMetadata,\n  getTransactionModuleClient,\n} from '../config';\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\n\nexport async function estimateGas(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const accountAddress = await signer.getAddress();\n\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  const tx = {\n    from: accountAddress, // @todo Update with relayer address\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    // sentry error & thorw\n    console.warn(error);\n    throw new Error('Error executing transaction'); // @todo introduce error parsing\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('0');\n    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n  }\n\n  return { ...tx, gasLimit };\n}\n\nexport async function executeTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n) {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait();\n    return txReceipt;\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n\nexport async function signAndBroadcastTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n  metadata: BroadcastTransactionMetadata,\n): Promise<{ hash: string; accountId?: string }> {\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    const { txHash, accountId } =\n      await transactionModuleClient.executeTransaction(\n        { to: contractAddress, data: data },\n        contractAddress,\n        metadata,\n      );\n    return { hash: txHash, accountId };\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}
+{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport {\n  BroadcastTransactionMetadata,\n  getTransactionModuleClient,\n} from '../config';\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport type Transaction = {\n  from: string;\n  to: string;\n  data: string;\n  value?: string;\n};\n\nexport async function estimateGas(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n): Promise<\n  Transaction & {\n    gasLimit: bigint;\n    maxPriorityFeePerGas?: bigint;\n    maxFeePerGas?: bigint;\n  }\n> {\n  const accountAddress = await signer.getAddress();\n\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  const tx = {\n    from: accountAddress, // @todo Update with relayer address\n    to: contractAddress,\n    data,\n    ...(value && value !== '0' ? { value: value } : {}),\n  };\n\n  let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n  try {\n    const gasEstimate = await signer.estimateGas(tx);\n    gasLimit = getGasBuffer(gasEstimate);\n  } catch (error) {\n    // sentry error & thorw\n    console.warn(error);\n    throw new Error('Error executing transaction'); // @todo introduce error parsing\n  }\n\n  if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n    const maxPriorityFeePerGas: bigint = BigInt('0');\n    const maxFeePerGas: bigint = BigInt('100000000');\n    return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n  }\n\n  return { ...tx, gasLimit };\n}\n\nexport async function executeTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n) {\n  const txData = await estimateGas(\n    signer,\n    data,\n    value,\n    chainId,\n    targetContract,\n  );\n\n  try {\n    const txResponse = await signer.sendTransaction(txData);\n    const txReceipt = await txResponse.wait();\n    return txReceipt;\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n\nexport async function signAndBroadcastTransaction(\n  signer: Signer | JsonRpcSigner,\n  data: string,\n  value: string,\n  chainId: number,\n  targetContract: ContractType | string,\n  metadata: BroadcastTransactionMetadata,\n): Promise<{ hash: string; accountId?: string }> {\n  const contractAddress = Object.values(ContractType).includes(\n    targetContract as ContractType,\n  )\n    ? getAddress(chainId, targetContract as ContractType)\n    : targetContract;\n  try {\n    const transactionModuleClient = getTransactionModuleClient();\n    const { txHash, accountId } =\n      await transactionModuleClient.executeTransaction(\n        { to: contractAddress, data: data },\n        contractAddress,\n        metadata,\n      );\n    return { hash: txHash, accountId };\n  } catch (error) {\n    console.warn(error);\n    throw new Error('Transaction Execution Error');\n  }\n}\n"]}

package/dist/services/margin-accounts/encode.js

@@ -142,7 +142,7 @@ var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketC
     var fallbackData = {
         socketMsgGasLimit: fallbackSocketMsgGasLimit,
         socketConnector: fallbackSocketConnector,
-        socketPayloadSize: fallbackSocketPayloadSize, // @todo update it
+        socketPayloadSize: fallbackSocketPayloadSize,
     };
     var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositNewMA((address,address,uint256),(uint256,uint256,address))', [inputs, fallbackData]);
     var functionSignature = 'bridge';

package/dist/services/margin-accounts/encode.js.map

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport {\n  encodeRouterCall,\n  encodeSingleDeposit,\n  encodeSingleTransferMargin,\n  encodeSingleWithdraw,\n} from '../encode';\n\nimport { abi } from '../../abis/CoreProxy.json';\nimport { abi as coreAbi } from '../../abis/CoreProxy.json';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\nimport { EIP712Signature, signCoreCommands } from '../sign';\nimport { CORE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { Signer } from 'ethers';\nimport { ethers } from 'ethers';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const encodeCreateAccountCall = (\n  accountOwner: string,\n): MethodParameters => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeDeposit = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleDeposit(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeWithdraw = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleWithdraw(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeTransferMargin = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  fromMarginAccountId: number,\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n  // todo: note can we make this more stateless?\n  encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    fromMarginAccountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [\n    fromMarginAccountId,\n    multiAction.commands,\n    eip712Signature,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  ];\n\n  const INTERFACE = new Interface(coreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  socketPayloadSize: bigint,\n  socketConnector: string,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMA';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\n      sig,\n      socketMsgGasLimit,\n      socketPayloadSize,\n      socketConnector,\n      receiver,\n    },\n  ];\n  const INTERFACE = new Interface(peripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositNewMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountOwner: string,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountOwner,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n    socketPayloadSize: fallbackSocketPayloadSize, // @todo update it\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositNewMA((address,address,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n\nexport const encodeBridgeAndDepositExistingMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountId: number,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n    socketPayloadSize: fallbackSocketPayloadSize,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAmE;AACnE,iCAAmC;AACnC,oCAKmB;AAEnB,4DAAgD;AAChD,4DAA2D;AAC3D,4DAAgE;AAChE,iFAA4F;AAC5F,gCAA4D;AAC5D,6CAA8D;AAC9D,0CAA+D;AAE/D,iCAAgC;AAChC,mEAAyE;AAElE,IAAM,uBAAuB,GAAG,UACrC,YAAoB;IAEpB,IAAM,iBAAiB,GAAG,eAAe,CAAC;IAC1C,IAAM,UAAU,GAAG,CAAC,YAAY,CAAC,CAAC;IAClC,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,oBAAG,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AARW,QAAA,uBAAuB,2BAQlC;AAEK,IAAM,aAAa,GAAG,UAC3B,SAAiB,EACjB,KAAa,EACb,MAAc;IAEd,IAAM,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;IAEtC,IAAA,4BAAmB,EAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAEhD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACxB,IAAM,IAAI,GAAG,IAAA,yBAAgB,EAAC,WAAW,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAE7D,oBACK,IAAI,EACP;AACJ,CAAC,CAAC;AAfW,QAAA,aAAa,iBAexB;AAEK,IAAM,cAAc,GAAG,UAC5B,SAAiB,EACjB,KAAa,EACb,MAAc;IAEd,IAAM,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;IAEtC,IAAA,6BAAoB,EAAC,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;IAEjD,IAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;IACxB,IAAM,IAAI,GAAG,IAAA,yBAAgB,EAAC,WAAW,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;IAE7D,oBACK,IAAI,EACP;AACJ,CAAC,CAAC;AAfW,QAAA,cAAc,kBAezB;AAEK,IAAM,oBAAoB,GAAG,UAClC,MAAc,EACd,OAAe,EACf,YAAoB,EACpB,mBAA2B,EAC3B,iBAAyB,EACzB,KAAa,EACb,MAAc;;;;;gBAER,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,8CAA8C;gBAC9C,IAAA,mCAA0B,EAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBAElD,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,mBAAmB,EACnB,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,CAC1D,EAAA;;gBARK,eAAe,GAAG,SAQvB;gBAEK,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,iBAAiB,GAAG,cAAc,CAAC;gBACnC,UAAU,GAAG;oBACjB,mBAAmB;oBACnB,WAAW,CAAC,QAAQ;oBACpB,eAAe;oBACf,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC;iBACjD,CAAC;gBAEI,SAAS,GAAG,IAAI,kBAAS,CAAC,oBAAO,CAAC,CAAC;gBACnC,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;gBAC7E,sBAAO;wBACL,QAAQ,EAAE,QAAQ;wBAClB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;qBAClC,EAAC;;;KACH,CAAC;AAtCW,QAAA,oBAAoB,wBAsC/B;AAEK,IAAM,yBAAyB,GAAG,UACvC,SAAiB,EACjB,yBAAiC,EACjC,wBAAgC,EAChC,GAAoB,EACpB,iBAAyB,EACzB,iBAAyB,EACzB,eAAuB,EACvB,QAAgB;IAEhB,IAAM,iBAAiB,GAAG,YAAY,CAAC;IACvC,IAAM,UAAU,GAAG;QACjB;YACE,SAAS,WAAA;YACT,KAAK,EAAE,yBAAyB;YAChC,WAAW,EAAE,wBAAwB;YACrC,GAAG,KAAA;YACH,iBAAiB,mBAAA;YACjB,iBAAiB,mBAAA;YACjB,eAAe,iBAAA;YACf,QAAQ,UAAA;SACT;KACF,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,oBAAY,CAAC,CAAC;IAC9C,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AA1BW,QAAA,yBAAyB,6BA0BpC;AAEK,IAAM,2BAA2B,GAAG,UACzC,QAAgB,EAChB,iBAAyB,EACzB,eAAuB,EACvB,mBAA2B,EAC3B,UAAkB,EAClB,YAAoB,EACpB,qBAA6B,EAC7B,oBAA4B,EAC5B,qBAA6B,EAC7B,yBAAiC,EACjC,uBAA+B,EAC/B,yBAAiC;IAEjC,IAAM,mBAAmB,GAAG,IAAI,kBAAS,CAAC,oBAAY,CAAC,CAAC;IACxD,IAAM,MAAM,GAAG;QACb,YAAY,cAAA;QACZ,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EAAE,oBAAoB;KAClC,CAAC;IACF,IAAM,YAAY,GAAG;QACnB,iBAAiB,EAAE,yBAAyB;QAC5C,eAAe,EAAE,uBAAuB;QACxC,iBAAiB,EAAE,yBAAyB;KAC7C,CAAC;IACF,IAAM,iBAAiB,GAAG,mBAAmB,CAAC,kBAAkB,CAC9D,mEAAmE,EACnE,CAAC,MAAM,EAAE,YAAY,CAAC,CACvB,CAAC;IAEF,IAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAM,UAAU,GAAG;QACjB,QAAQ;QACR,qBAAqB;QACrB,iBAAiB;QACjB,eAAe;QACf,iBAAiB;QACjB,mBAAmB;KACpB,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,2BAA0B,CAAC,CAAC;IAC5D,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC,CAAC;AA1CW,QAAA,2BAA2B,+BA0CtC;AAEK,IAAM,gCAAgC,GAAG,UAC9C,QAAgB,EAChB,iBAAyB,EACzB,eAAuB,EACvB,mBAA2B,EAC3B,UAAkB,EAClB,SAAiB,EACjB,qBAA6B,EAC7B,oBAA4B,EAC5B,qBAA6B,EAC7B,yBAAiC,EACjC,uBAA+B,EAC/B,yBAAiC;IAEjC,IAAM,mBAAmB,GAAG,IAAI,kBAAS,CAAC,oBAAY,CAAC,CAAC;IACxD,IAAM,MAAM,GAAG;QACb,SAAS,WAAA;QACT,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EAAE,oBAAoB;KAClC,CAAC;IACF,IAAM,YAAY,GAAG;QACnB,iBAAiB,EAAE,yBAAyB;QAC5C,eAAe,EAAE,uBAAuB;QACxC,iBAAiB,EAAE,yBAAyB;KAC7C,CAAC;IACF,IAAM,iBAAiB,GAAG,mBAAmB,CAAC,kBAAkB,CAC9D,wEAAwE,EACxE,CAAC,MAAM,EAAE,YAAY,CAAC,CACvB,CAAC;IAEF,IAAM,iBAAiB,GAAG,QAAQ,CAAC;IACnC,IAAM,UAAU,GAAG;QACjB,QAAQ;QACR,qBAAqB;QACrB,iBAAiB;QACjB,eAAe;QACf,iBAAiB;QACjB,mBAAmB;KACpB,CAAC;IACF,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,2BAA0B,CAAC,CAAC;IAC5D,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAChE,CAAC,CAAC;AA1CW,QAAA,gCAAgC,oCA0C3C","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport {\n  encodeRouterCall,\n  encodeSingleDeposit,\n  encodeSingleTransferMargin,\n  encodeSingleWithdraw,\n} from '../encode';\n\nimport { abi } from '../../abis/CoreProxy.json';\nimport { abi as coreAbi } from '../../abis/CoreProxy.json';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\nimport { EIP712Signature, signCoreCommands } from '../sign';\nimport { CORE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { Signer } from 'ethers';\nimport { ethers } from 'ethers';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const encodeCreateAccountCall = (\n  accountOwner: string,\n): MethodParameters => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeDeposit = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleDeposit(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeWithdraw = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleWithdraw(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeTransferMargin = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  fromMarginAccountId: number,\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n  // todo: note can we make this more stateless?\n  encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    fromMarginAccountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [\n    fromMarginAccountId,\n    multiAction.commands,\n    eip712Signature,\n    ethers.AbiCoder.defaultAbiCoder().encode([], []),\n  ];\n\n  const INTERFACE = new Interface(coreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  socketPayloadSize: bigint,\n  socketConnector: string,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMA';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\n      sig,\n      socketMsgGasLimit,\n      socketPayloadSize,\n      socketConnector,\n      receiver,\n    },\n  ];\n  const INTERFACE = new Interface(peripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositNewMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountOwner: string,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountOwner,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n    socketPayloadSize: fallbackSocketPayloadSize,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositNewMA((address,address,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n\nexport const encodeBridgeAndDepositExistingMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountId: number,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n    socketPayloadSize: fallbackSocketPayloadSize,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}

package/dist/utils/contractAddresses.js

@@ -12,9 +12,9 @@ var ContractType;
 })(ContractType || (exports.ContractType = ContractType = {}));
 var addresses = (_a = {},
     _a[common_1.ReyaChainId.reyaCronos] = (_b = {},
-        _b[ContractType.CORE_PROXY] = '0xaf68ce211989a9b05a8d6212c8f432785296a847',
-        _b[ContractType.PASSIVE_POOL_PROXY] = '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',
-        _b[ContractType.PERIPHERY_PROXY] = '0x8a0500b4290aba646a3d46027b621e5167a56b8d',
+        _b[ContractType.CORE_PROXY] = '0x20da8f7aa44f858a3a3e3f03ba6ffad039d1eb28',
+        _b[ContractType.PASSIVE_POOL_PROXY] = '0x9afc30bed29d636e566fd9d7dd89d51773724be6',
+        _b[ContractType.PERIPHERY_PROXY] = '0xa45d0566144956b6012d461ad509dad2bacacaaf',
         _b),
     // TODO: add proper config
     _a[common_1.ReyaChainId.reyaNetwork] = (_c = {},

package/dist/utils/contractAddresses.js.map

@@ -1 +1 @@
-{"version":3,"file":"contractAddresses.js","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":";;;;AACA,+CAA+C;AAC/C,0CAA8C;AAE9C,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,yCAAyB,CAAA;IACzB,yDAAyC,CAAA;IACzC,mDAAmC,CAAA;AACrC,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAED,IAAM,SAAS;IACb,GAAC,oBAAW,CAAC,UAAU;QACrB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAC3B,4CAA4C;WAC/C;IACD,0BAA0B;IAC1B,GAAC,oBAAW,CAAC,WAAW;QACtB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAAG,MAAM;WACvC;OACF,CAAC;AACK,IAAM,UAAU,GAAG,UACxB,OAAe,EACf,YAA0B;IAE1B,IAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,6CAAsC,UAAU,CAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAM,gBAAgB,GAAG,SAAS,CAAC,OAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,kCAA2B,YAAY,cAAW,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,UAAU,cAgBrB","sourcesContent":["export type Address = Lowercase<string>;\n// @todo update with proper chainId for mainnet\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport enum ContractType {\n  CORE_PROXY = 'core_proxy',\n  PASSIVE_POOL_PROXY = 'passive_pool_proxy',\n  PERIPHERY_PROXY = 'periphery_proxy',\n}\n\nconst addresses: Record<ReyaChainId, Record<ContractType, Address>> = {\n  [ReyaChainId.reyaCronos]: {\n    [ContractType.CORE_PROXY]: '0xaf68ce211989a9b05a8d6212c8f432785296a847',\n    [ContractType.PASSIVE_POOL_PROXY]:\n      '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',\n    [ContractType.PERIPHERY_PROXY]:\n      '0x8a0500b4290aba646a3d46027b621e5167a56b8d',\n  },\n  // TODO: add proper config\n  [ReyaChainId.reyaNetwork]: {\n    [ContractType.CORE_PROXY]: '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',\n    [ContractType.PASSIVE_POOL_PROXY]:\n      '0x63df38878c5b8e84d7dcb347b934072add64bdc5',\n    [ContractType.PERIPHERY_PROXY]: 'todo',\n  },\n};\nexport const getAddress = (\n  chainId: number,\n  contractName: ContractType,\n): Address => {\n  const keyChainId = chainId.toString();\n\n  if (!Object.keys(addresses).includes(keyChainId)) {\n    throw new Error(`Unspecified addresses for chain id ${keyChainId}`);\n  }\n\n  const networkAddresses = addresses[chainId as ReyaChainId];\n  if (!Object.keys(networkAddresses).includes(contractName)) {\n    throw new Error(`Unspecified address for ${contractName} contract`);\n  }\n\n  return networkAddresses[contractName];\n};\n"]}
+{"version":3,"file":"contractAddresses.js","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":";;;;AACA,+CAA+C;AAC/C,0CAA8C;AAE9C,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,yCAAyB,CAAA;IACzB,yDAAyC,CAAA;IACzC,mDAAmC,CAAA;AACrC,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAED,IAAM,SAAS;IACb,GAAC,oBAAW,CAAC,UAAU;QACrB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAC3B,4CAA4C;WAC/C;IACD,0BAA0B;IAC1B,GAAC,oBAAW,CAAC,WAAW;QACtB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAAG,MAAM;WACvC;OACF,CAAC;AACK,IAAM,UAAU,GAAG,UACxB,OAAe,EACf,YAA0B;IAE1B,IAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,6CAAsC,UAAU,CAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAM,gBAAgB,GAAG,SAAS,CAAC,OAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,kCAA2B,YAAY,cAAW,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,UAAU,cAgBrB","sourcesContent":["export type Address = Lowercase<string>;\n// @todo update with proper chainId for mainnet\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport enum ContractType {\n  CORE_PROXY = 'core_proxy',\n  PASSIVE_POOL_PROXY = 'passive_pool_proxy',\n  PERIPHERY_PROXY = 'periphery_proxy',\n}\n\nconst addresses: Record<ReyaChainId, Record<ContractType, Address>> = {\n  [ReyaChainId.reyaCronos]: {\n    [ContractType.CORE_PROXY]: '0x20da8f7aa44f858a3a3e3f03ba6ffad039d1eb28',\n    [ContractType.PASSIVE_POOL_PROXY]:\n      '0x9afc30bed29d636e566fd9d7dd89d51773724be6',\n    [ContractType.PERIPHERY_PROXY]:\n      '0xa45d0566144956b6012d461ad509dad2bacacaaf',\n  },\n  // TODO: add proper config\n  [ReyaChainId.reyaNetwork]: {\n    [ContractType.CORE_PROXY]: '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',\n    [ContractType.PASSIVE_POOL_PROXY]:\n      '0x63df38878c5b8e84d7dcb347b934072add64bdc5',\n    [ContractType.PERIPHERY_PROXY]: 'todo',\n  },\n};\nexport const getAddress = (\n  chainId: number,\n  contractName: ContractType,\n): Address => {\n  const keyChainId = chainId.toString();\n\n  if (!Object.keys(addresses).includes(keyChainId)) {\n    throw new Error(`Unspecified addresses for chain id ${keyChainId}`);\n  }\n\n  const networkAddresses = addresses[chainId as ReyaChainId];\n  if (!Object.keys(networkAddresses).includes(contractName)) {\n    throw new Error(`Unspecified address for ${contractName} contract`);\n  }\n\n  return networkAddresses[contractName];\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.54.1",
+  "version": "0.56.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -34,5 +34,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "1611c08ee773222e80568a665e462ae1fd59644c"
+  "gitHead": "defa761169a5b221df8a7729a86e63ac838f2a9d"
 }

package/src/services/executeTransaction.ts

@@ -54,7 +54,7 @@ export async function estimateGas(
 
   if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {
     const maxPriorityFeePerGas: bigint = BigInt('0');
-    const maxFeePerGas: bigint = BigInt('0');
+    const maxFeePerGas: bigint = BigInt('100000000');
     return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };
   }
 

package/src/services/margin-accounts/encode.ts

@@ -153,7 +153,7 @@ export const encodeBridgeAndDepositNewMA = (
   const fallbackData = {
     socketMsgGasLimit: fallbackSocketMsgGasLimit,
     socketConnector: fallbackSocketConnector,
-    socketPayloadSize: fallbackSocketPayloadSize, // @todo update it
+    socketPayloadSize: fallbackSocketPayloadSize,
   };
   const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
     'depositNewMA((address,address,uint256),(uint256,uint256,address))',

package/src/utils/contractAddresses.ts

@@ -10,11 +10,11 @@ export enum ContractType {
 
 const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
   [ReyaChainId.reyaCronos]: {
-    [ContractType.CORE_PROXY]: '0xaf68ce211989a9b05a8d6212c8f432785296a847',
+    [ContractType.CORE_PROXY]: '0x20da8f7aa44f858a3a3e3f03ba6ffad039d1eb28',
     [ContractType.PASSIVE_POOL_PROXY]:
-      '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',
+      '0x9afc30bed29d636e566fd9d7dd89d51773724be6',
     [ContractType.PERIPHERY_PROXY]:
-      '0x8a0500b4290aba646a3d46027b621e5167a56b8d',
+      '0xa45d0566144956b6012d461ad509dad2bacacaaf',
   },
   // TODO: add proper config
   [ReyaChainId.reyaNetwork]: {