@reyaxyz/sdk 0.63.0 → 0.63.1
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 -1
- package/dist/services/lp/bridgeAndDepositPassivePool.js.map +1 -1
- package/dist/services/lp/withdrawPassivePoolAndBridge.js +1 -1
- package/dist/services/lp/withdrawPassivePoolAndBridge.js.map +1 -1
- package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js +1 -1
- package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js.map +1 -1
- package/dist/services/margin-accounts/withdrawMAAndBridge.js +1 -1
- package/dist/services/margin-accounts/withdrawMAAndBridge.js.map +1 -1
- package/dist/services/token/approve.js +1 -2
- package/dist/services/token/approve.js.map +1 -1
- package/dist/services/token/getAllowance.js +1 -2
- package/dist/services/token/getAllowance.js.map +1 -1
- package/dist/services/token/getUsdcBalance.js +2 -1
- package/dist/services/token/getUsdcBalance.js.map +1 -1
- package/dist/types/services/lp/bridgeAndDepositPassivePool.d.ts.map +1 -1
- package/dist/types/services/lp/withdrawPassivePoolAndBridge.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/bridgeAndDepositExistingMA.d.ts.map +1 -1
- package/dist/types/services/token/getUsdcBalance.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/services/lp/bridgeAndDepositPassivePool.ts +2 -5
- package/src/services/lp/withdrawPassivePoolAndBridge.ts +2 -1
- package/src/services/margin-accounts/bridgeAndDepositExistingMA.ts +3 -4
- package/src/services/margin-accounts/withdrawMAAndBridge.ts +2 -2
- package/src/services/token/approve.ts +2 -2
- package/src/services/token/getAllowance.ts +2 -2
- package/src/services/token/getUsdcBalance.ts +3 -2
|
@@ -51,7 +51,7 @@ var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, v
|
|
|
51
51
|
case 1:
|
|
52
52
|
network = _c.sent();
|
|
53
53
|
moneyInOutChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
|
|
54
|
-
tokenInfo = (0, common_1.
|
|
54
|
+
tokenInfo = (0, common_1.getRUSDUnderlying)(moneyInOutChainId);
|
|
55
55
|
amount = (0, common_1.scale)(tokenInfo.decimals)(params.amount);
|
|
56
56
|
socketConnectors = (0, common_1.getSocketConnectors)({
|
|
57
57
|
moneyInOutChainId: moneyInOutChainId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAQyB;AACzB,uCAAyD;AACzD,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA6D;AAQtD,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAQyB;AACzB,uCAAyD;AACzD,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA6D;AAQtD,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEhE,SAAS,GAAG,IAAA,0BAAiB,EAAC,iBAAiB,CAAC,CAAC;gBAEjD,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,SAAS,CAAC,IAAI;iBAC1B,CAAC,CAAC;gBAEG,gBAAgB,GAAG,IAAA,8BAAU,EACjC,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,EACtD,gCAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,KAA4B,IAAA,0CAAiC,EACjE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAI,EACJ,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,EACzB,MAAM,CAAC,CAAC,CAAC,CACV,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,SAAS,CAAC,IAAI;qBAC1B,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;AAnDW,QAAA,2BAA2B,+BAmDtC;AAEK,IAAM,0CAA0C,GAAG,UACxD,MAAwD;;;;;gBAElD,gBAAgB,GAAG,IAAA,kCAAyB,GAAE,CAAC;gBACrD,qBAAM,gBAAgB,CAAC,sBAAsB,CAAC;wBAC5C,aAAa,EAAE,MAAM,CAAC,YAAY;wBAClC,IAAI,EAAE,MAAM,CAAC,UAAU;qBACxB,CAAC,EAAA;;gBAHF,SAGE,CAAC;gBAEI,qBAAM,IAAA,mCAA2B,EAAC,MAAM,CAAC,EAAA;oBAAhD,sBAAO,SAAyC,EAAC;;;KAClD,CAAC;AAVW,QAAA,0CAA0C,8CAUrD","sourcesContent":["import {\n getSocketDepositFeesAsBigInt,\n getSocketVault,\n scale,\n MoneyInOutChainId,\n getSocketConnectors,\n getReyaNetworkFromMoneyInOutChainId,\n getRUSDUnderlying,\n} from '@reyaxyz/common';\nimport { getAlphaTermsModuleClient } from '../../config';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n BridgeAndDepositPassivePoolParams,\n BridgeAndDepositPassivePoolResult,\n BridgeAndDepositPassivePoolUnderAlphaTermsParams,\n BridgeAndDepositPassivePoolUnderAlphaTermsResult,\n} from './types';\n\nexport const bridgeAndDepositPassivePool = async (\n params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n const network = await params.signer.provider?.getNetwork();\n const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n const tokenInfo = getRUSDUnderlying(moneyInOutChainId);\n\n const amount = scale(tokenInfo.decimals)(params.amount);\n\n const socketConnectors = getSocketConnectors({\n moneyInOutChainId: moneyInOutChainId,\n tokenName: tokenInfo.name,\n });\n\n const peripheryAddress = getAddress(\n getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId),\n ContractType.PERIPHERY_PROXY,\n );\n\n const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n peripheryAddress,\n BigInt('10000000'),\n socketConnectors.deposit,\n '0x',\n getSocketDepositFeesAsBigInt({\n moneyInOutChainId: moneyInOutChainId,\n }),\n params.pool.id,\n params.ownerAddress,\n amount,\n BigInt(0),\n BigInt('10000000'),\n socketConnectors.withdraw,\n BigInt(0),\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n moneyInOutChainId,\n getSocketVault({\n moneyInOutChainId: moneyInOutChainId,\n tokenName: tokenInfo.name,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n\nexport const bridgeAndDepositPassivePoolUnderAlphaTerms = async (\n params: BridgeAndDepositPassivePoolUnderAlphaTermsParams,\n): Promise<BridgeAndDepositPassivePoolUnderAlphaTermsResult> => {\n const alphaTermsModule = getAlphaTermsModuleClient();\n await alphaTermsModule.registerAlphaSignature({\n walletAddress: params.ownerAddress,\n link: params.signedLink,\n });\n\n return await bridgeAndDepositPassivePool(params);\n};\n"]}
|
|
@@ -64,7 +64,7 @@ var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0,
|
|
|
64
64
|
_a = (0, encode_1.encodeWithdrawPassivePoolAndBridge)(params.owner.address, params.pool.id, sharesAmount, BigInt(0), eip712Signature, BigInt('10000000'), //todo
|
|
65
65
|
BigInt(0), (0, common_1.getSocketConnectors)({
|
|
66
66
|
moneyInOutChainId: params.moneyInOutChainId,
|
|
67
|
-
tokenName:
|
|
67
|
+
tokenName: (0, common_1.getRUSDUnderlying)(params.moneyInOutChainId).name,
|
|
68
68
|
}).withdraw, params.owner.address), data = _a.calldata, value = _a.value;
|
|
69
69
|
return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY)];
|
|
70
70
|
case 3:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAyE;AACzE,4DAA2D;AAC3D,gCAAkD;AAKlD,mCAA8D;AAC9D,
|
|
1
|
+
{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAyE;AACzE,4DAA2D;AAC3D,gCAAkD;AAKlD,mCAA8D;AAC9D,0CAMyB;AACzB,6CAAgE;AAEzD,IAAM,4BAA4B,GAAG,UAC1C,MAA0C;;;;;oBAE1B,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAG1D,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,YAAY,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,YAAY,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC9D,CAAC;gBAEuB,qBAAM,IAAA,8BAAuB,EACnD,MAAM,CAAC,MAAM,EACb,WAAW,EACX,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAC7B,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBAVK,eAAe,GAAG,SAUvB;gBAEK,KAA4B,IAAA,2CAAkC,EAClE,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM;gBAC1B,MAAM,CAAC,CAAC,CAAC,EACT,IAAA,4BAAmB,EAAC;oBAClB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;oBAC3C,SAAS,EAAE,IAAA,0BAAiB,EAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,IAAI;iBAC5D,CAAC,CAAC,QAAQ,EACX,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,WAAW,EACX,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;AAnDW,QAAA,4BAA4B,gCAmDvC","sourcesContent":["import { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signPoolRemoveLiquidity } from '../sign';\nimport {\n WithdrawPassivePoolAndBridgeParams,\n WithdrawPassivePoolAndBridgeResult,\n} from './types';\nimport { encodeWithdrawPassivePoolAndBridge } from './encode';\nimport {\n ReyaChainId,\n getCurrentTimestampInSeconds,\n getRUSDUnderlying,\n getSocketConnectors,\n scale,\n} from '@reyaxyz/common';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const withdrawPassivePoolAndBridge = async (\n params: WithdrawPassivePoolAndBridgeParams,\n): Promise<WithdrawPassivePoolAndBridgeResult> => {\n const network = await params.signer.provider?.getNetwork();\n const reyaChainId: ReyaChainId = Number(network?.chainId);\n\n let sharesAmount;\n if (params.withdrawMax) {\n sharesAmount = scale(30)(params.sharesAmount);\n } else {\n sharesAmount = scale(30)(params.amount * params.sharePrice);\n }\n\n const eip712Signature = await signPoolRemoveLiquidity(\n params.signer,\n reyaChainId,\n getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n params.owner.address,\n params.pool.id,\n sharesAmount,\n BigInt(0),\n params.owner.poolSigNonce + 1,\n getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n );\n\n const { calldata: data, value } = encodeWithdrawPassivePoolAndBridge(\n params.owner.address,\n params.pool.id,\n sharesAmount,\n BigInt(0),\n eip712Signature,\n BigInt('10000000'), //todo\n BigInt(0),\n getSocketConnectors({\n moneyInOutChainId: params.moneyInOutChainId,\n tokenName: getRUSDUnderlying(params.moneyInOutChainId).name,\n }).withdraw,\n params.owner.address,\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n reyaChainId,\n ContractType.PERIPHERY_PROXY,\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -55,7 +55,7 @@ var bridgeAndDepositExistingMA = function (params) { return __awaiter(void 0, vo
|
|
|
55
55
|
reyaChainId = (0, common_1.getReyaNetworkFromMoneyInOutChainId)(moneyInOutChainId);
|
|
56
56
|
moneyInOutTokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress, moneyInOutChainId);
|
|
57
57
|
reyaPeripheryTokenInfo = (0, common_1.getTokenInfoByName)(moneyInOutTokenInfo.name, reyaChainId);
|
|
58
|
-
reyaCoreTokenInfo = reyaPeripheryTokenInfo.
|
|
58
|
+
reyaCoreTokenInfo = reyaPeripheryTokenInfo.isRUSDUnderlying
|
|
59
59
|
? (0, common_1.getTokenInfoByName)('RUSD', reyaChainId)
|
|
60
60
|
: reyaPeripheryTokenInfo;
|
|
61
61
|
multiAction = new action_1.MultiAction();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CASyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA4D;AAK5D,oCAAgD;AAChD,6CAAiD;AAE1C,IAAM,0BAA0B,GAAG,UACxC,MAAwC;;;;;oBAExB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAChE,WAAW,GAAG,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,CAAC;gBAErE,mBAAmB,GAAG,IAAA,8BAAqB,EAC/C,MAAM,CAAC,YAAY,EACnB,iBAAiB,CAClB,CAAC;gBACI,sBAAsB,GAAG,IAAA,2BAAkB,EAC/C,mBAAmB,CAAC,IAAI,EACxB,WAAW,CACZ,CAAC;gBACI,iBAAiB,
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CASyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA4D;AAK5D,oCAAgD;AAChD,6CAAiD;AAE1C,IAAM,0BAA0B,GAAG,UACxC,MAAwC;;;;;oBAExB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAChE,WAAW,GAAG,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,CAAC;gBAErE,mBAAmB,GAAG,IAAA,8BAAqB,EAC/C,MAAM,CAAC,YAAY,EACnB,iBAAiB,CAClB,CAAC;gBACI,sBAAsB,GAAG,IAAA,2BAAkB,EAC/C,mBAAmB,CAAC,IAAI,EACxB,WAAW,CACZ,CAAC;gBACI,iBAAiB,GAAG,sBAAsB,CAAC,gBAAgB;oBAC/D,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;oBACzC,CAAC,CAAC,sBAAsB,CAAC;gBAErB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,IAAA,4BAAmB,EACjB,iBAAiB,CAAC,OAAO,EACzB,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrD,WAAW,CACZ,CAAC;gBAEI,gBAAgB,GAAG,IAAA,8BAAU,EACjC,WAAW,EACX,gCAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,mBAAmB,CAAC,IAAI;iBACpC,CAAC,CAAC;gBAEG,KAA4B,IAAA,yCAAgC,EAChE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAI,EACJ,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrD,IAAA,cAAK,EAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAClD,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,EACzB,MAAM,CAAC,CAAC,CAAC,CACV,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,mBAAmB,CAAC,IAAI;qBACpC,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;AAnEW,QAAA,0BAA0B,8BAmErC","sourcesContent":["import {\n getSocketConnectors,\n getSocketDepositFeesAsBigInt,\n getSocketVault,\n scale,\n MoneyInOutChainId,\n getTokenInfoByAddress,\n getTokenInfoByName,\n getReyaNetworkFromMoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n BridgeAndDepositExistingMAParams,\n BridgeAndDepositExistingMAResult,\n} from './types';\nimport { encodeSingleDeposit } from '../encode';\nimport { MultiAction } from '../../utils/action';\n\nexport const bridgeAndDepositExistingMA = async (\n params: BridgeAndDepositExistingMAParams,\n): Promise<BridgeAndDepositExistingMAResult> => {\n const network = await params.signer.provider?.getNetwork();\n const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n const reyaChainId = getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId);\n\n const moneyInOutTokenInfo = getTokenInfoByAddress(\n params.tokenAddress,\n moneyInOutChainId,\n );\n const reyaPeripheryTokenInfo = getTokenInfoByName(\n moneyInOutTokenInfo.name,\n reyaChainId,\n );\n const reyaCoreTokenInfo = reyaPeripheryTokenInfo.isRUSDUnderlying\n ? getTokenInfoByName('RUSD', reyaChainId)\n : reyaPeripheryTokenInfo;\n\n const multiAction = new MultiAction();\n encodeSingleDeposit(\n reyaCoreTokenInfo.address,\n scale(reyaPeripheryTokenInfo.decimals)(params.amount),\n multiAction,\n );\n\n const peripheryAddress = getAddress(\n reyaChainId,\n ContractType.PERIPHERY_PROXY,\n );\n\n const socketConnectors = getSocketConnectors({\n moneyInOutChainId: moneyInOutChainId,\n tokenName: moneyInOutTokenInfo.name,\n });\n\n const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n peripheryAddress,\n BigInt('10000000'),\n socketConnectors.deposit,\n '0x',\n getSocketDepositFeesAsBigInt({\n moneyInOutChainId: moneyInOutChainId,\n }),\n params.marginAccountId,\n reyaPeripheryTokenInfo.address,\n scale(reyaPeripheryTokenInfo.decimals)(params.amount),\n scale(moneyInOutTokenInfo.decimals)(params.amount),\n BigInt('10000000'),\n socketConnectors.withdraw,\n BigInt(0),\n );\n\n const result = await executeTransaction(\n params.signer,\n data,\n value,\n moneyInOutChainId,\n getSocketVault({\n moneyInOutChainId: moneyInOutChainId,\n tokenName: moneyInOutTokenInfo.name,\n }),\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -58,7 +58,7 @@ var withdrawMAAndBridge = function (_a) {
|
|
|
58
58
|
reyaChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
|
|
59
59
|
corePeripheryTokenInfo = (0, common_1.getTokenInfoByAddress)(tokenAddress);
|
|
60
60
|
bridgeTokenInfo = corePeripheryTokenInfo.name === 'RUSD'
|
|
61
|
-
? (0, common_1.
|
|
61
|
+
? (0, common_1.getRUSDUnderlying)(reyaChainId)
|
|
62
62
|
: corePeripheryTokenInfo;
|
|
63
63
|
multiAction = new action_1.MultiAction();
|
|
64
64
|
(0, encode_2.encodeSingleWithdraw)(corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), multiAction);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAqD;AAKrD,6CAAgE;AAChE,oCAAiD;AACjD,6CAAiD;AAE1C,IAAM,mBAAmB,GAAG,UAAO,EAQd;QAP1B,MAAM,YAAA,EACN,iBAAiB,uBAAA,EACjB,eAAe,qBAAA,EACf,KAAK,WAAA,EACG,cAAc,YAAA,EACtB,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,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAEpD,sBAAsB,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBAC7D,eAAe,GACnB,sBAAsB,CAAC,IAAI,KAAK,MAAM;wBACpC,CAAC,CAAC,IAAA,
|
|
1
|
+
{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAqD;AAKrD,6CAAgE;AAChE,oCAAiD;AACjD,6CAAiD;AAE1C,IAAM,mBAAmB,GAAG,UAAO,EAQd;QAP1B,MAAM,YAAA,EACN,iBAAiB,uBAAA,EACjB,eAAe,qBAAA,EACf,KAAK,WAAA,EACG,cAAc,YAAA,EACtB,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,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAEpD,sBAAsB,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBAC7D,eAAe,GACnB,sBAAsB,CAAC,IAAI,KAAK,MAAM;wBACpC,CAAC,CAAC,IAAA,0BAAiB,EAAC,WAAW,CAAC;wBAChC,CAAC,CAAC,sBAAsB,CAAC;oBAEvB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;oBACtC,IAAA,6BAAoB,EAClB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,WAAW,CACZ,CAAC;oBACsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,WAAW,EACX,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,eAAe,EACf,WAAW,CAAC,QAAQ,EACpB,KAAK,CAAC,YAAY,GAAG,CAAC,EACtB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBARK,eAAe,GAAG,SAQvB;oBAEK,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;wBAC3C,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,eAAe,CAAC,IAAI;qBAChC,CAAC,CAAC;oBAEG,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,MAAM,CAAC,CAAC,CAAC,EACT,gBAAgB,CAAC,QAAQ,EACzB,eAAe,CAChB,EATiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAS3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,eAAe,CAC7B,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA7DW,QAAA,mBAAmB,uBA6D9B","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n getSocketConnectors,\n scale,\n ReyaChainId,\n getTokenInfoByAddress,\n getRUSDUnderlying,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } 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';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '../../utils/action';\n\nexport const withdrawMAAndBridge = async ({\n signer,\n moneyInOutChainId,\n marginAccountId,\n owner,\n amount: unscaledAmount,\n tokenAddress,\n receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n const network = await signer.provider?.getNetwork();\n const reyaChainId: ReyaChainId = Number(network?.chainId);\n\n const corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n const bridgeTokenInfo =\n corePeripheryTokenInfo.name === 'RUSD'\n ? getRUSDUnderlying(reyaChainId)\n : corePeripheryTokenInfo;\n\n const multiAction = new MultiAction();\n encodeSingleWithdraw(\n corePeripheryTokenInfo.address,\n scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n multiAction,\n );\n const eip712Signature = await signCoreCommands(\n signer,\n reyaChainId,\n getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n marginAccountId,\n multiAction.commands,\n owner.coreSigNonce + 1,\n getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n );\n\n const socketConnectors = getSocketConnectors({\n moneyInOutChainId: moneyInOutChainId,\n tokenName: bridgeTokenInfo.name,\n });\n\n const { calldata: data, value } = encodeWithdrawMAAndBridge(\n marginAccountId,\n corePeripheryTokenInfo.address,\n scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n eip712Signature,\n BigInt('10000000'),\n BigInt(0),\n socketConnectors.withdraw,\n receiverAddress,\n );\n\n const result = await executeTransaction(\n signer,\n data,\n value,\n reyaChainId,\n ContractType.PERIPHERY_PROXY,\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -40,7 +40,6 @@ exports.approveTokenSpending = void 0;
|
|
|
40
40
|
var types_1 = require("./types");
|
|
41
41
|
var common_1 = require("@reyaxyz/common");
|
|
42
42
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
43
|
-
var common_2 = require("@reyaxyz/common");
|
|
44
43
|
var approveTokenSpending = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
44
|
var network, chainId, tokenInfo, tokenContract, contractProxyAddress, scaledTokenAmount, approvalTransaction, error_1, _a, error_2;
|
|
46
45
|
var _b;
|
|
@@ -53,7 +52,7 @@ var approveTokenSpending = function (params) { return __awaiter(void 0, void 0,
|
|
|
53
52
|
chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
|
|
54
53
|
tokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress);
|
|
55
54
|
if (types_1.ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {
|
|
56
|
-
tokenInfo = (0,
|
|
55
|
+
tokenInfo = (0, common_1.getRUSDUnderlying)(chainId);
|
|
57
56
|
}
|
|
58
57
|
tokenContract = (0, common_1.getERC20TokenContract)(tokenInfo.address, params.signer);
|
|
59
58
|
switch (params.type) {
|
|
@@ -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,0CAQyB;AACzB,mEAAyE;AAElE,IAAM,oBAAoB,GAAG,UAClC,MAA0B;;;;;;oBAEV,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;gBAGrC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC3D,IAAI,oBAAY,CAAC,MAAM,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACrD,SAAS,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,CAAC;gBACzC,CAAC;gBAEK,aAAa,GAAG,IAAA,8BAAqB,EAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;gBAG9E,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACpB,KAAK,oBAAY,CAAC,OAAO;wBACvB,oBAAoB,GAAG,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,UAAU,CAAC,CAAC;wBACpE,MAAM;oBACR,KAAK,oBAAY,CAAC,EAAE;wBAClB,oBAAoB,GAAG,IAAA,8BAAU,EAC/B,OAAO,EACP,gCAAY,CAAC,kBAAkB,CAChC,CAAC;wBACF,MAAM;oBACR,KAAK,oBAAY,CAAC,MAAM;wBACtB,oBAAoB,GAAG,IAAA,uBAAc,EAAC;4BACpC,iBAAiB,EAAE,OAAO;4BAC1B,SAAS,EAAE,SAAS,CAAC,IAAI;yBACF,CAAC,CAAC;wBAC3B,MAAM;oBACR;wBACE,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;gBACxE,CAAC;gBAEK,iBAAiB,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAEvC,qBAAM,aAAa;yBAC5C,OAAO,CAAC,oBAAoB,EAAE,iBAAiB,CAAC;yBAChD,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;;;;gBAEF,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,SAAS,CAAC,OAAO;wBAC/B,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;AA/DW,QAAA,oBAAoB,wBA+D/B","sourcesContent":["import { ApprovalType, ApproveTokenParams } from './types';\nimport {\n getERC20Allowance,\n getERC20TokenContract,\n getRUSDUnderlying,\n getSocketVault,\n GetSocketVaultParams,\n getTokenInfoByAddress,\n scale,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const approveTokenSpending = async (\n params: ApproveTokenParams,\n): Promise<number> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n // todo: to be removed once lp form in offchain/UI is fixed\n let tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n if (ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {\n tokenInfo = getRUSDUnderlying(chainId);\n }\n\n const tokenContract = getERC20TokenContract(tokenInfo.address, params.signer);\n\n let contractProxyAddress;\n switch (params.type) {\n case ApprovalType.DEPOSIT:\n contractProxyAddress = getAddress(chainId, ContractType.CORE_PROXY);\n break;\n case ApprovalType.LP:\n contractProxyAddress = getAddress(\n chainId,\n ContractType.PASSIVE_POOL_PROXY,\n );\n break;\n case ApprovalType.BRIDGE:\n contractProxyAddress = getSocketVault({\n moneyInOutChainId: chainId,\n tokenName: tokenInfo.name,\n } as GetSocketVaultParams);\n break;\n default:\n throw new Error('Unexpected approval type in approveTokenSpending');\n }\n\n const scaledTokenAmount = scale(tokenInfo.decimals)(params.amount);\n\n const approvalTransaction = await tokenContract\n .approve(contractProxyAddress, scaledTokenAmount)\n .catch((error) => {\n console.warn('Transaction Confirmation Error');\n console.error(error);\n throw new Error('Transaction Confirmation Error');\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: tokenInfo.address,\n spenderAddress: contractProxyAddress,\n subject: params.signer,\n });\n } catch (error) {\n console.warn('Fetching allowance failed');\n }\n\n return 0;\n};\n"]}
|
|
@@ -40,7 +40,6 @@ exports.getAllowance = void 0;
|
|
|
40
40
|
var types_1 = require("./types");
|
|
41
41
|
var common_1 = require("@reyaxyz/common");
|
|
42
42
|
var contractAddresses_1 = require("../../utils/contractAddresses");
|
|
43
|
-
var common_2 = require("@reyaxyz/common");
|
|
44
43
|
var getAllowance = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
45
44
|
var network, chainId, tokenInfo, contractProxyAddress, walletAddress, allowance;
|
|
46
45
|
var _a;
|
|
@@ -52,7 +51,7 @@ var getAllowance = function (params) { return __awaiter(void 0, void 0, void 0,
|
|
|
52
51
|
chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
|
|
53
52
|
tokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress);
|
|
54
53
|
if (types_1.ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {
|
|
55
|
-
tokenInfo = (0,
|
|
54
|
+
tokenInfo = (0, common_1.getRUSDUnderlying)(chainId);
|
|
56
55
|
}
|
|
57
56
|
switch (params.type) {
|
|
58
57
|
case types_1.ApprovalType.DEPOSIT:
|
|
@@ -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,0CAMyB;AACzB,mEAAyE;AAElE,IAAM,YAAY,GAAG,UAC1B,MAA0B;;;;;oBAEV,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;gBAGrC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC3D,IAAI,oBAAY,CAAC,MAAM,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACrD,SAAS,GAAG,IAAA,0BAAiB,EAAC,OAAO,CAAC,CAAC;gBACzC,CAAC;gBAGD,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;oBACpB,KAAK,oBAAY,CAAC,OAAO;wBACvB,oBAAoB,GAAG,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,UAAU,CAAC,CAAC;wBACpE,MAAM;oBACR,KAAK,oBAAY,CAAC,EAAE;wBAClB,oBAAoB,GAAG,IAAA,8BAAU,EAC/B,OAAO,EACP,gCAAY,CAAC,kBAAkB,CAChC,CAAC;wBACF,MAAM;oBACR,KAAK,oBAAY,CAAC,MAAM;wBACtB,oBAAoB,GAAG,IAAA,uBAAc,EAAC;4BACpC,iBAAiB,EAAE,OAAO;4BAC1B,SAAS,EAAE,SAAS,CAAC,IAAI;yBACF,CAAC,CAAC;wBAC3B,MAAM;oBACR;wBACE,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAChE,CAAC;gBAE6B,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;gBAAxD,aAAa,GAAW,SAAgC;gBAE5C,qBAAM,IAAA,0BAAiB,EAAC;wBACxC,aAAa,eAAA;wBACb,YAAY,EAAE,SAAS,CAAC,OAAO;wBAC/B,cAAc,EAAE,oBAAoB;wBACpC,OAAO,EAAE,MAAM,CAAC,MAAM;qBACvB,CAAC,EAAA;;gBALI,SAAS,GAAG,SAKhB;gBAEF,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AA3CW,QAAA,YAAY,gBA2CvB","sourcesContent":["import { ApprovalType, GetAllowanceParams } from './types';\nimport {\n GetSocketVaultParams,\n getERC20Allowance,\n getRUSDUnderlying,\n getSocketVault,\n getTokenInfoByAddress,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\n\nexport const getAllowance = async (\n params: GetAllowanceParams,\n): Promise<number> => {\n const network = await params.signer.provider?.getNetwork();\n const chainId = Number(network?.chainId);\n\n // todo: to be removed once lp form in offchain/UI is fixed\n let tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n if (ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {\n tokenInfo = getRUSDUnderlying(chainId);\n }\n\n let contractProxyAddress;\n switch (params.type) {\n case ApprovalType.DEPOSIT:\n contractProxyAddress = getAddress(chainId, ContractType.CORE_PROXY);\n break;\n case ApprovalType.LP:\n contractProxyAddress = getAddress(\n chainId,\n ContractType.PASSIVE_POOL_PROXY,\n );\n break;\n case ApprovalType.BRIDGE:\n contractProxyAddress = getSocketVault({\n moneyInOutChainId: chainId,\n tokenName: tokenInfo.name,\n } as GetSocketVaultParams);\n break;\n default:\n throw new Error('Unexpected approval type in getAllowance');\n }\n\n const walletAddress: string = await params.signer.getAddress();\n\n const allowance = await getERC20Allowance({\n walletAddress,\n tokenAddress: tokenInfo.address,\n spenderAddress: contractProxyAddress,\n subject: params.signer,\n });\n\n return allowance;\n};\n"]}
|
|
@@ -39,6 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.getUsdcBalance = void 0;
|
|
40
40
|
var getBalanceByTokenAddress_1 = require("./getBalanceByTokenAddress");
|
|
41
41
|
var common_1 = require("@reyaxyz/common");
|
|
42
|
+
// todo: maybe rename this to getRUSDUnderlyingAddress
|
|
42
43
|
var getUsdcBalance = function (_a) {
|
|
43
44
|
var signer = _a.signer;
|
|
44
45
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
@@ -52,7 +53,7 @@ var getUsdcBalance = function (_a) {
|
|
|
52
53
|
moneyInOutChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
|
|
53
54
|
return [2 /*return*/, (0, getBalanceByTokenAddress_1.getBalanceByTokenAddress)({
|
|
54
55
|
signer: signer,
|
|
55
|
-
tokenAddress: (0, common_1.
|
|
56
|
+
tokenAddress: (0, common_1.getRUSDUnderlying)(moneyInOutChainId).address,
|
|
56
57
|
})];
|
|
57
58
|
}
|
|
58
59
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUsdcBalance.js","sourceRoot":"/","sources":["services/token/getUsdcBalance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uEAAsE;AACtE,
|
|
1
|
+
{"version":3,"file":"getUsdcBalance.js","sourceRoot":"/","sources":["services/token/getUsdcBalance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uEAAsE;AACtE,0CAAuE;AAEvE,sDAAsD;AAC/C,IAAM,cAAc,GAAG,UAAO,EAEd;QADrB,MAAM,YAAA;;;;;;wBAEU,qBAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;oBAA7C,OAAO,GAAG,SAAmC;oBAC7C,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAEtE,sBAAO,IAAA,mDAAwB,EAAC;4BAC9B,MAAM,QAAA;4BACN,YAAY,EAAE,IAAA,0BAAiB,EAAC,iBAAiB,CAAC,CAAC,OAAO;yBAC3D,CAAC,EAAC;;;;CACJ,CAAC;AAVW,QAAA,cAAc,kBAUzB","sourcesContent":["import { GetUsdcBalanceParams } from './types';\nimport { getBalanceByTokenAddress } from './getBalanceByTokenAddress';\nimport { MoneyInOutChainId, getRUSDUnderlying } from '@reyaxyz/common';\n\n// todo: maybe rename this to getRUSDUnderlyingAddress\nexport const getUsdcBalance = async ({\n signer,\n}: GetUsdcBalanceParams): Promise<number> => {\n const network = await signer.provider?.getNetwork();\n const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n return getBalanceByTokenAddress({\n signer,\n tokenAddress: getRUSDUnderlying(moneyInOutChainId).address,\n });\n};\n"]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EACjC,gDAAgD,EAChD,gDAAgD,EACjD,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EACjC,gDAAgD,EAChD,gDAAgD,EACjD,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAiD3C,CAAC;AAEF,eAAO,MAAM,0CAA0C,WAC7C,gDAAgD,KACvD,QAAQ,gDAAgD,CAQ1D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"withdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,SAAS,CAAC;AAWjB,eAAO,MAAM,4BAA4B,WAC/B,kCAAkC,KACzC,QAAQ,kCAAkC,CAiD5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EACjC,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,0BAA0B,WAC7B,gCAAgC,KACvC,QAAQ,gCAAgC,
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EACjC,MAAM,SAAS,CAAC;AAIjB,eAAO,MAAM,0BAA0B,WAC7B,gCAAgC,KACvC,QAAQ,gCAAgC,CAiE1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUsdcBalance.d.ts","sourceRoot":"/","sources":["services/token/getUsdcBalance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"getUsdcBalance.d.ts","sourceRoot":"/","sources":["services/token/getUsdcBalance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAK/C,eAAO,MAAM,cAAc,gBAExB,oBAAoB,KAAG,QAAQ,MAAM,CAQvC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reyaxyz/sdk",
|
|
3
|
-
"version": "0.63.
|
|
3
|
+
"version": "0.63.1",
|
|
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.66.
|
|
32
|
+
"@reyaxyz/common": "0.66.1",
|
|
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": "3fdb789141374d425db31abd19a3fab14936db20"
|
|
38
38
|
}
|
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
MoneyInOutChainId,
|
|
6
6
|
getSocketConnectors,
|
|
7
7
|
getReyaNetworkFromMoneyInOutChainId,
|
|
8
|
-
|
|
8
|
+
getRUSDUnderlying,
|
|
9
9
|
} from '@reyaxyz/common';
|
|
10
10
|
import { getAlphaTermsModuleClient } from '../../config';
|
|
11
11
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
@@ -24,10 +24,7 @@ export const bridgeAndDepositPassivePool = async (
|
|
|
24
24
|
const network = await params.signer.provider?.getNetwork();
|
|
25
25
|
const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);
|
|
26
26
|
|
|
27
|
-
|
|
28
|
-
// it should be the token of the pool, or the underlying token
|
|
29
|
-
// if token is rusd.
|
|
30
|
-
const tokenInfo = getTokenInfoByName('USDC', moneyInOutChainId);
|
|
27
|
+
const tokenInfo = getRUSDUnderlying(moneyInOutChainId);
|
|
31
28
|
|
|
32
29
|
const amount = scale(tokenInfo.decimals)(params.amount);
|
|
33
30
|
|
|
@@ -9,6 +9,7 @@ import { encodeWithdrawPassivePoolAndBridge } from './encode';
|
|
|
9
9
|
import {
|
|
10
10
|
ReyaChainId,
|
|
11
11
|
getCurrentTimestampInSeconds,
|
|
12
|
+
getRUSDUnderlying,
|
|
12
13
|
getSocketConnectors,
|
|
13
14
|
scale,
|
|
14
15
|
} from '@reyaxyz/common';
|
|
@@ -49,7 +50,7 @@ export const withdrawPassivePoolAndBridge = async (
|
|
|
49
50
|
BigInt(0),
|
|
50
51
|
getSocketConnectors({
|
|
51
52
|
moneyInOutChainId: params.moneyInOutChainId,
|
|
52
|
-
tokenName:
|
|
53
|
+
tokenName: getRUSDUnderlying(params.moneyInOutChainId).name,
|
|
53
54
|
}).withdraw,
|
|
54
55
|
params.owner.address,
|
|
55
56
|
);
|
|
@@ -33,10 +33,9 @@ export const bridgeAndDepositExistingMA = async (
|
|
|
33
33
|
moneyInOutTokenInfo.name,
|
|
34
34
|
reyaChainId,
|
|
35
35
|
);
|
|
36
|
-
const reyaCoreTokenInfo =
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
: reyaPeripheryTokenInfo;
|
|
36
|
+
const reyaCoreTokenInfo = reyaPeripheryTokenInfo.isRUSDUnderlying
|
|
37
|
+
? getTokenInfoByName('RUSD', reyaChainId)
|
|
38
|
+
: reyaPeripheryTokenInfo;
|
|
40
39
|
|
|
41
40
|
const multiAction = new MultiAction();
|
|
42
41
|
encodeSingleDeposit(
|
|
@@ -4,7 +4,7 @@ import {
|
|
|
4
4
|
scale,
|
|
5
5
|
ReyaChainId,
|
|
6
6
|
getTokenInfoByAddress,
|
|
7
|
-
|
|
7
|
+
getRUSDUnderlying,
|
|
8
8
|
} from '@reyaxyz/common';
|
|
9
9
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
10
10
|
import { executeTransaction } from '../executeTransaction';
|
|
@@ -33,7 +33,7 @@ export const withdrawMAAndBridge = async ({
|
|
|
33
33
|
const corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);
|
|
34
34
|
const bridgeTokenInfo =
|
|
35
35
|
corePeripheryTokenInfo.name === 'RUSD'
|
|
36
|
-
?
|
|
36
|
+
? getRUSDUnderlying(reyaChainId)
|
|
37
37
|
: corePeripheryTokenInfo;
|
|
38
38
|
|
|
39
39
|
const multiAction = new MultiAction();
|
|
@@ -2,13 +2,13 @@ import { ApprovalType, ApproveTokenParams } from './types';
|
|
|
2
2
|
import {
|
|
3
3
|
getERC20Allowance,
|
|
4
4
|
getERC20TokenContract,
|
|
5
|
+
getRUSDUnderlying,
|
|
5
6
|
getSocketVault,
|
|
6
7
|
GetSocketVaultParams,
|
|
7
8
|
getTokenInfoByAddress,
|
|
8
9
|
scale,
|
|
9
10
|
} from '@reyaxyz/common';
|
|
10
11
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
11
|
-
import { getTokenInfoByName } from '@reyaxyz/common';
|
|
12
12
|
|
|
13
13
|
export const approveTokenSpending = async (
|
|
14
14
|
params: ApproveTokenParams,
|
|
@@ -19,7 +19,7 @@ export const approveTokenSpending = async (
|
|
|
19
19
|
// todo: to be removed once lp form in offchain/UI is fixed
|
|
20
20
|
let tokenInfo = getTokenInfoByAddress(params.tokenAddress);
|
|
21
21
|
if (ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {
|
|
22
|
-
tokenInfo =
|
|
22
|
+
tokenInfo = getRUSDUnderlying(chainId);
|
|
23
23
|
}
|
|
24
24
|
|
|
25
25
|
const tokenContract = getERC20TokenContract(tokenInfo.address, params.signer);
|
|
@@ -2,11 +2,11 @@ import { ApprovalType, GetAllowanceParams } from './types';
|
|
|
2
2
|
import {
|
|
3
3
|
GetSocketVaultParams,
|
|
4
4
|
getERC20Allowance,
|
|
5
|
+
getRUSDUnderlying,
|
|
5
6
|
getSocketVault,
|
|
6
7
|
getTokenInfoByAddress,
|
|
7
8
|
} from '@reyaxyz/common';
|
|
8
9
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
9
|
-
import { getTokenInfoByName } from '@reyaxyz/common';
|
|
10
10
|
|
|
11
11
|
export const getAllowance = async (
|
|
12
12
|
params: GetAllowanceParams,
|
|
@@ -17,7 +17,7 @@ export const getAllowance = async (
|
|
|
17
17
|
// todo: to be removed once lp form in offchain/UI is fixed
|
|
18
18
|
let tokenInfo = getTokenInfoByAddress(params.tokenAddress);
|
|
19
19
|
if (ApprovalType.BRIDGE && tokenInfo.name === 'RUSD') {
|
|
20
|
-
tokenInfo =
|
|
20
|
+
tokenInfo = getRUSDUnderlying(chainId);
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
let contractProxyAddress;
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { GetUsdcBalanceParams } from './types';
|
|
2
2
|
import { getBalanceByTokenAddress } from './getBalanceByTokenAddress';
|
|
3
|
-
import { MoneyInOutChainId,
|
|
3
|
+
import { MoneyInOutChainId, getRUSDUnderlying } from '@reyaxyz/common';
|
|
4
4
|
|
|
5
|
+
// todo: maybe rename this to getRUSDUnderlyingAddress
|
|
5
6
|
export const getUsdcBalance = async ({
|
|
6
7
|
signer,
|
|
7
8
|
}: GetUsdcBalanceParams): Promise<number> => {
|
|
@@ -10,6 +11,6 @@ export const getUsdcBalance = async ({
|
|
|
10
11
|
|
|
11
12
|
return getBalanceByTokenAddress({
|
|
12
13
|
signer,
|
|
13
|
-
tokenAddress:
|
|
14
|
+
tokenAddress: getRUSDUnderlying(moneyInOutChainId).address,
|
|
14
15
|
});
|
|
15
16
|
};
|