@reyaxyz/sdk 0.25.1 → 0.26.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 +1 -2
- package/dist/services/lp/bridgeAndDepositPassivePool.js.map +1 -1
- package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js +2 -0
- package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js.map +1 -1
- package/dist/services/lp/transferFromMAToPool.js +1 -2
- package/dist/services/lp/transferFromMAToPool.js.map +1 -1
- package/dist/services/lp/types.js.map +1 -1
- package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js +1 -2
- package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js.map +1 -1
- package/dist/services/margin-accounts/bridgeAndDepositNewMA.js +1 -2
- package/dist/services/margin-accounts/bridgeAndDepositNewMA.js.map +1 -1
- package/dist/services/margin-accounts/deposit.js +2 -3
- package/dist/services/margin-accounts/deposit.js.map +1 -1
- package/dist/services/margin-accounts/transferMarginBetweenAccounts.js +1 -2
- package/dist/services/margin-accounts/transferMarginBetweenAccounts.js.map +1 -1
- package/dist/services/margin-accounts/withdraw.js +2 -3
- package/dist/services/margin-accounts/withdraw.js.map +1 -1
- package/dist/services/margin-accounts/withdrawMAAndBridge.js +1 -2
- package/dist/services/margin-accounts/withdrawMAAndBridge.js.map +1 -1
- package/dist/services/token/approve.js +1 -1
- package/dist/services/token/approve.js.map +1 -1
- package/dist/services/token/getAllowance.js +1 -1
- package/dist/services/token/getAllowance.js.map +1 -1
- package/dist/services/token/getBalanceByTokenAddress.js +1 -1
- package/dist/services/token/getBalanceByTokenAddress.js.map +1 -1
- package/dist/services/token/types.js.map +1 -1
- package/dist/types/services/lp/simulateWithdrawPassivePoolAndBridge.d.ts.map +1 -1
- package/dist/types/services/lp/transferFromMAToPool.d.ts.map +1 -1
- package/dist/types/services/lp/types.d.ts +2 -1
- package/dist/types/services/lp/types.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/deposit.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/transferMarginBetweenAccounts.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/withdraw.d.ts.map +1 -1
- package/dist/types/services/token/types.d.ts +1 -7
- package/dist/types/services/token/types.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/services/lp/bridgeAndDepositPassivePool.ts +1 -1
- package/src/services/lp/simulateWithdrawPassivePoolAndBridge.ts +8 -1
- package/src/services/lp/transferFromMAToPool.ts +5 -2
- package/src/services/lp/types.ts +2 -1
- package/src/services/margin-accounts/bridgeAndDepositExistingMA.ts +1 -1
- package/src/services/margin-accounts/bridgeAndDepositNewMA.ts +1 -1
- package/src/services/margin-accounts/deposit.ts +1 -2
- package/src/services/margin-accounts/transferMarginBetweenAccounts.ts +1 -2
- package/src/services/margin-accounts/withdraw.ts +1 -2
- package/src/services/margin-accounts/withdrawMAAndBridge.ts +1 -1
- package/src/services/token/approve.ts +1 -1
- package/src/services/token/getAllowance.ts +1 -1
- package/src/services/token/getBalanceByTokenAddress.ts +1 -1
- package/src/services/token/types.ts +1 -8
- package/dist/services/token/common.js +0 -114
- package/dist/services/token/common.js.map +0 -1
- package/dist/services/token/consts.js +0 -52
- package/dist/services/token/consts.js.map +0 -1
- package/dist/types/services/token/common.d.ts +0 -18
- package/dist/types/services/token/common.d.ts.map +0 -1
- package/dist/types/services/token/consts.d.ts +0 -8
- package/dist/types/services/token/consts.d.ts.map +0 -1
- package/dist/types/utils/retry.d.ts +0 -2
- package/dist/types/utils/retry.d.ts.map +0 -1
- package/dist/utils/retry.js +0 -94
- package/dist/utils/retry.js.map +0 -1
- package/src/services/token/common.ts +0 -89
- package/src/services/token/consts.ts +0 -57
- package/src/utils/retry.ts +0 -40
|
@@ -40,7 +40,6 @@ exports.bridgeAndDepositPassivePool = void 0;
|
|
|
40
40
|
var common_1 = require("@reyaxyz/common");
|
|
41
41
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
42
42
|
var executeTransaction_1 = require("../executeTransaction");
|
|
43
|
-
var common_2 = require("../token/common");
|
|
44
43
|
var encode_1 = require("./encode");
|
|
45
44
|
var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
45
|
var network, chainId, tokenDecimals, amount, _a, data, value, result;
|
|
@@ -51,7 +50,7 @@ var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, v
|
|
|
51
50
|
case 1:
|
|
52
51
|
network = _c.sent();
|
|
53
52
|
chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
|
|
54
|
-
tokenDecimals = (0,
|
|
53
|
+
tokenDecimals = (0, common_1.getTokenDetails)(params.pool.tokenAddress).tokenDecimals;
|
|
55
54
|
amount = (0, common_1.scale)(tokenDecimals)(params.amount);
|
|
56
55
|
_a = (0, encode_1.encodeBridgeAndDepositPassivePool)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
|
|
57
56
|
chainId: 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,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,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,qCAA4B,EAAC;oBAC3B,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 getSocketDepositFeesAsBigInt,\n getSocketVault,\n scale,\n getTokenDetails,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\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 getSocketDepositFeesAsBigInt({\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"]}
|
|
@@ -12,8 +12,10 @@ params) {
|
|
|
12
12
|
reyaChainId: params.reyaChainId,
|
|
13
13
|
tokenAddress: params.tokenAddress,
|
|
14
14
|
});
|
|
15
|
+
var feesUnderlyingToken = (0, common_1.getTokenDetails)(params.tokenAddress).tokenName;
|
|
15
16
|
var result = {
|
|
16
17
|
fees: fees.fees,
|
|
18
|
+
feesUnderlyingToken: feesUnderlyingToken,
|
|
17
19
|
bridgeTimeInMS: bridgeTimeInMS,
|
|
18
20
|
};
|
|
19
21
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulateWithdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"simulateWithdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;AAAA,0CAIyB;AAMlB,IAAM,oCAAoC,GAAG;AAClD,6DAA6D;AAC7D,MAAkD;IAElD,IAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC;QACzC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;KAC5C,CAAC,CAAC,cAAc,CAAC;IAElB,IAAM,IAAI,GAAG,IAAA,8BAAqB,EAAC;QACjC,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;IAEH,IAAM,mBAAmB,GAAG,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC;IAE3E,IAAM,MAAM,GAA+C;QACzD,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,mBAAmB,EAAE,mBAAmB;QACxC,cAAc,EAAE,cAAc;KAC/B,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtBW,QAAA,oCAAoC,wCAsB/C","sourcesContent":["import {\n getSocketBridgeTime,\n getSocketWithdrawFees,\n getTokenDetails,\n} from '@reyaxyz/common';\nimport {\n SimulateWithdrawPassivePoolAndBridgeParams,\n SimulateWithdrawPassivePoolAndBridgeResult,\n} from './types';\n\nexport const simulateWithdrawPassivePoolAndBridge = (\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n params: SimulateWithdrawPassivePoolAndBridgeParams,\n): SimulateWithdrawPassivePoolAndBridgeResult => {\n const bridgeTimeInMS = getSocketBridgeTime({\n moneyInOutChainId: params.moneyInOutChainId,\n }).bridgeTimeInMS;\n\n const fees = getSocketWithdrawFees({\n reyaChainId: params.reyaChainId,\n tokenAddress: params.tokenAddress,\n });\n\n const feesUnderlyingToken = getTokenDetails(params.tokenAddress).tokenName;\n\n const result: SimulateWithdrawPassivePoolAndBridgeResult = {\n fees: fees.fees,\n feesUnderlyingToken: feesUnderlyingToken,\n bridgeTimeInMS: bridgeTimeInMS,\n };\n\n return result;\n};\n"]}
|
|
@@ -41,7 +41,6 @@ var common_1 = require("@reyaxyz/common");
|
|
|
41
41
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
42
42
|
var executeTransaction_1 = require("../executeTransaction");
|
|
43
43
|
var sign_1 = require("../sign");
|
|
44
|
-
var common_2 = require("../token/common");
|
|
45
44
|
var encode_1 = require("./encode");
|
|
46
45
|
var consts_1 = require("../../utils/consts");
|
|
47
46
|
var transferFromMAToPool = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -56,7 +55,7 @@ var transferFromMAToPool = function (params) { return __awaiter(void 0, void 0,
|
|
|
56
55
|
return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, chainId, params.marginAccountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
|
|
57
56
|
case 2:
|
|
58
57
|
eip712Signature = _c.sent();
|
|
59
|
-
tokenDecimals = (0,
|
|
58
|
+
tokenDecimals = (0, common_1.getTokenDetails)(params.pool.tokenAddress).tokenDecimals;
|
|
60
59
|
amount = (0, common_1.scale)(tokenDecimals)(params.amount);
|
|
61
60
|
_a = (0, encode_1.encodeTransferFromMAToPool)(params.marginAccountId, amount, eip712Signature, params.pool.id, params.owner.address, BigInt(0)), data = _a.calldata, value = _a.value;
|
|
62
61
|
return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY)];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAsD;AAKtD,6CAAgE;AAEzD,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;oBAElB,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;gBAEjB,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,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,mCAA0B,EAC1D,MAAM,CAAC,eAAe,EACtB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,CACV,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,eAAe,CAC7B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AArCW,QAAA,oBAAoB,wBAqC/B","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n scale,\n getTokenDetails,\n} from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { encodeTransferFromMAToPool } from './encode';\nimport {\n TransferFromMAToPoolParams,\n TransferFromMAToPoolResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const transferFromMAToPool = async (\n params: TransferFromMAToPoolParams,\n): Promise<TransferFromMAToPoolResult> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\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.pool.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeTransferFromMAToPool(\n params.marginAccountId,\n amount,\n eip712Signature,\n params.pool.id,\n params.owner.address,\n BigInt(0),\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n ContractType.PERIPHERY_PROXY,\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n LpPoolEntity,\n LpWithdrawBalanceEntity,\n MarginAccountEntity,\n MoneyInOutChainId,\n OwnerMetadataEntity,\n ReyaChainId,\n TokenEntity,\n} from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n signer: Signer | JsonRpcSigner;\n amount: number;\n lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n signer: Signer | JsonRpcSigner;\n lpPoolId: LpPoolEntity['id'];\n amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n transactionHash: string | null;\n};\n\nexport type TransferFromMAToPoolParams = {\n signer: Signer | JsonRpcSigner;\n owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n marginAccountId: MarginAccountEntity['id'];\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n};\n\nexport type TransferFromMAToPoolResult = {\n transactionHash: string | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n signer: Signer | JsonRpcSigner;\n owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n signer: Signer | JsonRpcSigner;\n ownerAddress: OwnerMetadataEntity['address'];\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n transactionHash: string | null;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolResult = {\n fees: number;\n feesUnderlyingToken:
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n LpPoolEntity,\n LpWithdrawBalanceEntity,\n MarginAccountEntity,\n MoneyInOutChainId,\n OwnerMetadataEntity,\n ReyaChainId,\n TokenEntity,\n} from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n signer: Signer | JsonRpcSigner;\n amount: number;\n lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n signer: Signer | JsonRpcSigner;\n lpPoolId: LpPoolEntity['id'];\n amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n transactionHash: string | null;\n};\n\nexport type TransferFromMAToPoolParams = {\n signer: Signer | JsonRpcSigner;\n owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n marginAccountId: MarginAccountEntity['id'];\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n};\n\nexport type TransferFromMAToPoolResult = {\n transactionHash: string | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n signer: Signer | JsonRpcSigner;\n owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n signer: Signer | JsonRpcSigner;\n ownerAddress: OwnerMetadataEntity['address'];\n pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n amount: number;\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n transactionHash: string | null;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolResult = {\n fees: number;\n feesUnderlyingToken: TokenEntity['id'];\n bridgeTimeInMS: number;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolParams = {\n moneyInOutChainId: MoneyInOutChainId;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeResult = {\n fees: number;\n feesUnderlyingToken: TokenEntity['id'];\n bridgeTimeInMS: number;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeParams = {\n reyaChainId: ReyaChainId;\n moneyInOutChainId: MoneyInOutChainId;\n tokenAddress: TokenEntity['address'];\n};\n"]}
|
|
@@ -40,7 +40,6 @@ exports.bridgeAndDepositExisingMA = void 0;
|
|
|
40
40
|
var common_1 = require("@reyaxyz/common");
|
|
41
41
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
42
42
|
var executeTransaction_1 = require("../executeTransaction");
|
|
43
|
-
var common_2 = require("../token/common");
|
|
44
43
|
var encode_1 = require("./encode");
|
|
45
44
|
var sign_1 = require("../sign");
|
|
46
45
|
var consts_1 = require("../../utils/consts");
|
|
@@ -56,7 +55,7 @@ var bridgeAndDepositExisingMA = function (params) { return __awaiter(void 0, voi
|
|
|
56
55
|
return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, chainId, params.marginAccountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
|
|
57
56
|
case 2:
|
|
58
57
|
eip712Signature = _c.sent();
|
|
59
|
-
tokenDecimals = (0,
|
|
58
|
+
tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
|
|
60
59
|
amount = (0, common_1.scale)(tokenDecimals)(params.amount);
|
|
61
60
|
_a = (0, encode_1.encodeBridgeAndDepositExistingMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
|
|
62
61
|
chainId: 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,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,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,qCAA4B,EAAC;oBAC3B,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 getSocketDepositFeesAsBigInt,\n getSocketVault,\n scale,\n getTokenDetails,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\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 getSocketDepositFeesAsBigInt({\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"]}
|
|
@@ -40,7 +40,6 @@ exports.bridgeAndDepositNewMA = void 0;
|
|
|
40
40
|
var common_1 = require("@reyaxyz/common");
|
|
41
41
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
42
42
|
var executeTransaction_1 = require("../executeTransaction");
|
|
43
|
-
var common_2 = require("../token/common");
|
|
44
43
|
var encode_1 = require("./encode");
|
|
45
44
|
var bridgeAndDepositNewMA = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
45
|
var network, chainId, tokenDecimals, amount, _a, data, value, result;
|
|
@@ -51,7 +50,7 @@ var bridgeAndDepositNewMA = function (params) { return __awaiter(void 0, void 0,
|
|
|
51
50
|
case 1:
|
|
52
51
|
network = _c.sent();
|
|
53
52
|
chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
|
|
54
|
-
tokenDecimals = (0,
|
|
53
|
+
tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
|
|
55
54
|
amount = (0, common_1.scale)(tokenDecimals)(params.amount);
|
|
56
55
|
_a = (0, encode_1.encodeBridgeAndDepositNewMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
|
|
57
56
|
chainId: 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,0CAMyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,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,qCAA4B,EAAC;oBAC3B,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 getSocketDepositFeesAsBigInt,\n getSocketVault,\n scale,\n getTokenDetails,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\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 getSocketDepositFeesAsBigInt({\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"]}
|
|
@@ -39,9 +39,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.deposit = void 0;
|
|
40
40
|
var encode_1 = require("./encode");
|
|
41
41
|
var executeTransaction_1 = require("../executeTransaction");
|
|
42
|
-
var common_1 = require("../token/common");
|
|
43
42
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
44
|
-
var
|
|
43
|
+
var common_1 = require("@reyaxyz/common");
|
|
45
44
|
var deposit = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
45
|
var tokenDecimals, amount, _a, data, value, network, chainId, result;
|
|
47
46
|
var _b;
|
|
@@ -49,7 +48,7 @@ var deposit = function (params) { return __awaiter(void 0, void 0, void 0, funct
|
|
|
49
48
|
switch (_c.label) {
|
|
50
49
|
case 0:
|
|
51
50
|
tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
|
|
52
|
-
amount = (0,
|
|
51
|
+
amount = (0, common_1.scale)(tokenDecimals)(params.amount);
|
|
53
52
|
_a = (0, encode_1.encodeDeposit)(params.marginAccountId, params.tokenAddress, amount), data = _a.calldata, value = _a.value;
|
|
54
53
|
return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
|
|
55
54
|
case 1:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deposit.js","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAyC;AACzC,4DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"deposit.js","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAyC;AACzC,4DAA2D;AAC3D,mEAA6D;AAC7D,0CAAyD;AAElD,IAAM,OAAO,GAAG,UACrB,MAAqB;;;;;;gBAEb,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;gBAC7C,KAA4B,IAAA,sBAAa,EAC7C,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;gBAEc,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;gBAE1B,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAzBW,QAAA,OAAO,WAyBlB","sourcesContent":["import { DepositParams, DepositResult } from './types';\nimport { encodeDeposit } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { scale, getTokenDetails } from '@reyaxyz/common';\n\nexport const deposit = async (\n params: DepositParams,\n): Promise<DepositResult> => {\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n const { calldata: data, value } = encodeDeposit(\n params.marginAccountId,\n params.tokenAddress,\n amount,\n );\n\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n ContractType.CORE_PROXY,\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -40,7 +40,6 @@ exports.transferMarginBetweenAccounts = void 0;
|
|
|
40
40
|
var common_1 = require("@reyaxyz/common");
|
|
41
41
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
42
42
|
var executeTransaction_1 = require("../executeTransaction");
|
|
43
|
-
var common_2 = require("../token/common");
|
|
44
43
|
var encode_1 = require("./encode");
|
|
45
44
|
var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
45
|
var tokenDecimals, amount, _a, data, value, network, chainId, result;
|
|
@@ -48,7 +47,7 @@ var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0,
|
|
|
48
47
|
return __generator(this, function (_c) {
|
|
49
48
|
switch (_c.label) {
|
|
50
49
|
case 0:
|
|
51
|
-
tokenDecimals = (0,
|
|
50
|
+
tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
|
|
52
51
|
amount = (0, common_1.scale)(tokenDecimals)(params.amount);
|
|
53
52
|
_a = (0, encode_1.encodeTransferMargin)(params.fromMarginAccountId, params.toMarginAccountId, params.tokenAddress, amount), data = _a.calldata, value = _a.value;
|
|
54
53
|
return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAyD;AACzD,mEAA6D;AAC7D,4DAA2D;AAC3D,mCAAgD;AAMzC,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;;gBAEnC,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;gBAC7C,KAA4B,IAAA,6BAAoB,EACpD,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EALiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAK3B;gBAEc,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;gBAE1B,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA1BW,QAAA,6BAA6B,iCA0BxC","sourcesContent":["import { scale, getTokenDetails } from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeTransferMargin } from './encode';\nimport {\n TransferMarginBetweenAccountsParams,\n TransferMarginBetweenAccountsResult,\n} from './types';\n\nexport const transferMarginBetweenAccounts = async (\n params: TransferMarginBetweenAccountsParams,\n): Promise<TransferMarginBetweenAccountsResult> => {\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n const { calldata: data, value } = encodeTransferMargin(\n params.fromMarginAccountId,\n params.toMarginAccountId,\n params.tokenAddress,\n amount,\n );\n\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n ContractType.CORE_PROXY,\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -39,9 +39,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.withdraw = void 0;
|
|
40
40
|
var encode_1 = require("./encode");
|
|
41
41
|
var executeTransaction_1 = require("../executeTransaction");
|
|
42
|
-
var common_1 = require("../token/common");
|
|
43
42
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
44
|
-
var
|
|
43
|
+
var common_1 = require("@reyaxyz/common");
|
|
45
44
|
var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
45
|
var tokenDecimals, amount, _a, data, value, network, chainId, result;
|
|
47
46
|
var _b;
|
|
@@ -49,7 +48,7 @@ var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, func
|
|
|
49
48
|
switch (_c.label) {
|
|
50
49
|
case 0:
|
|
51
50
|
tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
|
|
52
|
-
amount = (0,
|
|
51
|
+
amount = (0, common_1.scale)(tokenDecimals)(params.amount);
|
|
53
52
|
_a = (0, encode_1.encodeWithdraw)(params.marginAccountId, params.tokenAddress, BigInt(amount)), data = _a.calldata, value = _a.value;
|
|
54
53
|
return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
|
|
55
54
|
case 1:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdraw.js","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,4DAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"withdraw.js","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,4DAA2D;AAC3D,mEAA6D;AAC7D,0CAAyD;AAElD,IAAM,QAAQ,GAAG,UACtB,MAAsB;;;;;;gBAEd,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,uBAAc,EAC9C,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,CAAC,CACf,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;gBAEc,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;gBAE1B,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA1BW,QAAA,QAAQ,YA0BnB","sourcesContent":["import { WithdrawParams, WithdrawResult } from './types';\nimport { encodeWithdraw } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { scale, getTokenDetails } from '@reyaxyz/common';\n\nexport const withdraw = async (\n params: WithdrawParams,\n): Promise<WithdrawResult> => {\n const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n const amount = scale(tokenDecimals)(params.amount);\n\n const { calldata: data, value } = encodeWithdraw(\n params.marginAccountId,\n params.tokenAddress,\n BigInt(amount),\n );\n\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n chainId,\n ContractType.CORE_PROXY,\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -41,7 +41,6 @@ var common_1 = require("@reyaxyz/common");
|
|
|
41
41
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
42
42
|
var executeTransaction_1 = require("../executeTransaction");
|
|
43
43
|
var sign_1 = require("../sign");
|
|
44
|
-
var common_2 = require("../token/common");
|
|
45
44
|
var encode_1 = require("./encode");
|
|
46
45
|
var consts_1 = require("../../utils/consts");
|
|
47
46
|
var withdrawMAAndBridge = function (_a) {
|
|
@@ -58,7 +57,7 @@ var withdrawMAAndBridge = function (_a) {
|
|
|
58
57
|
return [4 /*yield*/, (0, sign_1.signCoreCommands)(signer, chainId, marginAccountId, owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
|
|
59
58
|
case 2:
|
|
60
59
|
eip712Signature = _e.sent();
|
|
61
|
-
tokenDecimals = (0,
|
|
60
|
+
tokenDecimals = (0, common_1.getTokenDetails)(tokenAddress).tokenDecimals;
|
|
62
61
|
scaledAmount = (0, common_1.scale)(tokenDecimals)(amount);
|
|
63
62
|
_c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, tokenAddress, scaledAmount, eip712Signature, BigInt('10000000'), (0, common_1.getSocketConnector)({
|
|
64
63
|
chainId: chainId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAMyB;AACzB,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAqD;AAKrD,6CAAgE;AAEzD,IAAM,mBAAmB,GAAG,UAAO,EAOd;QAN1B,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,KAAK,WAAA,EACL,MAAM,YAAA,EACN,YAAY,kBAAA,EACZ,uBAA+B,EAA/B,eAAe,mBAAG,KAAK,CAAC,OAAO,KAAA;;;;;;wBAEf,qBAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;oBAA7C,OAAO,GAAG,SAAmC;oBAC7C,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,eAAe,EACf,KAAK,CAAC,YAAY,EAClB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBANK,eAAe,GAAG,SAMvB;oBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,YAAY,CAAC,cAAlC,CAAmC;oBAClD,YAAY,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;oBAE5C,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;wBACjB,OAAO,SAAA;wBACP,YAAY,cAAA;qBACb,CAAC,EACF,IAAA,4BAAmB,EAAC;wBAClB,WAAW,EAAE,OAAO;wBACpB,YAAY,cAAA;qBACb,CAAC,EACF,eAAe,CAChB,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AAjDW,QAAA,mBAAmB,uBAiD9B","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n getSocketConnector,\n getSocketController,\n scale,\n getTokenDetails,\n} from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n WithdrawMAAndBridgeParams,\n WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const withdrawMAAndBridge = async ({\n signer,\n marginAccountId,\n owner,\n amount,\n tokenAddress,\n receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n const network = await signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n const eip712Signature = await signCoreCommands(\n signer,\n chainId,\n marginAccountId,\n owner.coreSigNonce,\n getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n );\n\n const { tokenDecimals } = getTokenDetails(tokenAddress);\n const scaledAmount = scale(tokenDecimals)(amount);\n\n const { calldata: data, value } = encodeWithdrawMAAndBridge(\n marginAccountId,\n tokenAddress,\n scaledAmount,\n eip712Signature,\n BigInt('10000000'),\n getSocketConnector({\n chainId,\n tokenAddress,\n }),\n getSocketController({\n reyaChainId: chainId,\n tokenAddress,\n }),\n receiverAddress,\n );\n\n const result = await executeTransaction(\n signer,\n data,\n value,\n chainId,\n ContractType.CORE_PROXY,\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.approveTokenSpending = void 0;
|
|
40
40
|
var types_1 = require("./types");
|
|
41
|
-
var common_1 = require("
|
|
41
|
+
var common_1 = require("@reyaxyz/common");
|
|
42
42
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
43
43
|
var approveTokenSpending = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
44
44
|
var underLyingTokenAddress, network, chainId, tokenContract, contractProxyAddress, maxUint256Bn, approvalTransaction, error_1, _a, error_2;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approve.js","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"approve.js","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,0CAA2E;AAC3E,mEAAyE;AAElE,IAAM,oBAAoB,GAAG,UAClC,MAA0B;;;;;;;gBAEpB,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC;gBAEnC,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;gBAEnC,aAAa,GAAG,IAAA,8BAAqB,EACzC,sBAAsB,EACtB,MAAM,CAAC,MAAM,CACd,CAAC;gBAEI,oBAAoB,GACxB,MAAM,CAAC,IAAI,KAAK,oBAAY,CAAC,OAAO;oBAClC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,UAAU,CAAC;oBAC9C,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,kBAAkB,CAAC,CAAC;gBAGrD,YAAY,GAAG,MAAM,CACzB,gFAAgF,CACjF,CAAC;gBAE0B,qBAAM,aAAa;yBAC5C,OAAO,CAAC,oBAAoB,EAAE,YAAY,CAAC;yBAC3C,KAAK,CAAC,UAAC,KAAK;wBACX,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;wBAC/C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;oBACpD,CAAC,CAAC,EAAA;;gBANE,mBAAmB,GAAG,SAMxB;;;;gBAGF,qBAAM,mBAAmB,CAAC,IAAI,EAAE,EAAA;;gBAAhC,SAAgC,CAAC;;;;gBAEjC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;;;gBAI5B,KAAA,0BAAiB,CAAA;;gBACb,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;oBAD1C,qBAAM,mBACX,gBAAa,GAAE,SAAgC;wBAC/C,eAAY,GAAE,sBAAsB;wBACpC,iBAAc,GAAE,oBAAoB;wBACpC,UAAO,GAAE,MAAM,CAAC,MAAM;6BACtB,EAAA;oBALF,sBAAO,SAKL,EAAC;;;gBAEH,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;;qBAG5C,sBAAO,CAAC,EAAC;;;KACV,CAAC;AAlDW,QAAA,oBAAoB,wBAkD/B","sourcesContent":["import { ApprovalType, ApproveTokenParams } from './types';\nimport { getERC20Allowance, getERC20TokenContract } from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const approveTokenSpending = async (\n params: ApproveTokenParams,\n): Promise<number> => {\n const underLyingTokenAddress = params.tokenAddress;\n\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const tokenContract = getERC20TokenContract(\n underLyingTokenAddress,\n params.signer,\n );\n\n const contractProxyAddress =\n params.type === ApprovalType.DEPOSIT\n ? getAddress(chainId, ContractType.CORE_PROXY)\n : getAddress(chainId, ContractType.PASSIVE_POOL_PROXY);\n\n // @todo validate if maxAllowance should be passed from UI\n const maxUint256Bn = BigInt(\n '115792089237316195423570985008687907853269984665640564039457584007913129639935',\n );\n\n const approvalTransaction = await tokenContract\n .approve(contractProxyAddress, maxUint256Bn)\n .catch((error) => {\n console.warn('Transaction Confirmation Error');\n console.error(error);\n throw new Error('Transaction Confirmation Error');\n });\n\n try {\n await approvalTransaction.wait();\n } catch (error) {\n console.warn('Token approval failed');\n throw new Error('Token approval failed');\n }\n\n try {\n return await getERC20Allowance({\n walletAddress: await params.signer.getAddress(),\n tokenAddress: underLyingTokenAddress,\n spenderAddress: contractProxyAddress,\n subject: params.signer,\n });\n } catch (error) {\n console.warn('Fetching allowance failed');\n }\n\n return 0;\n};\n"]}
|
|
@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.getAllowance = void 0;
|
|
40
40
|
var types_1 = require("./types");
|
|
41
|
-
var common_1 = require("
|
|
41
|
+
var common_1 = require("@reyaxyz/common");
|
|
42
42
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
43
43
|
var getAllowance = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
44
44
|
var underLyingTokenAddress, network, chainId, contractProxyAddress, walletAddress, allowance;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAllowance.js","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,
|
|
1
|
+
{"version":3,"file":"getAllowance.js","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,0CAAoD;AACpD,mEAAyE;AAElE,IAAM,YAAY,GAAG,UAC1B,MAA0B;;;;;;gBAEpB,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC;gBAEnC,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;gBAEnC,oBAAoB,GACxB,MAAM,CAAC,IAAI,KAAK,oBAAY,CAAC,OAAO;oBAClC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,UAAU,CAAC;oBAC9C,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,kBAAkB,CAAC,CAAC;gBAC7B,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;gBAAxD,aAAa,GAAW,SAAgC;gBAE5C,qBAAM,IAAA,0BAAiB,EAAC;wBACxC,aAAa,eAAA;wBACb,YAAY,EAAE,sBAAsB;wBACpC,cAAc,EAAE,oBAAoB;wBACpC,OAAO,EAAE,MAAM,CAAC,MAAM;qBACvB,CAAC,EAAA;;gBALI,SAAS,GAAG,SAKhB;gBAEF,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AAtBW,QAAA,YAAY,gBAsBvB","sourcesContent":["import { ApprovalType, GetAllowanceParams } from './types';\nimport { getERC20Allowance } from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const getAllowance = async (\n params: GetAllowanceParams,\n): Promise<number> => {\n const underLyingTokenAddress = params.tokenAddress;\n\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n const contractProxyAddress =\n params.type === ApprovalType.DEPOSIT\n ? getAddress(chainId, ContractType.CORE_PROXY)\n : getAddress(chainId, ContractType.PASSIVE_POOL_PROXY);\n const walletAddress: string = await params.signer.getAddress();\n\n const allowance = await getERC20Allowance({\n walletAddress,\n tokenAddress: underLyingTokenAddress,\n spenderAddress: contractProxyAddress,\n subject: params.signer,\n });\n\n return allowance;\n};\n"]}
|
|
@@ -37,7 +37,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
|
37
37
|
};
|
|
38
38
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
39
|
exports.getBalanceByTokenAddress = void 0;
|
|
40
|
-
var common_1 = require("
|
|
40
|
+
var common_1 = require("@reyaxyz/common");
|
|
41
41
|
var getBalanceByTokenAddress = function (_a) {
|
|
42
42
|
var signer = _a.signer, tokenAddress = _a.tokenAddress;
|
|
43
43
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalanceByTokenAddress.js","sourceRoot":"/","sources":["services/token/getBalanceByTokenAddress.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,
|
|
1
|
+
{"version":3,"file":"getBalanceByTokenAddress.js","sourceRoot":"/","sources":["services/token/getBalanceByTokenAddress.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,0CAAkD;AAE3C,IAAM,wBAAwB,GAAG,UAAO,EAGd;QAF/B,MAAM,YAAA,EACN,YAAY,kBAAA;;;;;wBAEU,qBAAM,MAAM,CAAC,UAAU,EAAE,EAAA;;oBAAzC,aAAa,GAAG,SAAyB;oBACxC,qBAAM,IAAA,wBAAe,EAAC;4BAC3B,aAAa,eAAA;4BACb,OAAO,EAAE,MAAM;4BACf,YAAY,EAAE,YAAY;yBAC3B,CAAC,EAAA;wBAJF,sBAAO,SAIL,EAAC;;;;CACJ,CAAC;AAVW,QAAA,wBAAwB,4BAUnC","sourcesContent":["import { GetBalanceByTokenAddressParams } from './types';\nimport { getERC20Balance } from '@reyaxyz/common';\n\nexport const getBalanceByTokenAddress = async ({\n signer,\n tokenAddress,\n}: GetBalanceByTokenAddressParams): Promise<number> => {\n const walletAddress = await signer.getAddress();\n return await getERC20Balance({\n walletAddress,\n subject: signer,\n tokenAddress: tokenAddress,\n });\n};\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;AAIA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;AACT,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;AAIA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;AACT,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { TokenEntity } from '@reyaxyz/common';\nimport { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';\n\nexport enum ApprovalType {\n LP,\n DEPOSIT,\n}\n\nexport type ApproveTokenParams = {\n signer: Signer | JsonRpcSigner;\n tokenAddress: TokenEntity['address'];\n type: ApprovalType;\n};\n\nexport type GetAllowanceParams = {\n signer: Signer | JsonRpcSigner;\n tokenAddress: TokenEntity['address'];\n type: ApprovalType;\n};\n\nexport type GetBalanceByTokenAddressParams = {\n signer: Signer | JsonRpcSigner;\n tokenAddress: TokenEntity['address'];\n};\n\nexport type GetBalanceByChainIdParams = {\n signer: Signer | JsonRpcSigner;\n chainId: ReyaChainId | MoneyInOutChainId;\n};\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simulateWithdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"simulateWithdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,0CAA0C,EAC1C,0CAA0C,EAC3C,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,oCAAoC,WAEvC,0CAA0C,KACjD,0CAmBF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transferFromMAToPool.d.ts","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transferFromMAToPool.d.ts","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":"AASA,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,oBAAoB,WACvB,0BAA0B,KACjC,QAAQ,0BAA0B,CAmCpC,CAAC"}
|
|
@@ -47,7 +47,7 @@ export type BridgeAndDepositPassivePoolResult = {
|
|
|
47
47
|
};
|
|
48
48
|
export type SimulateBridgeAndDepositPassivePoolResult = {
|
|
49
49
|
fees: number;
|
|
50
|
-
feesUnderlyingToken:
|
|
50
|
+
feesUnderlyingToken: TokenEntity['id'];
|
|
51
51
|
bridgeTimeInMS: number;
|
|
52
52
|
};
|
|
53
53
|
export type SimulateBridgeAndDepositPassivePoolParams = {
|
|
@@ -55,6 +55,7 @@ export type SimulateBridgeAndDepositPassivePoolParams = {
|
|
|
55
55
|
};
|
|
56
56
|
export type SimulateWithdrawPassivePoolAndBridgeResult = {
|
|
57
57
|
fees: number;
|
|
58
|
+
feesUnderlyingToken: TokenEntity['id'];
|
|
58
59
|
bridgeTimeInMS: number;
|
|
59
60
|
};
|
|
60
61
|
export type SimulateWithdrawPassivePoolAndBridgeParams = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACX,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACX,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;CACvD,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"deposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAMvD,eAAO,MAAM,OAAO,WACV,aAAa,KACpB,QAAQ,aAAa,CAuBvB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transferMarginBetweenAccounts.d.ts","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transferMarginBetweenAccounts.d.ts","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,mCAAmC,EACnC,mCAAmC,EACpC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,6BAA6B,WAChC,mCAAmC,KAC1C,QAAQ,mCAAmC,CAwB7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"withdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAMzD,eAAO,MAAM,QAAQ,WACX,cAAc,KACrB,QAAQ,cAAc,CAwBxB,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { JsonRpcSigner, Signer } from 'ethers';
|
|
2
|
-
import {
|
|
2
|
+
import { TokenEntity } from '@reyaxyz/common';
|
|
3
3
|
import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';
|
|
4
4
|
export declare enum ApprovalType {
|
|
5
5
|
LP = 0,
|
|
@@ -15,12 +15,6 @@ export type GetAllowanceParams = {
|
|
|
15
15
|
tokenAddress: TokenEntity['address'];
|
|
16
16
|
type: ApprovalType;
|
|
17
17
|
};
|
|
18
|
-
export type GetERC20AllowanceParams = {
|
|
19
|
-
walletAddress: string;
|
|
20
|
-
tokenAddress: LpPoolEntity['tokenAddress'];
|
|
21
|
-
spenderAddress: string;
|
|
22
|
-
subject: Signer;
|
|
23
|
-
};
|
|
24
18
|
export type GetBalanceByTokenAddressParams = {
|
|
25
19
|
signer: Signer | JsonRpcSigner;
|
|
26
20
|
tokenAddress: TokenEntity['address'];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEjE,oBAAY,YAAY;IACtB,EAAE,IAAA;IACF,OAAO,IAAA;CACR;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,WAAW,GAAG,iBAAiB,CAAC;CAC1C,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reyaxyz/sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.26.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.24.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": "a3abad43a112fb76ffa96e100360d5cecd6333b1"
|
|
38
38
|
}
|
|
@@ -4,10 +4,10 @@ import {
|
|
|
4
4
|
getSocketDepositFeesAsBigInt,
|
|
5
5
|
getSocketVault,
|
|
6
6
|
scale,
|
|
7
|
+
getTokenDetails,
|
|
7
8
|
} from '@reyaxyz/common';
|
|
8
9
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
9
10
|
import { executeTransaction } from '../executeTransaction';
|
|
10
|
-
import { getTokenDetails } from '../token/common';
|
|
11
11
|
import { encodeBridgeAndDepositPassivePool } from './encode';
|
|
12
12
|
import {
|
|
13
13
|
BridgeAndDepositPassivePoolParams,
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
getSocketBridgeTime,
|
|
3
|
+
getSocketWithdrawFees,
|
|
4
|
+
getTokenDetails,
|
|
5
|
+
} from '@reyaxyz/common';
|
|
2
6
|
import {
|
|
3
7
|
SimulateWithdrawPassivePoolAndBridgeParams,
|
|
4
8
|
SimulateWithdrawPassivePoolAndBridgeResult,
|
|
@@ -17,8 +21,11 @@ export const simulateWithdrawPassivePoolAndBridge = (
|
|
|
17
21
|
tokenAddress: params.tokenAddress,
|
|
18
22
|
});
|
|
19
23
|
|
|
24
|
+
const feesUnderlyingToken = getTokenDetails(params.tokenAddress).tokenName;
|
|
25
|
+
|
|
20
26
|
const result: SimulateWithdrawPassivePoolAndBridgeResult = {
|
|
21
27
|
fees: fees.fees,
|
|
28
|
+
feesUnderlyingToken: feesUnderlyingToken,
|
|
22
29
|
bridgeTimeInMS: bridgeTimeInMS,
|
|
23
30
|
};
|
|
24
31
|
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import {
|
|
2
|
+
getCurrentTimestampInSeconds,
|
|
3
|
+
scale,
|
|
4
|
+
getTokenDetails,
|
|
5
|
+
} from '@reyaxyz/common';
|
|
2
6
|
import { ContractType } from '../../utils/contractAddresses';
|
|
3
7
|
import { executeTransaction } from '../executeTransaction';
|
|
4
8
|
import { signCoreCommands } from '../sign';
|
|
5
|
-
import { getTokenDetails } from '../token/common';
|
|
6
9
|
import { encodeTransferFromMAToPool } from './encode';
|
|
7
10
|
import {
|
|
8
11
|
TransferFromMAToPoolParams,
|
package/src/services/lp/types.ts
CHANGED
|
@@ -66,7 +66,7 @@ export type BridgeAndDepositPassivePoolResult = {
|
|
|
66
66
|
|
|
67
67
|
export type SimulateBridgeAndDepositPassivePoolResult = {
|
|
68
68
|
fees: number;
|
|
69
|
-
feesUnderlyingToken:
|
|
69
|
+
feesUnderlyingToken: TokenEntity['id'];
|
|
70
70
|
bridgeTimeInMS: number;
|
|
71
71
|
};
|
|
72
72
|
|
|
@@ -76,6 +76,7 @@ export type SimulateBridgeAndDepositPassivePoolParams = {
|
|
|
76
76
|
|
|
77
77
|
export type SimulateWithdrawPassivePoolAndBridgeResult = {
|
|
78
78
|
fees: number;
|
|
79
|
+
feesUnderlyingToken: TokenEntity['id'];
|
|
79
80
|
bridgeTimeInMS: number;
|
|
80
81
|
};
|
|
81
82
|
|
|
@@ -4,10 +4,10 @@ import {
|
|
|
4
4
|
getSocketDepositFeesAsBigInt,
|
|
5
5
|
getSocketVault,
|
|
6
6
|
scale,
|
|
7
|
+
getTokenDetails,
|
|
7
8
|
} from '@reyaxyz/common';
|
|
8
9
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
9
10
|
import { executeTransaction } from '../executeTransaction';
|
|
10
|
-
import { getTokenDetails } from '../token/common';
|
|
11
11
|
import { encodeBridgeAndDepositExistingMA } from './encode';
|
|
12
12
|
import {
|
|
13
13
|
BridgeAndDepositExisingMAParams,
|