@reyaxyz/sdk 0.108.2 → 0.108.3
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/README.md +1 -1
- package/dist/services/conditional-orders/grant-trade-permission/grantTradePermission.js +6 -6
- package/dist/services/conditional-orders/grant-trade-permission/grantTradePermission.js.map +1 -1
- package/dist/services/lp/transferFromMAToPool.js +7 -7
- package/dist/services/lp/transferFromMAToPool.js.map +1 -1
- package/dist/services/lp/withdrawPassivePoolAndBridge.js +8 -8
- package/dist/services/lp/withdrawPassivePoolAndBridge.js.map +1 -1
- package/dist/services/margin-accounts/account.js +6 -6
- package/dist/services/margin-accounts/account.js.map +1 -1
- package/dist/services/margin-accounts/transferMarginBetweenAccounts.js +6 -6
- package/dist/services/margin-accounts/transferMarginBetweenAccounts.js.map +1 -1
- package/dist/services/margin-accounts/withdrawMAAndBridge.js +11 -11
- package/dist/services/margin-accounts/withdrawMAAndBridge.js.map +1 -1
- package/dist/services/orders/order.js +24 -24
- package/dist/services/orders/order.js.map +1 -1
- package/dist/services/signAndBroadcastTransaction.js +19 -20
- package/dist/services/signAndBroadcastTransaction.js.map +1 -1
- package/dist/types/services/conditional-orders/grant-trade-permission/grantTradePermission.d.ts.map +1 -1
- package/dist/types/services/lp/transferFromMAToPool.d.ts.map +1 -1
- package/dist/types/services/lp/withdrawPassivePoolAndBridge.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/account.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/transferMarginBetweenAccounts.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/withdrawMAAndBridge.d.ts.map +1 -1
- package/dist/types/services/orders/order.d.ts.map +1 -1
- package/dist/types/services/signAndBroadcastTransaction.d.ts +1 -2
- package/dist/types/services/signAndBroadcastTransaction.d.ts.map +1 -1
- package/package.json +3 -3
- package/src/services/conditional-orders/grant-trade-permission/grantTradePermission.ts +1 -3
- package/src/services/lp/transferFromMAToPool.ts +1 -3
- package/src/services/lp/withdrawPassivePoolAndBridge.ts +1 -3
- package/src/services/margin-accounts/account.ts +1 -5
- package/src/services/margin-accounts/transferMarginBetweenAccounts.ts +1 -3
- package/src/services/margin-accounts/withdrawMAAndBridge.ts +1 -3
- package/src/services/orders/order.ts +2 -6
- package/src/services/signAndBroadcastTransaction.ts +27 -32
package/README.md
CHANGED
|
@@ -6,5 +6,5 @@
|
|
|
6
6
|
|
|
7
7
|
| Statements | Branches | Functions | Lines |
|
|
8
8
|
| --------------------------- | ----------------------- | ------------------------- | ----------------- |
|
|
9
|
-
|  |  |  |  |  |
|
|
10
10
|
|
|
@@ -43,20 +43,20 @@ var common_1 = require("@reyaxyz/common");
|
|
|
43
43
|
var common_2 = require("@reyaxyz/common");
|
|
44
44
|
var config_1 = require("../../../config");
|
|
45
45
|
var grantTradePermission = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
|
-
var env, chainId,
|
|
47
|
-
return __generator(this, function (
|
|
48
|
-
switch (
|
|
46
|
+
var env, chainId, data, result;
|
|
47
|
+
return __generator(this, function (_a) {
|
|
48
|
+
switch (_a.label) {
|
|
49
49
|
case 0:
|
|
50
50
|
env = (0, config_1.getSdkEnvironment)();
|
|
51
51
|
chainId = (0, common_1.getReyaNetwork)(env === 'production' ? 'production' : 'test');
|
|
52
52
|
return [4 /*yield*/, (0, encode_1.encodeGrantTradePermission)(params.signer, chainId, params.owner.coreSigNonce, params.accountId)];
|
|
53
53
|
case 1:
|
|
54
|
-
|
|
55
|
-
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(
|
|
54
|
+
data = (_a.sent()).calldata;
|
|
55
|
+
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, chainId, common_2.ContractType.CORE_PROXY, {
|
|
56
56
|
accountId: params.accountId,
|
|
57
57
|
})];
|
|
58
58
|
case 2:
|
|
59
|
-
result =
|
|
59
|
+
result = _a.sent();
|
|
60
60
|
return [2 /*return*/, {
|
|
61
61
|
transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
|
|
62
62
|
coreSigNonce: Number(result === null || result === void 0 ? void 0 : result.coreSigNonce) || null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grantTradePermission.js","sourceRoot":"/","sources":["services/conditional-orders/grant-trade-permission/grantTradePermission.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,mCAAsD;AACtD,iFAAgF;AAChF,0CAAiD;AACjD,0CAA+C;AAC/C,0CAAoD;AAE7C,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;gBAE5B,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"grantTradePermission.js","sourceRoot":"/","sources":["services/conditional-orders/grant-trade-permission/grantTradePermission.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,mCAAsD;AACtD,iFAAgF;AAChF,0CAAiD;AACjD,0CAA+C;AAC/C,0CAAoD;AAE7C,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;gBAE5B,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAElD,qBAAM,IAAA,mCAA0B,EACzD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,SAAS,CACjB,EAAA;;gBALiB,IAAI,GAAK,CAAA,SAK1B,CAAA,SALqB;gBAOP,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,UAAU,EACvB;wBACE,SAAS,EAAE,MAAM,CAAC,SAAS;qBAC5B,CACF,EAAA;;gBAPK,MAAM,GAAG,SAOd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AA1BW,QAAA,oBAAoB,wBA0B/B","sourcesContent":["import {\n GrantTradePermissionParams,\n GrantTradePermissionResult,\n} from './types';\nimport { encodeGrantTradePermission } from './encode';\nimport { signAndBroadcastTransaction } from '../../signAndBroadcastTransaction';\nimport { getReyaNetwork } from '@reyaxyz/common';\nimport { ContractType } from '@reyaxyz/common';\nimport { getSdkEnvironment } from '../../../config';\n\nexport const grantTradePermission = async (\n params: GrantTradePermissionParams,\n): Promise<GrantTradePermissionResult> => {\n const env = getSdkEnvironment();\n const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n\n const { calldata: data } = await encodeGrantTradePermission(\n params.signer,\n chainId,\n params.owner.coreSigNonce,\n params.accountId,\n );\n\n const result = await signAndBroadcastTransaction(\n data,\n chainId,\n ContractType.CORE_PROXY,\n {\n accountId: params.accountId,\n },\n );\n\n return {\n transactionHash: result?.txHash || null,\n coreSigNonce: Number(result?.coreSigNonce) || null,\n };\n};\n"]}
|
|
@@ -48,9 +48,9 @@ var ethers_1 = require("ethers");
|
|
|
48
48
|
var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
|
|
49
49
|
var config_1 = require("../../config");
|
|
50
50
|
var transferFromMAToPool = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
51
|
-
var env, reyaChainId, tokenInfo, amount, minShares, multiAction, eip712Signature,
|
|
52
|
-
return __generator(this, function (
|
|
53
|
-
switch (
|
|
51
|
+
var env, reyaChainId, tokenInfo, amount, minShares, multiAction, eip712Signature, data, result;
|
|
52
|
+
return __generator(this, function (_a) {
|
|
53
|
+
switch (_a.label) {
|
|
54
54
|
case 0:
|
|
55
55
|
env = (0, config_1.getSdkEnvironment)();
|
|
56
56
|
reyaChainId = (0, common_1.getReyaNetwork)(env === 'production' ? 'production' : 'test');
|
|
@@ -61,11 +61,11 @@ var transferFromMAToPool = function (params) { return __awaiter(void 0, void 0,
|
|
|
61
61
|
(0, encode_2.encodeSingleWithdraw)(params.pool.tokenAddress, amount, multiAction);
|
|
62
62
|
return [4 /*yield*/, (0, common_3.signCoreCommands)(params.signer, reyaChainId, (0, common_2.getAddress)(reyaChainId, common_2.ContractType.PERIPHERY_PROXY), params.marginAccountId, multiAction.commands, params.owner.coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_4.BRIDGE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['uint128', 'address', 'uint256'], [params.pool.id, params.owner.address, minShares]))];
|
|
63
63
|
case 1:
|
|
64
|
-
eip712Signature =
|
|
65
|
-
|
|
66
|
-
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(
|
|
64
|
+
eip712Signature = _a.sent();
|
|
65
|
+
data = (0, encode_1.encodeTransferFromMAToPool)(params.marginAccountId, amount, eip712Signature, params.pool.id, minShares, params.owner.address).calldata;
|
|
66
|
+
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, reyaChainId, common_2.ContractType.PERIPHERY_PROXY, {})];
|
|
67
67
|
case 2:
|
|
68
|
-
result =
|
|
68
|
+
result = _a.sent();
|
|
69
69
|
return [2 /*return*/, {
|
|
70
70
|
transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
|
|
71
71
|
coreSigNonce: Number(result === null || result === void 0 ? void 0 : result.coreSigNonce) || null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,0CAA2D;AAC3D,0CAAmD;AACnD,mCAAsD;AAKtD,0CAA6D;AAC7D,0CAA8C;AAC9C,oCAAiD;AACjD,iCAAgC;AAChC,8EAA6E;AAC7E,uCAAiD;AAE1C,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;gBAE5B,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,WAAW,GAAG,IAAA,uBAAc,EAChC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAC7C,CAAC;gBAEI,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC5D,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAGtB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,IAAA,6BAAoB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBAC5C,qBAAM,IAAA,yBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,WAAW,EACX,IAAA,mBAAU,EAAC,WAAW,EAAE,qBAAY,CAAC,eAAe,CAAC,EACrD,MAAM,CAAC,eAAe,EACtB,WAAW,CAAC,QAAQ,EACpB,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAC7B,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,EAC3D,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EACjC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAClD,CACF,EAAA;;gBAZK,eAAe,GAAG,SAYvB;
|
|
1
|
+
{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,0CAA2D;AAC3D,0CAAmD;AACnD,mCAAsD;AAKtD,0CAA6D;AAC7D,0CAA8C;AAC9C,oCAAiD;AACjD,iCAAgC;AAChC,8EAA6E;AAC7E,uCAAiD;AAE1C,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;gBAE5B,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,WAAW,GAAG,IAAA,uBAAc,EAChC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAC7C,CAAC;gBAEI,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC5D,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAGtB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,IAAA,6BAAoB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBAC5C,qBAAM,IAAA,yBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,WAAW,EACX,IAAA,mBAAU,EAAC,WAAW,EAAE,qBAAY,CAAC,eAAe,CAAC,EACrD,MAAM,CAAC,eAAe,EACtB,WAAW,CAAC,QAAQ,EACpB,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAC7B,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,EAC3D,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EACjC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,SAAS,CAAC,CAClD,CACF,EAAA;;gBAZK,eAAe,GAAG,SAYvB;gBAEiB,IAAI,GAAK,IAAA,mCAA0B,EACnD,MAAM,CAAC,eAAe,EACtB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,SAAS,EACT,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,SAPqB,CAOpB;gBAEa,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,WAAW,EACX,qBAAY,CAAC,eAAe,EAC5B,EAAE,CACH,EAAA;;gBALK,MAAM,GAAG,SAKd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AAlDW,QAAA,oBAAoB,wBAkD/B","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n scale,\n getTokenInfoByAddress,\n getReyaNetwork,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '@reyaxyz/common';\nimport { signCoreCommands } from '@reyaxyz/common';\nimport { encodeTransferFromMAToPool } from './encode';\nimport {\n TransferFromMAToPoolParams,\n TransferFromMAToPoolResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '@reyaxyz/common';\nimport { MultiAction } from '@reyaxyz/common';\nimport { encodeSingleWithdraw } from '../encode';\nimport { ethers } from 'ethers';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { getSdkEnvironment } from '../../config';\n\nexport const transferFromMAToPool = async (\n params: TransferFromMAToPoolParams,\n): Promise<TransferFromMAToPoolResult> => {\n const env = getSdkEnvironment();\n const reyaChainId = getReyaNetwork(\n env === 'production' ? 'production' : 'test',\n );\n\n const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);\n const amount = scale(tokenInfo.decimals)(params.amount);\n\n const minShares = BigInt(0);\n\n // transfer from MA to pool involves a core withdrawal\n const multiAction = new MultiAction();\n encodeSingleWithdraw(params.pool.tokenAddress, amount, multiAction);\n const eip712Signature = await signCoreCommands(\n params.signer,\n reyaChainId,\n getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n params.marginAccountId,\n multiAction.commands,\n params.owner.coreSigNonce + 1,\n getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n ethers.AbiCoder.defaultAbiCoder().encode(\n ['uint128', 'address', 'uint256'],\n [params.pool.id, params.owner.address, minShares],\n ),\n );\n\n const { calldata: data } = encodeTransferFromMAToPool(\n params.marginAccountId,\n amount,\n eip712Signature,\n params.pool.id,\n minShares,\n params.owner.address,\n );\n\n const result = await signAndBroadcastTransaction(\n data,\n reyaChainId,\n ContractType.PERIPHERY_PROXY,\n {},\n );\n\n return {\n transactionHash: result?.txHash || null,\n coreSigNonce: Number(result?.coreSigNonce) || null,\n };\n};\n"]}
|
|
@@ -41,9 +41,9 @@ var encode_1 = require("./encode");
|
|
|
41
41
|
var common_1 = require("@reyaxyz/common");
|
|
42
42
|
var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
|
|
43
43
|
var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
44
|
-
var reyaChainId, sharesAmount, eip712Signature,
|
|
45
|
-
return __generator(this, function (
|
|
46
|
-
switch (
|
|
44
|
+
var reyaChainId, sharesAmount, eip712Signature, data, result;
|
|
45
|
+
return __generator(this, function (_a) {
|
|
46
|
+
switch (_a.label) {
|
|
47
47
|
case 0:
|
|
48
48
|
reyaChainId = (0, common_1.getReyaNetworkFromMoneyInOutChainId)(params.moneyInOutChainId);
|
|
49
49
|
if (params.withdrawMax) {
|
|
@@ -55,14 +55,14 @@ var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0,
|
|
|
55
55
|
return [4 /*yield*/, (0, common_1.signPoolRemoveLiquidity)(params.signer, reyaChainId, (0, common_1.getAddress)(reyaChainId, common_1.ContractType.PERIPHERY_PROXY), params.owner.address, params.pool.id, sharesAmount, BigInt(0), params.owner.poolSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_1.BRIDGE_DEADLINE_IN_SECONDS, BigInt('10000000'), //todo
|
|
56
56
|
params.moneyInOutChainId, params.owner.address)];
|
|
57
57
|
case 1:
|
|
58
|
-
eip712Signature =
|
|
59
|
-
|
|
60
|
-
params.moneyInOutChainId, params.owner.address)
|
|
61
|
-
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(
|
|
58
|
+
eip712Signature = _a.sent();
|
|
59
|
+
data = (0, encode_1.encodeWithdrawPassivePoolAndBridge)(params.owner.address, params.pool.id, sharesAmount, BigInt(0), eip712Signature, BigInt('10000000'), //todo
|
|
60
|
+
params.moneyInOutChainId, params.owner.address).calldata;
|
|
61
|
+
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, reyaChainId, common_1.ContractType.PERIPHERY_PROXY, {
|
|
62
62
|
destinationType: 'pool',
|
|
63
63
|
})];
|
|
64
64
|
case 2:
|
|
65
|
-
result =
|
|
65
|
+
result = _a.sent();
|
|
66
66
|
return [2 /*return*/, {
|
|
67
67
|
transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
|
|
68
68
|
poolSigNonce: Number(result === null || result === void 0 ? void 0 : result.poolSigNonce) || null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,mCAA8D;AAC9D,0CAQyB;AACzB,8EAA6E;AAEtE,IAAM,4BAA4B,GAAG,UAC1C,MAA0C;;;;;gBAEpC,WAAW,GAAG,IAAA,4CAAmC,EACrD,MAAM,CAAC,iBAAiB,CACzB,CAAC;gBAGF,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,gCAAuB,EACnD,MAAM,CAAC,MAAM,EACb,WAAW,EACX,IAAA,mBAAU,EAAC,WAAW,EAAE,qBAAY,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,EAC3D,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM;oBAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,EAAA;;gBAbK,eAAe,GAAG,SAavB;
|
|
1
|
+
{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,mCAA8D;AAC9D,0CAQyB;AACzB,8EAA6E;AAEtE,IAAM,4BAA4B,GAAG,UAC1C,MAA0C;;;;;gBAEpC,WAAW,GAAG,IAAA,4CAAmC,EACrD,MAAM,CAAC,iBAAiB,CACzB,CAAC;gBAGF,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,gCAAuB,EACnD,MAAM,CAAC,MAAM,EACb,WAAW,EACX,IAAA,mBAAU,EAAC,WAAW,EAAE,qBAAY,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,EAC3D,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM;oBAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,EAAA;;gBAbK,eAAe,GAAG,SAavB;gBAEiB,IAAI,GAAK,IAAA,2CAAkC,EAC3D,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,iBAAiB,EACxB,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,SATqB,CASpB;gBAEa,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,WAAW,EACX,qBAAY,CAAC,eAAe,EAC5B;wBACE,eAAe,EAAE,MAAM;qBACxB,CACF,EAAA;;gBAPK,MAAM,GAAG,SAOd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AArDW,QAAA,4BAA4B,gCAqDvC","sourcesContent":["import {\n WithdrawPassivePoolAndBridgeParams,\n WithdrawPassivePoolAndBridgeResult,\n} from './types';\nimport { encodeWithdrawPassivePoolAndBridge } from './encode';\nimport {\n getCurrentTimestampInSeconds,\n scale,\n signPoolRemoveLiquidity,\n ContractType,\n getAddress,\n BRIDGE_DEADLINE_IN_SECONDS,\n getReyaNetworkFromMoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\n\nexport const withdrawPassivePoolAndBridge = async (\n params: WithdrawPassivePoolAndBridgeParams,\n): Promise<WithdrawPassivePoolAndBridgeResult> => {\n const reyaChainId = getReyaNetworkFromMoneyInOutChainId(\n params.moneyInOutChainId,\n );\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 BigInt('10000000'), //todo\n params.moneyInOutChainId,\n params.owner.address,\n );\n\n const { calldata: data } = encodeWithdrawPassivePoolAndBridge(\n params.owner.address,\n params.pool.id,\n sharesAmount,\n BigInt(0),\n eip712Signature,\n BigInt('10000000'), //todo\n params.moneyInOutChainId,\n params.owner.address,\n );\n\n const result = await signAndBroadcastTransaction(\n data,\n reyaChainId,\n ContractType.PERIPHERY_PROXY,\n {\n destinationType: 'pool',\n },\n );\n\n return {\n transactionHash: result?.txHash || null,\n poolSigNonce: Number(result?.poolSigNonce) || null,\n };\n};\n"]}
|
|
@@ -43,16 +43,16 @@ var common_1 = require("@reyaxyz/common");
|
|
|
43
43
|
var config_1 = require("../../config");
|
|
44
44
|
var common_2 = require("@reyaxyz/common");
|
|
45
45
|
var createAccount = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
|
-
var
|
|
47
|
-
return __generator(this, function (
|
|
48
|
-
switch (
|
|
46
|
+
var data, env, chainId, result;
|
|
47
|
+
return __generator(this, function (_a) {
|
|
48
|
+
switch (_a.label) {
|
|
49
49
|
case 0:
|
|
50
|
-
|
|
50
|
+
data = (0, encode_1.encodeCreateAccountCall)(params.ownerAddress).calldata;
|
|
51
51
|
env = (0, config_1.getSdkEnvironment)();
|
|
52
52
|
chainId = (0, common_2.getReyaNetwork)(env === 'production' ? 'production' : 'test');
|
|
53
|
-
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(
|
|
53
|
+
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, chainId, common_1.ContractType.CORE_PROXY, { accountName: params.name })];
|
|
54
54
|
case 1:
|
|
55
|
-
result =
|
|
55
|
+
result = _a.sent();
|
|
56
56
|
return [2 /*return*/, {
|
|
57
57
|
transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
|
|
58
58
|
coreSigNonce: Number(result === null || result === void 0 ? void 0 : result.coreSigNonce) || null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAA6E;AAC7E,mCAAmD;AAEnD,0CAA+C;AAC/C,uCAAiD;AACjD,0CAAiD;AAE1C,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;;
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8EAA6E;AAC7E,mCAAmD;AAEnD,0CAA+C;AAC/C,uCAAiD;AACjD,0CAAiD;AAE1C,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;;gBAET,IAAI,GAAK,IAAA,gCAAuB,EAAC,MAAM,CAAC,YAAY,CAAC,SAAjD,CAAkD;gBAClE,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAE9D,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,UAAU,EACvB,EAAE,WAAW,EAAE,MAAM,CAAC,IAAI,EAAE,CAC7B,EAAA;;gBALK,MAAM,GAAG,SAKd;gBACD,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;wBAClD,SAAS,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,SAAS,CAAC;qBACrC,EAAC;;;KACH,CAAC;AAlBW,QAAA,aAAa,iBAkBxB","sourcesContent":["import { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeCreateAccountCall } from './encode';\nimport { CreateAccountParams, CreateAccountResult } from './types';\nimport { ContractType } from '@reyaxyz/common';\nimport { getSdkEnvironment } from '../../config';\nimport { getReyaNetwork } from '@reyaxyz/common';\n\nexport const createAccount = async (\n params: CreateAccountParams,\n): Promise<CreateAccountResult> => {\n const { calldata: data } = encodeCreateAccountCall(params.ownerAddress);\n const env = getSdkEnvironment();\n const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n\n const result = await signAndBroadcastTransaction(\n data,\n chainId,\n ContractType.CORE_PROXY,\n { accountName: params.name },\n );\n return {\n transactionHash: result?.txHash || null,\n coreSigNonce: Number(result?.coreSigNonce) || null,\n accountId: Number(result?.accountId),\n };\n};\n"]}
|
|
@@ -43,9 +43,9 @@ var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
|
|
|
43
43
|
var encode_1 = require("./encode");
|
|
44
44
|
var config_1 = require("../../config");
|
|
45
45
|
var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
46
|
-
var tokenInfo, amount, env, chainId,
|
|
47
|
-
return __generator(this, function (
|
|
48
|
-
switch (
|
|
46
|
+
var tokenInfo, amount, env, chainId, data, result;
|
|
47
|
+
return __generator(this, function (_a) {
|
|
48
|
+
switch (_a.label) {
|
|
49
49
|
case 0:
|
|
50
50
|
tokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress);
|
|
51
51
|
amount = (0, common_1.scale)(tokenInfo.decimals)(params.amount);
|
|
@@ -53,10 +53,10 @@ var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0,
|
|
|
53
53
|
chainId = (0, common_1.getReyaNetwork)(env === 'production' ? 'production' : 'test');
|
|
54
54
|
return [4 /*yield*/, (0, encode_1.encodeTransferMargin)(params.signer, chainId, params.owner.coreSigNonce, params.fromMarginAccountId, params.toMarginAccountId, params.tokenAddress, amount)];
|
|
55
55
|
case 1:
|
|
56
|
-
|
|
57
|
-
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(
|
|
56
|
+
data = (_a.sent()).calldata;
|
|
57
|
+
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, chainId, common_2.ContractType.PERIPHERY_PROXY, {})];
|
|
58
58
|
case 2:
|
|
59
|
-
result =
|
|
59
|
+
result = _a.sent();
|
|
60
60
|
return [2 /*return*/, {
|
|
61
61
|
transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
|
|
62
62
|
coreSigNonce: Number(result === null || result === void 0 ? void 0 : result.coreSigNonce) || null,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+E;AAC/E,0CAA+C;AAC/C,8EAA6E;AAC7E,mCAAgD;AAKhD,uCAAiD;AAE1C,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;gBAErC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+E;AAC/E,0CAA+C;AAC/C,8EAA6E;AAC7E,mCAAgD;AAKhD,uCAAiD;AAE1C,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;gBAErC,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAElD,qBAAM,IAAA,6BAAoB,EACnD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAAA;;gBARiB,IAAI,GAAK,CAAA,SAQ1B,CAAA,SARqB;gBAUP,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,eAAe,EAC5B,EAAE,CACH,EAAA;;gBALK,MAAM,GAAG,SAKd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AA9BW,QAAA,6BAA6B,iCA8BxC","sourcesContent":["import { scale, getTokenInfoByAddress, getReyaNetwork } from '@reyaxyz/common';\nimport { ContractType } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeTransferMargin } from './encode';\nimport {\n TransferMarginBetweenAccountsParams,\n TransferMarginBetweenAccountsResult,\n} from './types';\nimport { getSdkEnvironment } from '../../config';\n\nexport const transferMarginBetweenAccounts = async (\n params: TransferMarginBetweenAccountsParams,\n): Promise<TransferMarginBetweenAccountsResult> => {\n const tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n const amount = scale(tokenInfo.decimals)(params.amount);\n\n const env = getSdkEnvironment();\n const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n\n const { calldata: data } = await encodeTransferMargin(\n params.signer,\n chainId,\n params.owner.coreSigNonce,\n params.fromMarginAccountId,\n params.toMarginAccountId,\n params.tokenAddress,\n amount,\n );\n\n const result = await signAndBroadcastTransaction(\n data,\n chainId,\n ContractType.PERIPHERY_PROXY,\n {},\n );\n\n return {\n transactionHash: result?.txHash || null,\n coreSigNonce: Number(result?.coreSigNonce) || null,\n };\n};\n"]}
|
|
@@ -50,9 +50,9 @@ var config_1 = require("../../config");
|
|
|
50
50
|
var withdrawMAAndBridge = function (_a) {
|
|
51
51
|
var signer = _a.signer, moneyInOutChainId = _a.moneyInOutChainId, marginAccountId = _a.marginAccountId, owner = _a.owner, unscaledAmount = _a.amount, tokenAddress = _a.tokenAddress, _b = _a.receiverAddress, receiverAddress = _b === void 0 ? owner.address : _b;
|
|
52
52
|
return __awaiter(void 0, void 0, void 0, function () {
|
|
53
|
-
var env, reyaChainId, corePeripheryTokenInfo, multiAction, socketMsgGasLimit, eip712Signature,
|
|
54
|
-
return __generator(this, function (
|
|
55
|
-
switch (
|
|
53
|
+
var env, reyaChainId, corePeripheryTokenInfo, multiAction, socketMsgGasLimit, eip712Signature, data, result, transactionModuleClient, error_1;
|
|
54
|
+
return __generator(this, function (_c) {
|
|
55
|
+
switch (_c.label) {
|
|
56
56
|
case 0:
|
|
57
57
|
env = (0, config_1.getSdkEnvironment)();
|
|
58
58
|
reyaChainId = (0, common_1.getReyaNetwork)(env === 'production' ? 'production' : 'test');
|
|
@@ -62,29 +62,29 @@ var withdrawMAAndBridge = function (_a) {
|
|
|
62
62
|
socketMsgGasLimit = BigInt('10000000');
|
|
63
63
|
return [4 /*yield*/, (0, common_3.signCoreCommands)(signer, reyaChainId, (0, common_2.getAddress)(reyaChainId, common_2.ContractType.PERIPHERY_PROXY), marginAccountId, multiAction.commands, owner.coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_4.BRIDGE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'uint256'], [receiverAddress, moneyInOutChainId, socketMsgGasLimit]))];
|
|
64
64
|
case 1:
|
|
65
|
-
eip712Signature =
|
|
66
|
-
|
|
67
|
-
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(
|
|
65
|
+
eip712Signature = _c.sent();
|
|
66
|
+
data = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, socketMsgGasLimit, moneyInOutChainId, receiverAddress).calldata;
|
|
67
|
+
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, reyaChainId, common_2.ContractType.PERIPHERY_PROXY, {
|
|
68
68
|
destinationType: 'account',
|
|
69
69
|
})];
|
|
70
70
|
case 2:
|
|
71
|
-
result =
|
|
71
|
+
result = _c.sent();
|
|
72
72
|
if (!(result === null || result === void 0 ? void 0 : result.txHash)) {
|
|
73
73
|
return [2 /*return*/, {
|
|
74
74
|
transactionHash: null,
|
|
75
75
|
coreSigNonce: null,
|
|
76
76
|
}];
|
|
77
77
|
}
|
|
78
|
-
|
|
78
|
+
_c.label = 3;
|
|
79
79
|
case 3:
|
|
80
|
-
|
|
80
|
+
_c.trys.push([3, 5, , 6]);
|
|
81
81
|
transactionModuleClient = (0, config_1.getTransactionModuleClient)();
|
|
82
82
|
return [4 /*yield*/, transactionModuleClient.pushPendingTransaction(marginAccountId, result.txHash, moneyInOutChainId, unscaledAmount, corePeripheryTokenInfo.address, 'withdrawal')];
|
|
83
83
|
case 4:
|
|
84
|
-
|
|
84
|
+
_c.sent();
|
|
85
85
|
return [3 /*break*/, 6];
|
|
86
86
|
case 5:
|
|
87
|
-
error_1 =
|
|
87
|
+
error_1 = _c.sent();
|
|
88
88
|
console.log('Error persisting pending withdraw transaction', error_1);
|
|
89
89
|
return [3 /*break*/, 6];
|
|
90
90
|
case 6: return [2 /*return*/, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,0CAA2D;AAC3D,8EAA6E;AAC7E,0CAAmD;AACnD,mCAAqD;AAKrD,0CAA6D;AAC7D,oCAAiD;AACjD,0CAA8C;AAC9C,iCAAgC;AAChC,uCAA6E;AAEtE,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;;;;;;oBAEzB,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;oBAC1B,WAAW,GAAG,IAAA,uBAAc,EAChC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAC7C,CAAC;oBAEI,sBAAsB,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBAE7D,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;oBAEI,iBAAiB,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;oBACrB,qBAAM,IAAA,yBAAgB,EAC5C,MAAM,EACN,WAAW,EACX,IAAA,mBAAU,EAAC,WAAW,EAAE,qBAAY,CAAC,eAAe,CAAC,EACrD,eAAe,EACf,WAAW,CAAC,QAAQ,EACpB,KAAK,CAAC,YAAY,GAAG,CAAC,EACtB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,EAC3D,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EACjC,CAAC,eAAe,EAAE,iBAAiB,EAAE,iBAAiB,CAAC,CACxD,CACF,EAAA;;oBAZK,eAAe,GAAG,SAYvB;
|
|
1
|
+
{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n scale,\n getTokenInfoByAddress,\n getReyaNetwork,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { signCoreCommands } from '@reyaxyz/common';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n WithdrawMAAndBridgeParams,\n WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '@reyaxyz/common';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '@reyaxyz/common';\nimport { ethers } from 'ethers';\nimport { getSdkEnvironment, getTransactionModuleClient } from '../../config';\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 env = getSdkEnvironment();\n const reyaChainId = getReyaNetwork(\n env === 'production' ? 'production' : 'test',\n );\n\n const corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n\n const multiAction = new MultiAction();\n encodeSingleWithdraw(\n corePeripheryTokenInfo.address,\n scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n multiAction,\n );\n\n const socketMsgGasLimit = BigInt('10000000');\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 ethers.AbiCoder.defaultAbiCoder().encode(\n ['address', 'uint256', 'uint256'],\n [receiverAddress, moneyInOutChainId, socketMsgGasLimit],\n ),\n );\n\n const { calldata: data } = encodeWithdrawMAAndBridge(\n marginAccountId,\n corePeripheryTokenInfo.address,\n scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n eip712Signature,\n socketMsgGasLimit,\n moneyInOutChainId,\n receiverAddress,\n );\n\n const result = await signAndBroadcastTransaction(\n data,\n reyaChainId,\n ContractType.PERIPHERY_PROXY,\n {\n destinationType: 'account',\n },\n );\n\n if (!result?.txHash) {\n return {\n transactionHash: null,\n coreSigNonce: null,\n };\n }\n\n try {\n const transactionModuleClient = getTransactionModuleClient();\n await transactionModuleClient.pushPendingTransaction(\n marginAccountId,\n result.txHash,\n moneyInOutChainId,\n unscaledAmount,\n corePeripheryTokenInfo.address,\n 'withdrawal',\n );\n } catch (error) {\n console.log('Error persisting pending withdraw transaction', error);\n }\n\n return {\n transactionHash: result?.txHash || null,\n coreSigNonce: Number(result?.coreSigNonce) || null,\n };\n};\n"]}
|
|
@@ -48,10 +48,10 @@ var common_2 = require("@reyaxyz/common");
|
|
|
48
48
|
var common_3 = require("@reyaxyz/common");
|
|
49
49
|
var config_1 = require("../../config");
|
|
50
50
|
var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
51
|
-
var snappedAmount, orderPriceLimit, orderBase, env, chainId,
|
|
52
|
-
var _b, _c, _d, _e
|
|
53
|
-
return __generator(this, function (
|
|
54
|
-
switch (
|
|
51
|
+
var snappedAmount, orderPriceLimit, orderBase, env, chainId, data, result;
|
|
52
|
+
var _a, _b, _c, _d, _e;
|
|
53
|
+
return __generator(this, function (_f) {
|
|
54
|
+
switch (_f.label) {
|
|
55
55
|
case 0:
|
|
56
56
|
if (params.amountInBase === 0) {
|
|
57
57
|
throw new Error('Position base can not be 0');
|
|
@@ -75,33 +75,33 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
|
|
|
75
75
|
chainId = (0, common_1.getReyaNetwork)(env === 'production' ? 'production' : 'test');
|
|
76
76
|
return [4 /*yield*/, (0, encode_1.encodeMatchOrder)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, orderBase, orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId)];
|
|
77
77
|
case 1:
|
|
78
|
-
|
|
79
|
-
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(
|
|
78
|
+
data = (_f.sent()).calldata;
|
|
79
|
+
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, chainId, common_2.ContractType.PERIPHERY_PROXY, {
|
|
80
80
|
action: 'matchOrder',
|
|
81
81
|
accountId: params.marginAccountId,
|
|
82
82
|
marketId: params.market.id,
|
|
83
83
|
})];
|
|
84
84
|
case 2:
|
|
85
|
-
result =
|
|
85
|
+
result = _f.sent();
|
|
86
86
|
return [2 /*return*/, {
|
|
87
87
|
transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
|
|
88
88
|
coreSigNonce: Number(result === null || result === void 0 ? void 0 : result.coreSigNonce) || null,
|
|
89
|
-
xpBoost: ((
|
|
90
|
-
isNftWon: ((
|
|
89
|
+
xpBoost: ((_a = result.miscellaneous) === null || _a === void 0 ? void 0 : _a.tradeXpBoost) || 0,
|
|
90
|
+
isNftWon: ((_b = result.miscellaneous) === null || _b === void 0 ? void 0 : _b.xpNftAwarded) || false,
|
|
91
91
|
marginAccountId: params.marginAccountId,
|
|
92
|
-
xpEarned: ((
|
|
93
|
-
executionPrice: ((
|
|
94
|
-
base: ((
|
|
92
|
+
xpEarned: ((_c = result.miscellaneous) === null || _c === void 0 ? void 0 : _c.xpEarned) || 0,
|
|
93
|
+
executionPrice: ((_d = result.tradeDetails) === null || _d === void 0 ? void 0 : _d.executionPrice) || 0,
|
|
94
|
+
base: ((_e = result.tradeDetails) === null || _e === void 0 ? void 0 : _e.base) || 0,
|
|
95
95
|
}];
|
|
96
96
|
}
|
|
97
97
|
});
|
|
98
98
|
}); };
|
|
99
99
|
exports.matchOrder = matchOrder;
|
|
100
100
|
var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
|
|
101
|
-
var base, orderPriceLimit, env, chainId,
|
|
102
|
-
var _b, _c, _d, _e
|
|
103
|
-
return __generator(this, function (
|
|
104
|
-
switch (
|
|
101
|
+
var base, orderPriceLimit, env, chainId, data, result;
|
|
102
|
+
var _a, _b, _c, _d, _e;
|
|
103
|
+
return __generator(this, function (_f) {
|
|
104
|
+
switch (_f.label) {
|
|
105
105
|
case 0:
|
|
106
106
|
if (params.orderBase === 0) {
|
|
107
107
|
throw new Error('Position base can not be 0');
|
|
@@ -112,23 +112,23 @@ var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
|
|
|
112
112
|
chainId = (0, common_1.getReyaNetwork)(env === 'production' ? 'production' : 'test');
|
|
113
113
|
return [4 /*yield*/, (0, encode_1.encodeMatchOrder)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, -base, orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId)];
|
|
114
114
|
case 1:
|
|
115
|
-
|
|
116
|
-
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(
|
|
115
|
+
data = (_f.sent()).calldata;
|
|
116
|
+
return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, chainId, common_2.ContractType.PERIPHERY_PROXY, {
|
|
117
117
|
action: 'closeOrder',
|
|
118
118
|
accountId: params.marginAccountId,
|
|
119
119
|
marketId: params.market.id,
|
|
120
120
|
})];
|
|
121
121
|
case 2:
|
|
122
|
-
result =
|
|
122
|
+
result = _f.sent();
|
|
123
123
|
return [2 /*return*/, {
|
|
124
124
|
transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
|
|
125
125
|
coreSigNonce: Number(result === null || result === void 0 ? void 0 : result.coreSigNonce) || null,
|
|
126
|
-
xpBoost: ((
|
|
127
|
-
isNftWon: ((
|
|
126
|
+
xpBoost: ((_a = result.miscellaneous) === null || _a === void 0 ? void 0 : _a.tradeXpBoost) || 0,
|
|
127
|
+
isNftWon: ((_b = result.miscellaneous) === null || _b === void 0 ? void 0 : _b.xpNftAwarded) || false,
|
|
128
128
|
marginAccountId: params.marginAccountId,
|
|
129
|
-
xpEarned: ((
|
|
130
|
-
executionPrice: ((
|
|
131
|
-
base: ((
|
|
129
|
+
xpEarned: ((_c = result.miscellaneous) === null || _c === void 0 ? void 0 : _c.xpEarned) || 0,
|
|
130
|
+
executionPrice: ((_d = result.tradeDetails) === null || _d === void 0 ? void 0 : _d.executionPrice) || 0,
|
|
131
|
+
base: ((_e = result.tradeDetails) === null || _e === void 0 ? void 0 : _e.base) || 0,
|
|
132
132
|
}];
|
|
133
133
|
}
|
|
134
134
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,mCAA4C;AAC5C,8EAA6E;AAC7E,0CAA8E;AAC9E,8DAAqC;AACrC,0CAA+C;AAC/C,0CAAwC;AACxC,uCAAiD;AAE1C,IAAM,UAAU,GAAG,UACxB,MAAwB;;;;;;gBAExB,IAAI,MAAM,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBAEG,aAAa,GAAG,IAAA,sBAAS,EAAC,MAAM,CAAC,YAAY,CAAC;qBAC/C,GAAG,EAAE;qBACL,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;qBACpC,YAAY,CAAC,sBAAS,CAAC,WAAW,CAAC;qBACnC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC;qBACvC,QAAQ,EAAE,CAAC;gBAEd,IAAI,MAAM,CAAC,YAAY,GAAG,CAAC,EAAE,CAAC;oBAC5B,aAAa,GAAG,CAAC,aAAa,CAAC;gBACjC,CAAC;gBAED,IAAI,IAAI,CAAC,GAAG,CAAC,aAAa,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,CAAC;oBAC7D,OAAO,CAAC,KAAK,CACX,+BAAwB,MAAM,CAAC,MAAM,CAAC,gBAAgB,8BAAoB,aAAa,eAAK,MAAM,CAAC,YAAY,CAAE,CAClH,CAAC;oBACF,MAAM,IAAI,KAAK,CAAC,+BAAwB,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAE,CAAC,CAAC;gBAC5E,CAAC;gBAGK,eAAe,GAAG,IAAA,oCAA2B,EACjD,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1B,aAAa,CACd,CAAC;gBAEI,SAAS,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC;gBACrC,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n CloseOrderParams,\n CloseOrderResult,\n MatchOrderParams,\n MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { calculatePriceLimitForTrade, getReyaNetwork } from '@reyaxyz/common';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '@reyaxyz/common';\nimport { scale } from '@reyaxyz/common';\nimport { getSdkEnvironment } from '../../config';\n\nexport const matchOrder = async (\n params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n if (params.amountInBase === 0) {\n throw new Error('Position base can not be 0');\n }\n\n let snappedAmount = BigNumber(params.amountInBase)\n .abs()\n .dividedBy(params.market.baseSpacing)\n .integerValue(BigNumber.ROUND_FLOOR)\n .multipliedBy(params.market.baseSpacing)\n .toNumber();\n\n if (params.amountInBase < 0) {\n snappedAmount = -snappedAmount;\n }\n\n if (Math.abs(snappedAmount) < params.market.minOrderSizeBase) {\n console.error(\n `Minimum trade amount ${params.market.minOrderSizeBase}. Entered amount ${snappedAmount}, ${params.amountInBase}`,\n );\n throw new Error(`Minimum trade amount ${params.market.minOrderSizeBase}`);\n }\n\n // add rounding here\n const orderPriceLimit = calculatePriceLimitForTrade(\n params.market.currentPrice,\n snappedAmount,\n );\n\n const orderBase = scale(18)(snappedAmount);\n const env = getSdkEnvironment();\n const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n\n const { calldata: data } = await encodeMatchOrder(\n params.signer,\n chainId,\n params.owner.coreSigNonce,\n params.marginAccountId,\n orderBase,\n orderPriceLimit,\n params.market.counterpartyAccountIds,\n params.market.id,\n params.market.exchangeId,\n );\n\n const result = await signAndBroadcastTransaction(\n data,\n chainId,\n ContractType.PERIPHERY_PROXY,\n {\n action: 'matchOrder',\n accountId: params.marginAccountId,\n marketId: params.market.id,\n },\n );\n\n return {\n transactionHash: result?.txHash || null,\n coreSigNonce: Number(result?.coreSigNonce) || null,\n xpBoost: result.miscellaneous?.tradeXpBoost || 0,\n isNftWon: result.miscellaneous?.xpNftAwarded || false,\n marginAccountId: params.marginAccountId,\n xpEarned: result.miscellaneous?.xpEarned || 0,\n executionPrice: result.tradeDetails?.executionPrice || 0,\n base: result.tradeDetails?.base || 0,\n };\n};\n\nexport const closeOrder = async (\n params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n if (params.orderBase === 0) {\n throw new Error('Position base can not be 0');\n }\n\n const base = scale(18)(params.orderBase);\n const orderPriceLimit = calculatePriceLimitForTrade(\n params.market.currentPrice,\n BigNumber(params.orderBase).negated().toNumber(), // used just because of sign\n );\n\n const env = getSdkEnvironment();\n const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n const { calldata: data } = await encodeMatchOrder(\n params.signer,\n chainId,\n params.owner.coreSigNonce,\n params.marginAccountId,\n -base,\n orderPriceLimit,\n params.market.counterpartyAccountIds,\n params.market.id,\n params.market.exchangeId,\n );\n\n const result = await signAndBroadcastTransaction(\n data,\n chainId,\n ContractType.PERIPHERY_PROXY,\n {\n action: 'closeOrder',\n accountId: params.marginAccountId,\n marketId: params.market.id,\n },\n );\n\n return {\n transactionHash: result?.txHash || null,\n coreSigNonce: Number(result?.coreSigNonce) || null,\n xpBoost: result.miscellaneous?.tradeXpBoost || 0,\n isNftWon: result.miscellaneous?.xpNftAwarded || false,\n marginAccountId: params.marginAccountId,\n xpEarned: result.miscellaneous?.xpEarned || 0,\n executionPrice: result.tradeDetails?.executionPrice || 0,\n base: result.tradeDetails?.base || 0,\n };\n};\n"]}
|
|
@@ -39,40 +39,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
39
39
|
exports.signAndBroadcastTransaction = void 0;
|
|
40
40
|
var common_1 = require("@reyaxyz/common");
|
|
41
41
|
var config_1 = require("../config");
|
|
42
|
-
function signAndBroadcastTransaction(
|
|
42
|
+
function signAndBroadcastTransaction(data, chainId, targetContract, metadata) {
|
|
43
43
|
return __awaiter(this, void 0, void 0, function () {
|
|
44
|
-
var contractAddress, transactionModuleClient,
|
|
44
|
+
var contractAddress, transactionExecutionOutput, transactionModuleClient, error_1, stringifiedError;
|
|
45
45
|
return __generator(this, function (_a) {
|
|
46
46
|
switch (_a.label) {
|
|
47
47
|
case 0:
|
|
48
48
|
contractAddress = Object.values(common_1.ContractType).includes(targetContract)
|
|
49
49
|
? (0, common_1.getAddress)(chainId, targetContract)
|
|
50
50
|
: targetContract;
|
|
51
|
-
|
|
52
|
-
console.log('Skipping simulation on this network');
|
|
53
|
-
return [3 /*break*/, 3];
|
|
51
|
+
_a.label = 1;
|
|
54
52
|
case 1:
|
|
55
|
-
|
|
56
|
-
return [4 /*yield*/, (0, common_1.estimateGas)(signer, data, value, chainId, targetContract)];
|
|
57
|
-
case 2:
|
|
58
|
-
_a.sent();
|
|
59
|
-
_a.label = 3;
|
|
60
|
-
case 3:
|
|
61
|
-
_a.trys.push([3, 5, , 6]);
|
|
53
|
+
_a.trys.push([1, 3, , 4]);
|
|
62
54
|
transactionModuleClient = (0, config_1.getTransactionModuleClient)();
|
|
63
55
|
return [4 /*yield*/, transactionModuleClient.executeTransaction({ to: contractAddress, data: data }, contractAddress, metadata)];
|
|
56
|
+
case 2:
|
|
57
|
+
transactionExecutionOutput =
|
|
58
|
+
_a.sent();
|
|
59
|
+
return [3 /*break*/, 4];
|
|
60
|
+
case 3:
|
|
61
|
+
error_1 = _a.sent();
|
|
62
|
+
stringifiedError = (0, common_1.stringifyObject)(error_1);
|
|
63
|
+
console.error("Error broadcasting transaction to API: ".concat(data, " ").concat(stringifiedError));
|
|
64
|
+
throw new Error('Transaction Execution Error');
|
|
64
65
|
case 4:
|
|
65
|
-
transactionExecutionOutput
|
|
66
|
+
if (transactionExecutionOutput.errorMessage) {
|
|
67
|
+
console.error("Error forwarded from the API: ".concat(data, " ").concat(transactionExecutionOutput.errorMessage));
|
|
68
|
+
throw new Error(transactionExecutionOutput.errorMessage);
|
|
69
|
+
}
|
|
66
70
|
if (!transactionExecutionOutput.txHash) {
|
|
67
|
-
console.error("Error receiving transaction hash from API ".concat(
|
|
68
|
-
throw new Error('
|
|
71
|
+
console.error("Error receiving transaction hash from API: ".concat(data, " ").concat((0, common_1.stringifyObject)(transactionExecutionOutput)));
|
|
72
|
+
throw new Error('API response does not include transaction hash');
|
|
69
73
|
}
|
|
70
74
|
return [2 /*return*/, transactionExecutionOutput];
|
|
71
|
-
case 5:
|
|
72
|
-
error_1 = _a.sent();
|
|
73
|
-
console.error("Error broadcasting transaction to API ".concat(data, " ").concat(JSON.stringify(error_1, undefined, 2)));
|
|
74
|
-
throw new Error('Transaction Execution Error');
|
|
75
|
-
case 6: return [2 /*return*/];
|
|
76
75
|
}
|
|
77
76
|
});
|
|
78
77
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signAndBroadcastTransaction.js","sourceRoot":"/","sources":["services/signAndBroadcastTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"signAndBroadcastTransaction.js","sourceRoot":"/","sources":["services/signAndBroadcastTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAMyB;AACzB,oCAAuD;AAEvD,SAAsB,2BAA2B,CAC/C,IAAY,EACZ,OAAe,EACf,cAAqC,EACrC,QAAsC;;;;;;oBAEhC,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAY,CAAC,CAAC,QAAQ,CAC1D,cAA8B,CAC/B;wBACC,CAAC,CAAC,IAAA,mBAAU,EAAC,OAAO,EAAE,cAA8B,CAAC;wBACrD,CAAC,CAAC,cAAc,CAAC;;;;oBAIX,uBAAuB,GAAG,IAAA,mCAA0B,GAAE,CAAC;oBAE3D,qBAAM,uBAAuB,CAAC,kBAAkB,CAC9C,EAAE,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,EACnC,eAAe,EACf,QAAQ,CACT,EAAA;;oBALH,0BAA0B;wBACxB,SAIC,CAAC;;;;oBAEE,gBAAgB,GAAG,IAAA,wBAAe,EAAC,OAAK,CAAC,CAAC;oBAEhD,OAAO,CAAC,KAAK,CACX,iDAA0C,IAAI,cAAI,gBAAgB,CAAE,CACrE,CAAC;oBAEF,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;;oBAGjD,IAAI,0BAA0B,CAAC,YAAY,EAAE,CAAC;wBAC5C,OAAO,CAAC,KAAK,CACX,wCAAiC,IAAI,cAAI,0BAA0B,CAAC,YAAY,CAAE,CACnF,CAAC;wBAEF,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,YAAY,CAAC,CAAC;oBAC3D,CAAC;oBAED,IAAI,CAAC,0BAA0B,CAAC,MAAM,EAAE,CAAC;wBACvC,OAAO,CAAC,KAAK,CACX,qDAA8C,IAAI,cAAI,IAAA,wBAAe,EACnE,0BAA0B,CAC3B,CAAE,CACJ,CAAC;wBAEF,MAAM,IAAI,KAAK,CAAC,gDAAgD,CAAC,CAAC;oBACpE,CAAC;oBAED,sBAAO,0BAA0B,EAAC;;;;CACnC;AAlDD,kEAkDC","sourcesContent":["import {\n ContractType,\n getAddress,\n stringifyObject,\n TransactionExecutionMetadata,\n TransactionExecutionOutput,\n} from '@reyaxyz/common';\nimport { getTransactionModuleClient } from '../config';\n\nexport async function signAndBroadcastTransaction(\n data: string,\n chainId: number,\n targetContract: ContractType | string,\n metadata: TransactionExecutionMetadata,\n): Promise<TransactionExecutionOutput> {\n const contractAddress = Object.values(ContractType).includes(\n targetContract as ContractType,\n )\n ? getAddress(chainId, targetContract as ContractType)\n : targetContract;\n\n let transactionExecutionOutput: TransactionExecutionOutput;\n try {\n const transactionModuleClient = getTransactionModuleClient();\n transactionExecutionOutput =\n await transactionModuleClient.executeTransaction(\n { to: contractAddress, data: data },\n contractAddress,\n metadata,\n );\n } catch (error) {\n const stringifiedError = stringifyObject(error);\n\n console.error(\n `Error broadcasting transaction to API: ${data} ${stringifiedError}`,\n );\n\n throw new Error('Transaction Execution Error');\n }\n\n if (transactionExecutionOutput.errorMessage) {\n console.error(\n `Error forwarded from the API: ${data} ${transactionExecutionOutput.errorMessage}`,\n );\n\n throw new Error(transactionExecutionOutput.errorMessage);\n }\n\n if (!transactionExecutionOutput.txHash) {\n console.error(\n `Error receiving transaction hash from API: ${data} ${stringifyObject(\n transactionExecutionOutput,\n )}`,\n );\n\n throw new Error('API response does not include transaction hash');\n }\n\n return transactionExecutionOutput;\n}\n"]}
|
package/dist/types/services/conditional-orders/grant-trade-permission/grantTradePermission.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"grantTradePermission.d.ts","sourceRoot":"/","sources":["services/conditional-orders/grant-trade-permission/grantTradePermission.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAOjB,eAAO,MAAM,oBAAoB,WACvB,0BAA0B,KACjC,QAAQ,0BAA0B,
|
|
1
|
+
{"version":3,"file":"grantTradePermission.d.ts","sourceRoot":"/","sources":["services/conditional-orders/grant-trade-permission/grantTradePermission.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAOjB,eAAO,MAAM,oBAAoB,WACvB,0BAA0B,KACjC,QAAQ,0BAA0B,CAwBpC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
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;AAQjB,eAAO,MAAM,oBAAoB,WACvB,0BAA0B,KACjC,QAAQ,0BAA0B,
|
|
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;AAQjB,eAAO,MAAM,oBAAoB,WACvB,0BAA0B,KACjC,QAAQ,0BAA0B,CAgDpC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,SAAS,CAAC;AAajB,eAAO,MAAM,4BAA4B,WAC/B,kCAAkC,KACzC,QAAQ,kCAAkC,
|
|
1
|
+
{"version":3,"file":"withdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,SAAS,CAAC;AAajB,eAAO,MAAM,4BAA4B,WAC/B,kCAAkC,KACzC,QAAQ,kCAAkC,CAmD5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.d.ts","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAKnE,eAAO,MAAM,aAAa,WAChB,mBAAmB,KAC1B,QAAQ,mBAAmB,
|
|
1
|
+
{"version":3,"file":"account.d.ts","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAKnE,eAAO,MAAM,aAAa,WAChB,mBAAmB,KAC1B,QAAQ,mBAAmB,CAgB7B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
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;AAGjB,eAAO,MAAM,6BAA6B,WAChC,mCAAmC,KAC1C,QAAQ,mCAAmC,
|
|
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;AAGjB,eAAO,MAAM,6BAA6B,WAChC,mCAAmC,KAC1C,QAAQ,mCAAmC,CA4B7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAOjB,eAAO,MAAM,mBAAmB,kHAQ7B,yBAAyB,KAAG,QAAQ,+BAA+B,
|
|
1
|
+
{"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAOjB,eAAO,MAAM,mBAAmB,kHAQ7B,yBAAyB,KAAG,QAAQ,+BAA+B,CA0ErE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AASjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,
|
|
1
|
+
{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AASjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAkE1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CA8C1B,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { JsonRpcSigner, Signer } from 'ethers';
|
|
2
1
|
import { ContractType, TransactionExecutionMetadata, TransactionExecutionOutput } from '@reyaxyz/common';
|
|
3
|
-
export declare function signAndBroadcastTransaction(
|
|
2
|
+
export declare function signAndBroadcastTransaction(data: string, chainId: number, targetContract: ContractType | string, metadata: TransactionExecutionMetadata): Promise<TransactionExecutionOutput>;
|
|
4
3
|
//# sourceMappingURL=signAndBroadcastTransaction.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signAndBroadcastTransaction.d.ts","sourceRoot":"/","sources":["services/signAndBroadcastTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"signAndBroadcastTransaction.d.ts","sourceRoot":"/","sources":["services/signAndBroadcastTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EAGZ,4BAA4B,EAC5B,0BAA0B,EAC3B,MAAM,iBAAiB,CAAC;AAGzB,wBAAsB,2BAA2B,CAC/C,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,EACrC,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC,0BAA0B,CAAC,CA6CrC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reyaxyz/sdk",
|
|
3
|
-
"version": "0.108.
|
|
3
|
+
"version": "0.108.3",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org"
|
|
@@ -29,11 +29,11 @@
|
|
|
29
29
|
"generate:coverage-badges": "npx istanbul-badges-readme --silent"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@reyaxyz/common": "0.189.
|
|
32
|
+
"@reyaxyz/common": "0.189.1",
|
|
33
33
|
"axios": "^1.6.2",
|
|
34
34
|
"bignumber.js": "^9.1.2",
|
|
35
35
|
"ethers": "6.9.0"
|
|
36
36
|
},
|
|
37
37
|
"packageManager": "pnpm@8.3.1",
|
|
38
|
-
"gitHead": "
|
|
38
|
+
"gitHead": "6f843153844eb29a907b565282392bfd5198b77c"
|
|
39
39
|
}
|
|
@@ -14,7 +14,7 @@ export const grantTradePermission = async (
|
|
|
14
14
|
const env = getSdkEnvironment();
|
|
15
15
|
const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');
|
|
16
16
|
|
|
17
|
-
const { calldata: data
|
|
17
|
+
const { calldata: data } = await encodeGrantTradePermission(
|
|
18
18
|
params.signer,
|
|
19
19
|
chainId,
|
|
20
20
|
params.owner.coreSigNonce,
|
|
@@ -22,9 +22,7 @@ export const grantTradePermission = async (
|
|
|
22
22
|
);
|
|
23
23
|
|
|
24
24
|
const result = await signAndBroadcastTransaction(
|
|
25
|
-
params.signer,
|
|
26
25
|
data,
|
|
27
|
-
value,
|
|
28
26
|
chainId,
|
|
29
27
|
ContractType.CORE_PROXY,
|
|
30
28
|
{
|
|
@@ -48,7 +48,7 @@ export const transferFromMAToPool = async (
|
|
|
48
48
|
),
|
|
49
49
|
);
|
|
50
50
|
|
|
51
|
-
const { calldata: data
|
|
51
|
+
const { calldata: data } = encodeTransferFromMAToPool(
|
|
52
52
|
params.marginAccountId,
|
|
53
53
|
amount,
|
|
54
54
|
eip712Signature,
|
|
@@ -58,9 +58,7 @@ export const transferFromMAToPool = async (
|
|
|
58
58
|
);
|
|
59
59
|
|
|
60
60
|
const result = await signAndBroadcastTransaction(
|
|
61
|
-
params.signer,
|
|
62
61
|
data,
|
|
63
|
-
value,
|
|
64
62
|
reyaChainId,
|
|
65
63
|
ContractType.PERIPHERY_PROXY,
|
|
66
64
|
{},
|
|
@@ -43,7 +43,7 @@ export const withdrawPassivePoolAndBridge = async (
|
|
|
43
43
|
params.owner.address,
|
|
44
44
|
);
|
|
45
45
|
|
|
46
|
-
const { calldata: data
|
|
46
|
+
const { calldata: data } = encodeWithdrawPassivePoolAndBridge(
|
|
47
47
|
params.owner.address,
|
|
48
48
|
params.pool.id,
|
|
49
49
|
sharesAmount,
|
|
@@ -55,9 +55,7 @@ export const withdrawPassivePoolAndBridge = async (
|
|
|
55
55
|
);
|
|
56
56
|
|
|
57
57
|
const result = await signAndBroadcastTransaction(
|
|
58
|
-
params.signer,
|
|
59
58
|
data,
|
|
60
|
-
value,
|
|
61
59
|
reyaChainId,
|
|
62
60
|
ContractType.PERIPHERY_PROXY,
|
|
63
61
|
{
|
|
@@ -8,16 +8,12 @@ import { getReyaNetwork } from '@reyaxyz/common';
|
|
|
8
8
|
export const createAccount = async (
|
|
9
9
|
params: CreateAccountParams,
|
|
10
10
|
): Promise<CreateAccountResult> => {
|
|
11
|
-
const { calldata: data
|
|
12
|
-
params.ownerAddress,
|
|
13
|
-
);
|
|
11
|
+
const { calldata: data } = encodeCreateAccountCall(params.ownerAddress);
|
|
14
12
|
const env = getSdkEnvironment();
|
|
15
13
|
const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');
|
|
16
14
|
|
|
17
15
|
const result = await signAndBroadcastTransaction(
|
|
18
|
-
null,
|
|
19
16
|
data,
|
|
20
|
-
value,
|
|
21
17
|
chainId,
|
|
22
18
|
ContractType.CORE_PROXY,
|
|
23
19
|
{ accountName: params.name },
|
|
@@ -17,7 +17,7 @@ export const transferMarginBetweenAccounts = async (
|
|
|
17
17
|
const env = getSdkEnvironment();
|
|
18
18
|
const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');
|
|
19
19
|
|
|
20
|
-
const { calldata: data
|
|
20
|
+
const { calldata: data } = await encodeTransferMargin(
|
|
21
21
|
params.signer,
|
|
22
22
|
chainId,
|
|
23
23
|
params.owner.coreSigNonce,
|
|
@@ -28,9 +28,7 @@ export const transferMarginBetweenAccounts = async (
|
|
|
28
28
|
);
|
|
29
29
|
|
|
30
30
|
const result = await signAndBroadcastTransaction(
|
|
31
|
-
params.signer,
|
|
32
31
|
data,
|
|
33
|
-
value,
|
|
34
32
|
chainId,
|
|
35
33
|
ContractType.PERIPHERY_PROXY,
|
|
36
34
|
{},
|
|
@@ -56,7 +56,7 @@ export const withdrawMAAndBridge = async ({
|
|
|
56
56
|
),
|
|
57
57
|
);
|
|
58
58
|
|
|
59
|
-
const { calldata: data
|
|
59
|
+
const { calldata: data } = encodeWithdrawMAAndBridge(
|
|
60
60
|
marginAccountId,
|
|
61
61
|
corePeripheryTokenInfo.address,
|
|
62
62
|
scale(corePeripheryTokenInfo.decimals)(unscaledAmount),
|
|
@@ -67,9 +67,7 @@ export const withdrawMAAndBridge = async ({
|
|
|
67
67
|
);
|
|
68
68
|
|
|
69
69
|
const result = await signAndBroadcastTransaction(
|
|
70
|
-
signer,
|
|
71
70
|
data,
|
|
72
|
-
value,
|
|
73
71
|
reyaChainId,
|
|
74
72
|
ContractType.PERIPHERY_PROXY,
|
|
75
73
|
{
|
|
@@ -47,7 +47,7 @@ export const matchOrder = async (
|
|
|
47
47
|
const env = getSdkEnvironment();
|
|
48
48
|
const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');
|
|
49
49
|
|
|
50
|
-
const { calldata: data
|
|
50
|
+
const { calldata: data } = await encodeMatchOrder(
|
|
51
51
|
params.signer,
|
|
52
52
|
chainId,
|
|
53
53
|
params.owner.coreSigNonce,
|
|
@@ -60,9 +60,7 @@ export const matchOrder = async (
|
|
|
60
60
|
);
|
|
61
61
|
|
|
62
62
|
const result = await signAndBroadcastTransaction(
|
|
63
|
-
params.signer,
|
|
64
63
|
data,
|
|
65
|
-
value,
|
|
66
64
|
chainId,
|
|
67
65
|
ContractType.PERIPHERY_PROXY,
|
|
68
66
|
{
|
|
@@ -99,7 +97,7 @@ export const closeOrder = async (
|
|
|
99
97
|
|
|
100
98
|
const env = getSdkEnvironment();
|
|
101
99
|
const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');
|
|
102
|
-
const { calldata: data
|
|
100
|
+
const { calldata: data } = await encodeMatchOrder(
|
|
103
101
|
params.signer,
|
|
104
102
|
chainId,
|
|
105
103
|
params.owner.coreSigNonce,
|
|
@@ -112,9 +110,7 @@ export const closeOrder = async (
|
|
|
112
110
|
);
|
|
113
111
|
|
|
114
112
|
const result = await signAndBroadcastTransaction(
|
|
115
|
-
params.signer,
|
|
116
113
|
data,
|
|
117
|
-
value,
|
|
118
114
|
chainId,
|
|
119
115
|
ContractType.PERIPHERY_PROXY,
|
|
120
116
|
{
|
|
@@ -1,17 +1,14 @@
|
|
|
1
|
-
import { JsonRpcSigner, Signer } from 'ethers';
|
|
2
1
|
import {
|
|
3
2
|
ContractType,
|
|
4
3
|
getAddress,
|
|
5
|
-
|
|
4
|
+
stringifyObject,
|
|
6
5
|
TransactionExecutionMetadata,
|
|
7
6
|
TransactionExecutionOutput,
|
|
8
7
|
} from '@reyaxyz/common';
|
|
9
8
|
import { getTransactionModuleClient } from '../config';
|
|
10
9
|
|
|
11
10
|
export async function signAndBroadcastTransaction(
|
|
12
|
-
signer: Signer | JsonRpcSigner | null,
|
|
13
11
|
data: string,
|
|
14
|
-
value: string,
|
|
15
12
|
chainId: number,
|
|
16
13
|
targetContract: ContractType | string,
|
|
17
14
|
metadata: TransactionExecutionMetadata,
|
|
@@ -22,44 +19,42 @@ export async function signAndBroadcastTransaction(
|
|
|
22
19
|
? getAddress(chainId, targetContract as ContractType)
|
|
23
20
|
: targetContract;
|
|
24
21
|
|
|
25
|
-
|
|
26
|
-
// on reya chain usually takes around 100ms, should be monitored!
|
|
27
|
-
if (chainId === 89346162) {
|
|
28
|
-
console.log('Skipping simulation on this network');
|
|
29
|
-
} else {
|
|
30
|
-
if (signer) {
|
|
31
|
-
await estimateGas(signer, data, value, chainId, targetContract);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
|
|
22
|
+
let transactionExecutionOutput: TransactionExecutionOutput;
|
|
35
23
|
try {
|
|
36
24
|
const transactionModuleClient = getTransactionModuleClient();
|
|
37
|
-
|
|
25
|
+
transactionExecutionOutput =
|
|
38
26
|
await transactionModuleClient.executeTransaction(
|
|
39
27
|
{ to: contractAddress, data: data },
|
|
40
28
|
contractAddress,
|
|
41
29
|
metadata,
|
|
42
30
|
);
|
|
43
|
-
|
|
44
|
-
if (!transactionExecutionOutput.txHash) {
|
|
45
|
-
console.error(
|
|
46
|
-
`Error receiving transaction hash from API ${JSON.stringify(
|
|
47
|
-
transactionExecutionOutput,
|
|
48
|
-
undefined,
|
|
49
|
-
2,
|
|
50
|
-
)}`,
|
|
51
|
-
);
|
|
52
|
-
throw new Error('Error sending transaction');
|
|
53
|
-
}
|
|
54
|
-
return transactionExecutionOutput;
|
|
55
31
|
} catch (error) {
|
|
32
|
+
const stringifiedError = stringifyObject(error);
|
|
33
|
+
|
|
56
34
|
console.error(
|
|
57
|
-
`Error broadcasting transaction to API ${data} ${
|
|
58
|
-
error,
|
|
59
|
-
undefined,
|
|
60
|
-
2,
|
|
61
|
-
)}`,
|
|
35
|
+
`Error broadcasting transaction to API: ${data} ${stringifiedError}`,
|
|
62
36
|
);
|
|
37
|
+
|
|
63
38
|
throw new Error('Transaction Execution Error');
|
|
64
39
|
}
|
|
40
|
+
|
|
41
|
+
if (transactionExecutionOutput.errorMessage) {
|
|
42
|
+
console.error(
|
|
43
|
+
`Error forwarded from the API: ${data} ${transactionExecutionOutput.errorMessage}`,
|
|
44
|
+
);
|
|
45
|
+
|
|
46
|
+
throw new Error(transactionExecutionOutput.errorMessage);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
if (!transactionExecutionOutput.txHash) {
|
|
50
|
+
console.error(
|
|
51
|
+
`Error receiving transaction hash from API: ${data} ${stringifyObject(
|
|
52
|
+
transactionExecutionOutput,
|
|
53
|
+
)}`,
|
|
54
|
+
);
|
|
55
|
+
|
|
56
|
+
throw new Error('API response does not include transaction hash');
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
return transactionExecutionOutput;
|
|
65
60
|
}
|