@reyaxyz/sdk 0.22.0 → 0.23.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/services/lp/bridgeAndDepositPassivePool.js +2 -0
- package/dist/services/lp/bridgeAndDepositPassivePool.js.map +1 -1
- package/dist/services/lp/encode.js +6 -6
- package/dist/services/lp/encode.js.map +1 -1
- package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js +2 -0
- package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js.map +1 -1
- package/dist/services/margin-accounts/bridgeAndDepositNewMA.js +2 -0
- package/dist/services/margin-accounts/bridgeAndDepositNewMA.js.map +1 -1
- package/dist/services/margin-accounts/encode.js +8 -8
- package/dist/services/margin-accounts/encode.js.map +1 -1
- package/dist/types/services/lp/bridgeAndDepositPassivePool.d.ts.map +1 -1
- package/dist/types/services/lp/encode.d.ts +2 -2
- package/dist/types/services/lp/encode.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/bridgeAndDepositExistingMA.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/bridgeAndDepositNewMA.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/encode.d.ts +2 -2
- package/dist/types/services/margin-accounts/encode.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/services/lp/bridgeAndDepositPassivePool.ts +9 -1
- package/src/services/lp/encode.ts +8 -7
- package/src/services/margin-accounts/bridgeAndDepositExistingMA.ts +4 -0
- package/src/services/margin-accounts/bridgeAndDepositNewMA.ts +8 -1
- package/src/services/margin-accounts/encode.ts +12 -10
|
@@ -56,6 +56,8 @@ var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, v
|
|
|
56
56
|
_a = (0, encode_1.encodeBridgeAndDepositPassivePool)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
|
|
57
57
|
chainId: chainId,
|
|
58
58
|
tokenAddress: params.pool.tokenAddress.toLowerCase(),
|
|
59
|
+
}), (0, common_1.getSocketFees)({
|
|
60
|
+
moneyInOutChainId: chainId,
|
|
59
61
|
}), params.pool.id, params.ownerAddress, amount, BigInt(0)), data = _a.calldata, value = _a.value;
|
|
60
62
|
return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({
|
|
61
63
|
moneyInOutChainId: chainId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA6D;AAMtD,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,0CAAiC,EACjE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,CACV,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;qBAChE,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAvCW,QAAA,2BAA2B,+BAuCtC","sourcesContent":["import {\n Address,\n getSocketConnector,\n getSocketFees,\n getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n BridgeAndDepositPassivePoolParams,\n BridgeAndDepositPassivePoolResult,\n} from './types';\n\nexport const bridgeAndDepositPassivePool = async (\n params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n }),\n getSocketFees({\n moneyInOutChainId: chainId,\n }),\n params.pool.id,\n params.ownerAddress,\n amount,\n BigInt(0),\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -36,7 +36,7 @@ var encodeTransferFromMAToPool = function (accountId, amount, sig, poolId, owner
|
|
|
36
36
|
return { calldata: calldata, value: BigInt(0).toString(10) };
|
|
37
37
|
};
|
|
38
38
|
exports.encodeTransferFromMAToPool = encodeTransferFromMAToPool;
|
|
39
|
-
var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount, minOut, sig, socketMsgGasLimit,
|
|
39
|
+
var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount, minOut, sig, socketMsgGasLimit, socketConnector, socketController, receiver) {
|
|
40
40
|
var functionSignature = 'withdrawPassivePool';
|
|
41
41
|
var parameters = [
|
|
42
42
|
{
|
|
@@ -46,7 +46,7 @@ var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount,
|
|
|
46
46
|
minOut: minOut,
|
|
47
47
|
sig: sig,
|
|
48
48
|
socketMsgGasLimit: socketMsgGasLimit,
|
|
49
|
-
|
|
49
|
+
socketConnector: socketConnector,
|
|
50
50
|
socketController: socketController,
|
|
51
51
|
receiver: receiver,
|
|
52
52
|
},
|
|
@@ -56,20 +56,20 @@ var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount,
|
|
|
56
56
|
return { calldata: calldata, value: BigInt(0).toString(10) };
|
|
57
57
|
};
|
|
58
58
|
exports.encodeWithdrawPassivePoolAndBridge = encodeWithdrawPassivePoolAndBridge;
|
|
59
|
-
var encodeBridgeAndDepositPassivePool = function (receiver,
|
|
59
|
+
var encodeBridgeAndDepositPassivePool = function (receiver, socketMsgGasLimit, socketConnector, socketFees, poolId, owner, amount, minShares) {
|
|
60
60
|
var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
|
|
61
61
|
var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositPassivePool', [{ poolId: poolId, owner: owner, amount: amount, minShares: minShares }]);
|
|
62
62
|
var functionSignature = 'depositToAppChain';
|
|
63
63
|
var parameters = [
|
|
64
64
|
receiver,
|
|
65
65
|
amount,
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
socketMsgGasLimit,
|
|
67
|
+
socketConnector,
|
|
68
68
|
peripheryCalldata,
|
|
69
69
|
];
|
|
70
70
|
var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
|
|
71
71
|
var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
|
|
72
|
-
return { calldata: calldata, value:
|
|
72
|
+
return { calldata: calldata, value: socketFees.toString(10) };
|
|
73
73
|
};
|
|
74
74
|
exports.encodeBridgeAndDepositPassivePool = encodeBridgeAndDepositPassivePool;
|
|
75
75
|
//# sourceMappingURL=encode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport { EIP712Signature } from '../sign';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\n\n// @todo Update ABI\nconst provideLiquidityAbi = [\n 'function addLiquidity(uint128 poolId, address owner, uint256 amount, uint256 minShares) returns (uint256)',\n];\n\n// @todo Update ABI\nconst removeLiquidityabi = [\n 'function removeLiquidity(uint128 poolId, uint256 sharesAmount, uint256 minOut) returns (uint256)',\n];\nexport const encodeProvideLiquidityCall = (\n poolId: number,\n accountOwner: string,\n amount: bigint,\n minShares: number,\n): MethodParameters => {\n const functionSignature = 'addLiquidity';\n const parameters = [poolId, accountOwner, amount, minShares];\n const INTERFACE = new Interface(provideLiquidityAbi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeRemoveLiquidityCall = (\n poolId: number,\n sharesAmount: bigint,\n minOut: number,\n): MethodParameters => {\n const functionSignature = 'removeLiquidity';\n const parameters = [poolId, sharesAmount, minOut];\n const INTERFACE = new Interface(removeLiquidityabi);\n const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeTransferFromMAToPool = (\n accountId: number,\n amount: bigint,\n sig: EIP712Signature,\n poolId: number,\n owner: string,\n minShares: bigint,\n): MethodParameters => {\n const functionSignature = 'transferFromMAToPool';\n const parameters = [{ accountId, amount, sig, poolId, owner, minShares }];\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 encodeWithdrawPassivePoolAndBridge = (\n owner: string,\n poolId: number,\n sharesAmount: bigint,\n minOut: bigint,\n sig: EIP712Signature,\n socketMsgGasLimit: bigint,\n socketConnector: string,\n socketController: string,\n receiver: string,\n): MethodParameters => {\n const functionSignature = 'withdrawPassivePool';\n const parameters = [\n {\n owner,\n poolId,\n sharesAmount,\n minOut,\n sig,\n socketMsgGasLimit,\n socketConnector,\n socketController,\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 encodeBridgeAndDepositPassivePool = (\n receiver: string,\n socketMsgGasLimit: bigint,\n socketConnector: string,\n socketFees: bigint,\n poolId: number,\n owner: string,\n amount: bigint,\n minShares: bigint,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositPassivePool',\n [{ poolId, owner, amount, minShares }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n amount,\n socketMsgGasLimit,\n socketConnector,\n peripheryCalldata,\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"]}
|
|
@@ -61,6 +61,8 @@ var bridgeAndDepositExisingMA = function (params) { return __awaiter(void 0, voi
|
|
|
61
61
|
_a = (0, encode_1.encodeBridgeAndDepositExistingMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
|
|
62
62
|
chainId: chainId,
|
|
63
63
|
tokenAddress: params.tokenAddress,
|
|
64
|
+
}), (0, common_1.getSocketFees)({
|
|
65
|
+
moneyInOutChainId: chainId,
|
|
64
66
|
}), params.marginAccountId, params.tokenAddress, amount, eip712Signature), data = _a.calldata, value = _a.value;
|
|
65
67
|
return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({
|
|
66
68
|
moneyInOutChainId: chainId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAEzD,IAAM,yBAAyB,GAAG,UACvC,MAAuC;;;;;oBAEvB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,yCAAgC,EAChE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,CAChB,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA9CW,QAAA,yBAAyB,6BA8CpC","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n getSocketConnector,\n getSocketFees,\n getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n BridgeAndDepositExisingMAParams,\n BridgeAndDepositExisingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const bridgeAndDepositExisingMA = async (\n params: BridgeAndDepositExisingMAParams,\n): Promise<BridgeAndDepositExisingMAResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n const eip712Signature = await signCoreCommands(\n params.signer,\n chainId,\n params.marginAccountId,\n params.owner.coreSigNonce,\n getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n );\n\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n getSocketFees({\n moneyInOutChainId: chainId,\n }),\n params.marginAccountId,\n params.tokenAddress,\n amount,\n eip712Signature,\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -56,6 +56,8 @@ var bridgeAndDepositNewMA = function (params) { return __awaiter(void 0, void 0,
|
|
|
56
56
|
_a = (0, encode_1.encodeBridgeAndDepositNewMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
|
|
57
57
|
chainId: chainId,
|
|
58
58
|
tokenAddress: params.tokenAddress,
|
|
59
|
+
}), (0, common_1.getSocketFees)({
|
|
60
|
+
moneyInOutChainId: chainId,
|
|
59
61
|
}), params.ownerAddress, params.tokenAddress, amount), data = _a.calldata, value = _a.value;
|
|
60
62
|
return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({
|
|
61
63
|
moneyInOutChainId: chainId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositNewMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositNewMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAAuD;AAMhD,IAAM,qBAAqB,GAAG,UACnC,MAAmC;;;;;oBAEnB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,oCAA2B,EAC3D,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAtCW,QAAA,qBAAqB,yBAsChC","sourcesContent":["import {\n getSocketConnector,\n getSocketFees,\n getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositNewMA } from './encode';\nimport {\n BridgeAndDepositNewMAParams,\n BridgeAndDepositNewMAResult,\n} from './types';\n\nexport const bridgeAndDepositNewMA = async (\n params: BridgeAndDepositNewMAParams,\n): Promise<BridgeAndDepositNewMAResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeBridgeAndDepositNewMA(\n getAddress(chainId, ContractType.PERIPHERY_PROXY),\n BigInt('10000000'),\n getSocketConnector({\n chainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n getSocketFees({\n moneyInOutChainId: chainId,\n }),\n params.ownerAddress,\n params.tokenAddress,\n amount,\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n getSocketVault({\n moneyInOutChainId: chainId,\n tokenAddress: params.tokenAddress,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -69,36 +69,36 @@ var encodeWithdrawMAAndBridge = function (accountId, token, tokenAmount, sig, so
|
|
|
69
69
|
return { calldata: calldata, value: BigInt(0).toString(10) };
|
|
70
70
|
};
|
|
71
71
|
exports.encodeWithdrawMAAndBridge = encodeWithdrawMAAndBridge;
|
|
72
|
-
var encodeBridgeAndDepositNewMA = function (receiver,
|
|
72
|
+
var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketConnector, socketFees, accountOwner, token, tokenAmount) {
|
|
73
73
|
var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
|
|
74
74
|
var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositNewMA', [{ accountOwner: accountOwner, token: token, tokenAmount: tokenAmount }]);
|
|
75
75
|
var functionSignature = 'depositToAppChain';
|
|
76
76
|
var parameters = [
|
|
77
77
|
receiver,
|
|
78
78
|
tokenAmount,
|
|
79
|
-
|
|
80
|
-
|
|
79
|
+
socketMsgGasLimit,
|
|
80
|
+
socketConnector,
|
|
81
81
|
peripheryCalldata,
|
|
82
82
|
];
|
|
83
83
|
var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
|
|
84
84
|
var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
|
|
85
|
-
return { calldata: calldata, value:
|
|
85
|
+
return { calldata: calldata, value: socketFees.toString(10) };
|
|
86
86
|
};
|
|
87
87
|
exports.encodeBridgeAndDepositNewMA = encodeBridgeAndDepositNewMA;
|
|
88
|
-
var encodeBridgeAndDepositExistingMA = function (receiver,
|
|
88
|
+
var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketFees, accountId, token, tokenAmount, sig) {
|
|
89
89
|
var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
|
|
90
90
|
var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositExistingMA', [{ accountId: accountId, token: token, tokenAmount: tokenAmount, sig: sig }]);
|
|
91
91
|
var functionSignature = 'depositToAppChain';
|
|
92
92
|
var parameters = [
|
|
93
93
|
receiver,
|
|
94
94
|
tokenAmount,
|
|
95
|
-
|
|
96
|
-
|
|
95
|
+
socketMsgGasLimit,
|
|
96
|
+
socketConnector,
|
|
97
97
|
peripheryCalldata,
|
|
98
98
|
];
|
|
99
99
|
var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
|
|
100
100
|
var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
|
|
101
|
-
return { calldata: calldata, value:
|
|
101
|
+
return { calldata: calldata, value: socketFees.toString(10) };
|
|
102
102
|
};
|
|
103
103
|
exports.encodeBridgeAndDepositExistingMA = encodeBridgeAndDepositExistingMA;
|
|
104
104
|
//# sourceMappingURL=encode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"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
|
|
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/AccountModule.json';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\nimport { EIP712Signature } from '../sign';\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 = (\n fromMarginAccountId: number,\n toMarginAccountId: number,\n token: string,\n amount: bigint,\n): MethodParameters => {\n const multiAction = new MultiAction();\n\n encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n const value = BigInt(0);\n const call = encodeRouterCall(multiAction, fromMarginAccountId, value);\n\n return {\n ...call,\n };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n accountId: number,\n token: string,\n tokenAmount: bigint,\n sig: EIP712Signature,\n socketMsgGasLimit: bigint,\n socketConnector: string,\n socketController: string,\n receiver: string,\n): MethodParameters => {\n const functionSignature = 'withdrawMA';\n const parameters = [\n {\n accountId,\n token,\n tokenAmount,\n sig,\n socketMsgGasLimit,\n socketConnector,\n socketController,\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 socketFees: bigint,\n accountOwner: string,\n token: string,\n tokenAmount: bigint,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositNewMA',\n [{ accountOwner, token, tokenAmount }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n tokenAmount,\n socketMsgGasLimit,\n socketConnector,\n peripheryCalldata,\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 socketFees: bigint,\n accountId: number,\n token: string,\n tokenAmount: bigint,\n sig: EIP712Signature,\n): MethodParameters => {\n const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n 'depositExistingMA',\n [{ accountId, token, tokenAmount, sig }],\n );\n\n const functionSignature = 'depositToAppChain';\n const parameters = [\n receiver,\n tokenAmount,\n socketMsgGasLimit,\n socketConnector,\n peripheryCalldata,\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"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAqC3C,CAAC"}
|
|
@@ -3,6 +3,6 @@ import { EIP712Signature } from '../sign';
|
|
|
3
3
|
export declare const encodeProvideLiquidityCall: (poolId: number, accountOwner: string, amount: bigint, minShares: number) => MethodParameters;
|
|
4
4
|
export declare const encodeRemoveLiquidityCall: (poolId: number, sharesAmount: bigint, minOut: number) => MethodParameters;
|
|
5
5
|
export declare const encodeTransferFromMAToPool: (accountId: number, amount: bigint, sig: EIP712Signature, poolId: number, owner: string, minShares: bigint) => MethodParameters;
|
|
6
|
-
export declare const encodeWithdrawPassivePoolAndBridge: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint,
|
|
7
|
-
export declare const encodeBridgeAndDepositPassivePool: (receiver: string,
|
|
6
|
+
export declare const encodeWithdrawPassivePoolAndBridge: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketConnector: string, socketController: string, receiver: string) => MethodParameters;
|
|
7
|
+
export declare const encodeBridgeAndDepositPassivePool: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint) => MethodParameters;
|
|
8
8
|
//# sourceMappingURL=encode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,eAAO,MAAM,0BAA0B,WAC7B,MAAM,gBACA,MAAM,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC5B,MAAM,gBACA,MAAM,UACZ,MAAM,KACb,gBAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,OACT,eAAe,UACZ,MAAM,SACP,MAAM,aACF,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,mBACR,MAAM,oBACL,MAAM,YACd,MAAM,KACf,gBAkBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,
|
|
1
|
+
{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,eAAO,MAAM,0BAA0B,WAC7B,MAAM,gBACA,MAAM,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC5B,MAAM,gBACA,MAAM,UACZ,MAAM,KACb,gBAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,OACT,eAAe,UACZ,MAAM,SACP,MAAM,aACF,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,mBACR,MAAM,oBACL,MAAM,YACd,MAAM,KACf,gBAkBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,KAChB,gBAkBF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,+BAA+B,EAC/B,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,yBAAyB,WAC5B,+BAA+B,KACtC,QAAQ,+BAA+B,CA4CzC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"AASA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qBAAqB,WACxB,2BAA2B,KAClC,QAAQ,2BAA2B,CAoCrC,CAAC"}
|
|
@@ -5,6 +5,6 @@ export declare const encodeDeposit: (accountId: number, token: string, amount: b
|
|
|
5
5
|
export declare const encodeWithdraw: (accountId: number, token: string, amount: bigint) => MethodParameters;
|
|
6
6
|
export declare const encodeTransferMargin: (fromMarginAccountId: number, toMarginAccountId: number, token: string, amount: bigint) => MethodParameters;
|
|
7
7
|
export declare const encodeWithdrawMAAndBridge: (accountId: number, token: string, tokenAmount: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketConnector: string, socketController: string, receiver: string) => MethodParameters;
|
|
8
|
-
export declare const encodeBridgeAndDepositNewMA: (receiver: string,
|
|
9
|
-
export declare const encodeBridgeAndDepositExistingMA: (receiver: string,
|
|
8
|
+
export declare const encodeBridgeAndDepositNewMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, accountOwner: string, token: string, tokenAmount: bigint) => MethodParameters;
|
|
9
|
+
export declare const encodeBridgeAndDepositExistingMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, accountId: number, token: string, tokenAmount: bigint, sig: EIP712Signature) => MethodParameters;
|
|
10
10
|
//# sourceMappingURL=encode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAYnE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,eAAO,MAAM,uBAAuB,iBACpB,MAAM,KACnB,gBAMF,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,cAAc,cACd,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,oBAAoB,wBACV,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,SACV,MAAM,eACA,MAAM,OACd,eAAe,qBACD,MAAM,mBACR,MAAM,oBACL,MAAM,YACd,MAAM,KACf,gBAiBF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,MAAM,
|
|
1
|
+
{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAYnE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,eAAO,MAAM,uBAAuB,iBACpB,MAAM,KACnB,gBAMF,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,cAAc,cACd,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,oBAAoB,wBACV,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,SACV,MAAM,eACA,MAAM,OACd,eAAe,qBACD,MAAM,mBACR,MAAM,oBACL,MAAM,YACd,MAAM,KACf,gBAiBF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,gBACJ,MAAM,SACb,MAAM,eACA,MAAM,KAClB,gBAkBF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,aACP,MAAM,SACV,MAAM,eACA,MAAM,OACd,eAAe,KACnB,gBAkBF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reyaxyz/sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.23.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org"
|
|
@@ -29,10 +29,10 @@
|
|
|
29
29
|
"generate:coverage-badges": "npx istanbul-badges-readme --silent"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@reyaxyz/common": "0.
|
|
32
|
+
"@reyaxyz/common": "0.17.0",
|
|
33
33
|
"bignumber.js": "^9.1.2",
|
|
34
34
|
"ethers": "6.9.0"
|
|
35
35
|
},
|
|
36
36
|
"packageManager": "pnpm@8.10.4",
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "115a94cab6217538f96c94d37e2679607a424efd"
|
|
38
38
|
}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
Address,
|
|
3
|
+
getSocketConnector,
|
|
4
|
+
getSocketFees,
|
|
5
|
+
getSocketVault,
|
|
6
|
+
} from '@reyaxyz/common';
|
|
2
7
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
3
8
|
import { executeTransaction } from '../executeTransaction';
|
|
4
9
|
import { getTokenDetails, scale } from '../token/common';
|
|
@@ -24,6 +29,9 @@ export const bridgeAndDepositPassivePool = async (
|
|
|
24
29
|
chainId: chainId,
|
|
25
30
|
tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,
|
|
26
31
|
}),
|
|
32
|
+
getSocketFees({
|
|
33
|
+
moneyInOutChainId: chainId,
|
|
34
|
+
}),
|
|
27
35
|
params.pool.id,
|
|
28
36
|
params.ownerAddress,
|
|
29
37
|
amount,
|
|
@@ -60,7 +60,7 @@ export const encodeWithdrawPassivePoolAndBridge = (
|
|
|
60
60
|
minOut: bigint,
|
|
61
61
|
sig: EIP712Signature,
|
|
62
62
|
socketMsgGasLimit: bigint,
|
|
63
|
-
|
|
63
|
+
socketConnector: string,
|
|
64
64
|
socketController: string,
|
|
65
65
|
receiver: string,
|
|
66
66
|
): MethodParameters => {
|
|
@@ -73,7 +73,7 @@ export const encodeWithdrawPassivePoolAndBridge = (
|
|
|
73
73
|
minOut,
|
|
74
74
|
sig,
|
|
75
75
|
socketMsgGasLimit,
|
|
76
|
-
|
|
76
|
+
socketConnector,
|
|
77
77
|
socketController,
|
|
78
78
|
receiver,
|
|
79
79
|
},
|
|
@@ -85,8 +85,9 @@ export const encodeWithdrawPassivePoolAndBridge = (
|
|
|
85
85
|
|
|
86
86
|
export const encodeBridgeAndDepositPassivePool = (
|
|
87
87
|
receiver: string,
|
|
88
|
-
|
|
89
|
-
|
|
88
|
+
socketMsgGasLimit: bigint,
|
|
89
|
+
socketConnector: string,
|
|
90
|
+
socketFees: bigint,
|
|
90
91
|
poolId: number,
|
|
91
92
|
owner: string,
|
|
92
93
|
amount: bigint,
|
|
@@ -102,11 +103,11 @@ export const encodeBridgeAndDepositPassivePool = (
|
|
|
102
103
|
const parameters = [
|
|
103
104
|
receiver,
|
|
104
105
|
amount,
|
|
105
|
-
|
|
106
|
-
|
|
106
|
+
socketMsgGasLimit,
|
|
107
|
+
socketConnector,
|
|
107
108
|
peripheryCalldata,
|
|
108
109
|
];
|
|
109
110
|
const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
|
|
110
111
|
const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
|
|
111
|
-
return { calldata: calldata, value:
|
|
112
|
+
return { calldata: calldata, value: socketFees.toString(10) };
|
|
112
113
|
};
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getCurrentTimestampInSeconds,
|
|
3
3
|
getSocketConnector,
|
|
4
|
+
getSocketFees,
|
|
4
5
|
getSocketVault,
|
|
5
6
|
} from '@reyaxyz/common';
|
|
6
7
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
@@ -37,6 +38,9 @@ export const bridgeAndDepositExisingMA = async (
|
|
|
37
38
|
chainId: chainId,
|
|
38
39
|
tokenAddress: params.tokenAddress,
|
|
39
40
|
}),
|
|
41
|
+
getSocketFees({
|
|
42
|
+
moneyInOutChainId: chainId,
|
|
43
|
+
}),
|
|
40
44
|
params.marginAccountId,
|
|
41
45
|
params.tokenAddress,
|
|
42
46
|
amount,
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
getSocketConnector,
|
|
3
|
+
getSocketFees,
|
|
4
|
+
getSocketVault,
|
|
5
|
+
} from '@reyaxyz/common';
|
|
2
6
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
3
7
|
import { executeTransaction } from '../executeTransaction';
|
|
4
8
|
import { getTokenDetails, scale } from '../token/common';
|
|
@@ -24,6 +28,9 @@ export const bridgeAndDepositNewMA = async (
|
|
|
24
28
|
chainId: chainId,
|
|
25
29
|
tokenAddress: params.tokenAddress,
|
|
26
30
|
}),
|
|
31
|
+
getSocketFees({
|
|
32
|
+
moneyInOutChainId: chainId,
|
|
33
|
+
}),
|
|
27
34
|
params.ownerAddress,
|
|
28
35
|
params.tokenAddress,
|
|
29
36
|
amount,
|
|
@@ -104,8 +104,9 @@ export const encodeWithdrawMAAndBridge = (
|
|
|
104
104
|
|
|
105
105
|
export const encodeBridgeAndDepositNewMA = (
|
|
106
106
|
receiver: string,
|
|
107
|
-
|
|
108
|
-
|
|
107
|
+
socketMsgGasLimit: bigint,
|
|
108
|
+
socketConnector: string,
|
|
109
|
+
socketFees: bigint,
|
|
109
110
|
accountOwner: string,
|
|
110
111
|
token: string,
|
|
111
112
|
tokenAmount: bigint,
|
|
@@ -120,19 +121,20 @@ export const encodeBridgeAndDepositNewMA = (
|
|
|
120
121
|
const parameters = [
|
|
121
122
|
receiver,
|
|
122
123
|
tokenAmount,
|
|
123
|
-
|
|
124
|
-
|
|
124
|
+
socketMsgGasLimit,
|
|
125
|
+
socketConnector,
|
|
125
126
|
peripheryCalldata,
|
|
126
127
|
];
|
|
127
128
|
const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
|
|
128
129
|
const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
|
|
129
|
-
return { calldata: calldata, value:
|
|
130
|
+
return { calldata: calldata, value: socketFees.toString(10) };
|
|
130
131
|
};
|
|
131
132
|
|
|
132
133
|
export const encodeBridgeAndDepositExistingMA = (
|
|
133
134
|
receiver: string,
|
|
134
|
-
|
|
135
|
-
|
|
135
|
+
socketMsgGasLimit: bigint,
|
|
136
|
+
socketConnector: string,
|
|
137
|
+
socketFees: bigint,
|
|
136
138
|
accountId: number,
|
|
137
139
|
token: string,
|
|
138
140
|
tokenAmount: bigint,
|
|
@@ -148,11 +150,11 @@ export const encodeBridgeAndDepositExistingMA = (
|
|
|
148
150
|
const parameters = [
|
|
149
151
|
receiver,
|
|
150
152
|
tokenAmount,
|
|
151
|
-
|
|
152
|
-
|
|
153
|
+
socketMsgGasLimit,
|
|
154
|
+
socketConnector,
|
|
153
155
|
peripheryCalldata,
|
|
154
156
|
];
|
|
155
157
|
const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
|
|
156
158
|
const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
|
|
157
|
-
return { calldata: calldata, value:
|
|
159
|
+
return { calldata: calldata, value: socketFees.toString(10) };
|
|
158
160
|
};
|