@reyaxyz/sdk 0.37.0 → 0.37.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/executeTransaction.js +7 -3
- package/dist/services/executeTransaction.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/types/services/executeTransaction.d.ts +2 -2
- package/dist/types/services/executeTransaction.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/services/executeTransaction.ts +10 -5
- package/src/services/margin-accounts/withdrawMAAndBridge.ts +1 -1
|
@@ -51,6 +51,7 @@ exports.signAndBroadcastTransaction = exports.executeTransaction = exports.estim
|
|
|
51
51
|
var contractAddresses_1 = require("../utils/contractAddresses");
|
|
52
52
|
var txHelpers_1 = require("../utils/txHelpers");
|
|
53
53
|
var config_1 = require("../config");
|
|
54
|
+
var common_1 = require("@reyaxyz/common");
|
|
54
55
|
function estimateGas(signer, data, value, chainId, targetContract) {
|
|
55
56
|
return __awaiter(this, void 0, void 0, function () {
|
|
56
57
|
var accountAddress, nonce, contractAddress, tx, gasLimit, gasEstimate, error_1, maxPriorityFeePerGas, maxFeePerGas;
|
|
@@ -81,9 +82,12 @@ function estimateGas(signer, data, value, chainId, targetContract) {
|
|
|
81
82
|
console.warn(error_1);
|
|
82
83
|
return [3 /*break*/, 6];
|
|
83
84
|
case 6:
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
85
|
+
if (Object.values(common_1.ReyaChainId).includes(chainId)) {
|
|
86
|
+
maxPriorityFeePerGas = BigInt('0');
|
|
87
|
+
maxFeePerGas = BigInt('0');
|
|
88
|
+
return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit, maxPriorityFeePerGas: maxPriorityFeePerGas, maxFeePerGas: maxFeePerGas })];
|
|
89
|
+
}
|
|
90
|
+
return [2 /*return*/, __assign(__assign({}, tx), { gasLimit: gasLimit })];
|
|
87
91
|
}
|
|
88
92
|
});
|
|
89
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,gEAAsE;AACtE,gDAAkD;AAClD,oCAGmB;
|
|
1
|
+
{"version":3,"file":"executeTransaction.js","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"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","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { ContractType, getAddress } from '../utils/contractAddresses';\nimport { getGasBuffer } from '../utils/txHelpers';\nimport {\n BroadcastTransactionMetadata,\n getTransactionModuleClient,\n} from '../config';\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport type Transaction = {\n from: string;\n to: string;\n data: string;\n value?: string;\n};\n\nexport async function estimateGas(\n signer: Signer | JsonRpcSigner,\n data: string,\n value: string,\n chainId: number,\n targetContract: ContractType | string,\n): Promise<\n Transaction & {\n gasLimit: bigint;\n maxPriorityFeePerGas?: bigint;\n maxFeePerGas?: bigint;\n }\n> {\n const accountAddress = await signer.getAddress();\n const nonce = await signer.getNonce();\n\n const contractAddress = Object.values(ContractType).includes(\n targetContract as ContractType,\n )\n ? getAddress(chainId, targetContract as ContractType)\n : targetContract;\n const tx = {\n from: accountAddress,\n to: contractAddress,\n data,\n ...(value && value !== '0' ? { value: value } : {}),\n chainId: chainId,\n nonce,\n };\n\n let gasLimit: bigint = BigInt('5000000'); // hardcode to 5m gas limit if fails to get estimate\n\n try {\n const gasEstimate = await signer.estimateGas(tx);\n gasLimit = getGasBuffer(gasEstimate);\n } catch (error) {\n // sentry error & throw\n console.warn(error);\n }\n\n if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {\n const maxPriorityFeePerGas: bigint = BigInt('0');\n const maxFeePerGas: bigint = BigInt('0');\n return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };\n }\n\n return { ...tx, gasLimit };\n}\n\nexport async function executeTransaction(\n signer: Signer | JsonRpcSigner,\n data: string,\n value: string,\n chainId: number,\n targetContract: ContractType | string,\n) {\n const txData = await estimateGas(\n signer,\n data,\n value,\n chainId,\n targetContract,\n );\n\n try {\n const txResponse = await signer.sendTransaction(txData);\n const txReceipt = await txResponse.wait();\n return txReceipt;\n } catch (error) {\n console.warn(error);\n throw new Error('Transaction Execution Error');\n }\n}\n\nexport async function signAndBroadcastTransaction(\n signer: Signer | JsonRpcSigner,\n data: string,\n value: string,\n chainId: number,\n targetContract: ContractType | string,\n metadata: BroadcastTransactionMetadata,\n): Promise<{ hash: string }> {\n const txData = await estimateGas(\n signer,\n data,\n value,\n chainId,\n targetContract,\n );\n\n try {\n const signedTx = await signer.signTransaction(txData);\n\n const transactionModuleClient = getTransactionModuleClient();\n const { txHash } = await transactionModuleClient.executeTransaction(\n signedTx,\n targetContract,\n metadata,\n );\n return { hash: txHash };\n } catch (error) {\n console.warn(error);\n throw new Error('Transaction Execution Error');\n }\n}\n"]}
|
|
@@ -69,7 +69,7 @@ var withdrawMAAndBridge = function (_a) {
|
|
|
69
69
|
moneyInOutChainId: moneyInOutChainId,
|
|
70
70
|
tokenName: bridgeTokenInfo.name,
|
|
71
71
|
});
|
|
72
|
-
_c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, BigInt('10000000'), socketConnectors.
|
|
72
|
+
_c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, BigInt('10000000'), socketConnectors.withdraw, receiverAddress), data = _c.calldata, value = _c.value;
|
|
73
73
|
return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(signer, data, value, reyaChainId, contractAddresses_1.ContractType.CORE_PROXY)];
|
|
74
74
|
case 3:
|
|
75
75
|
result = _e.sent();
|
|
@@ -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,eAAe,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBACtD,sBAAsB,GAC1B,eAAe,CAAC,IAAI,KAAK,MAAM;wBAC7B,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;wBACzC,CAAC,CAAC,eAAe,CAAC;oBAEhB,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,gBAAgB,CAAC,
|
|
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,eAAe,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBACtD,sBAAsB,GAC1B,eAAe,CAAC,IAAI,KAAK,MAAM;wBAC7B,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;wBACzC,CAAC,CAAC,eAAe,CAAC;oBAEhB,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,gBAAgB,CAAC,QAAQ,EACzB,eAAe,CAChB,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAQ3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,UAAU,CACxB,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA5DW,QAAA,mBAAmB,uBA4D9B","sourcesContent":["import {\n getCurrentTimestampInSeconds,\n getSocketConnectors,\n scale,\n ReyaChainId,\n getTokenInfoByAddress,\n getTokenInfoByName,\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 bridgeTokenInfo = getTokenInfoByAddress(tokenAddress);\n const corePeripheryTokenInfo =\n bridgeTokenInfo.name === 'USDC'\n ? getTokenInfoByName('RUSD', reyaChainId)\n : bridgeTokenInfo;\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 socketConnectors.withdraw,\n receiverAddress,\n );\n\n const result = await executeTransaction(\n signer,\n data,\n value,\n reyaChainId,\n ContractType.CORE_PROXY,\n );\n\n return {\n transactionHash: result?.hash || null,\n };\n};\n"]}
|
|
@@ -9,8 +9,8 @@ export type Transaction = {
|
|
|
9
9
|
};
|
|
10
10
|
export declare function estimateGas(signer: Signer | JsonRpcSigner, data: string, value: string, chainId: number, targetContract: ContractType | string): Promise<Transaction & {
|
|
11
11
|
gasLimit: bigint;
|
|
12
|
-
maxPriorityFeePerGas
|
|
13
|
-
maxFeePerGas
|
|
12
|
+
maxPriorityFeePerGas?: bigint;
|
|
13
|
+
maxFeePerGas?: bigint;
|
|
14
14
|
}>;
|
|
15
15
|
export declare function executeTransaction(signer: Signer | JsonRpcSigner, data: string, value: string, chainId: number, targetContract: ContractType | string): Promise<import("ethers").TransactionReceipt | null>;
|
|
16
16
|
export declare function signAndBroadcastTransaction(signer: Signer | JsonRpcSigner, data: string, value: string, chainId: number, targetContract: ContractType | string, metadata: BroadcastTransactionMetadata): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAc,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EACL,4BAA4B,EAE7B,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"executeTransaction.d.ts","sourceRoot":"/","sources":["services/executeTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAc,MAAM,4BAA4B,CAAC;AAEtE,OAAO,EACL,4BAA4B,EAE7B,MAAM,WAAW,CAAC;AAGnB,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,wBAAsB,WAAW,CAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,GACpC,OAAO,CACR,WAAW,GAAG;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CACF,CAmCA;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,uDAkBtC;AAED,wBAAsB,2BAA2B,CAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,YAAY,GAAG,MAAM,EACrC,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,CAuB3B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reyaxyz/sdk",
|
|
3
|
-
"version": "0.37.
|
|
3
|
+
"version": "0.37.1",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org"
|
|
@@ -34,5 +34,5 @@
|
|
|
34
34
|
"ethers": "6.9.0"
|
|
35
35
|
},
|
|
36
36
|
"packageManager": "pnpm@8.10.4",
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "2c410fecbc15102e88781ad8307612cb5e973e4a"
|
|
38
38
|
}
|
|
@@ -5,6 +5,7 @@ import {
|
|
|
5
5
|
BroadcastTransactionMetadata,
|
|
6
6
|
getTransactionModuleClient,
|
|
7
7
|
} from '../config';
|
|
8
|
+
import { ReyaChainId } from '@reyaxyz/common';
|
|
8
9
|
|
|
9
10
|
export type Transaction = {
|
|
10
11
|
from: string;
|
|
@@ -22,8 +23,8 @@ export async function estimateGas(
|
|
|
22
23
|
): Promise<
|
|
23
24
|
Transaction & {
|
|
24
25
|
gasLimit: bigint;
|
|
25
|
-
maxPriorityFeePerGas
|
|
26
|
-
maxFeePerGas
|
|
26
|
+
maxPriorityFeePerGas?: bigint;
|
|
27
|
+
maxFeePerGas?: bigint;
|
|
27
28
|
}
|
|
28
29
|
> {
|
|
29
30
|
const accountAddress = await signer.getAddress();
|
|
@@ -53,9 +54,13 @@ export async function estimateGas(
|
|
|
53
54
|
console.warn(error);
|
|
54
55
|
}
|
|
55
56
|
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
57
|
+
if (Object.values(ReyaChainId).includes(chainId as ReyaChainId)) {
|
|
58
|
+
const maxPriorityFeePerGas: bigint = BigInt('0');
|
|
59
|
+
const maxFeePerGas: bigint = BigInt('0');
|
|
60
|
+
return { ...tx, gasLimit, maxPriorityFeePerGas, maxFeePerGas };
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
return { ...tx, gasLimit };
|
|
59
64
|
}
|
|
60
65
|
|
|
61
66
|
export async function executeTransaction(
|