@reyaxyz/sdk 0.34.4 → 0.35.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/abis/socket/VaultWithPayload.json +31 -1
- package/dist/index.js +0 -1
- package/dist/index.js.map +1 -1
- package/dist/services/lp/bridgeAndDepositPassivePool.js +14 -15
- package/dist/services/lp/bridgeAndDepositPassivePool.js.map +1 -1
- package/dist/services/lp/encode.js +4 -6
- package/dist/services/lp/encode.js.map +1 -1
- package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js +1 -1
- package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js.map +1 -1
- package/dist/services/lp/transferFromMAToPool.js +11 -7
- package/dist/services/lp/transferFromMAToPool.js.map +1 -1
- package/dist/services/lp/types.js.map +1 -1
- package/dist/services/lp/withdrawPassivePoolAndBridge.js +6 -9
- package/dist/services/lp/withdrawPassivePoolAndBridge.js.map +1 -1
- package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js +27 -20
- package/dist/services/margin-accounts/bridgeAndDepositExistingMA.js.map +1 -1
- package/dist/services/margin-accounts/bridgeAndDepositNewMA.js +14 -15
- package/dist/services/margin-accounts/bridgeAndDepositNewMA.js.map +1 -1
- package/dist/services/margin-accounts/deposit.js +3 -3
- package/dist/services/margin-accounts/deposit.js.map +1 -1
- package/dist/services/margin-accounts/encode.js +20 -12
- package/dist/services/margin-accounts/encode.js.map +1 -1
- package/dist/services/margin-accounts/transferMarginBetweenAccounts.js +3 -3
- package/dist/services/margin-accounts/transferMarginBetweenAccounts.js.map +1 -1
- package/dist/services/margin-accounts/types.js.map +1 -1
- package/dist/services/margin-accounts/withdraw.js +3 -3
- package/dist/services/margin-accounts/withdraw.js.map +1 -1
- package/dist/services/margin-accounts/withdrawMAAndBridge.js +20 -17
- package/dist/services/margin-accounts/withdrawMAAndBridge.js.map +1 -1
- package/dist/services/sign.js +26 -9
- package/dist/services/sign.js.map +1 -1
- package/dist/services/token/approve.js +18 -4
- package/dist/services/token/approve.js.map +1 -1
- package/dist/services/token/getAllowance.js +18 -4
- package/dist/services/token/getAllowance.js.map +1 -1
- package/dist/services/token/getBalanceByChainId.js +2 -11
- package/dist/services/token/getBalanceByChainId.js.map +1 -1
- package/dist/services/token/index.js +1 -1
- package/dist/services/token/index.js.map +1 -1
- package/dist/services/token/types.js +1 -0
- package/dist/services/token/types.js.map +1 -1
- package/dist/types/index.d.ts +0 -1
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/services/lp/bridgeAndDepositPassivePool.d.ts.map +1 -1
- package/dist/types/services/lp/encode.d.ts +2 -2
- package/dist/types/services/lp/encode.d.ts.map +1 -1
- package/dist/types/services/lp/transferFromMAToPool.d.ts.map +1 -1
- package/dist/types/services/lp/types.d.ts +1 -1
- package/dist/types/services/lp/types.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 +2 -2
- package/dist/types/services/margin-accounts/bridgeAndDepositExistingMA.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/bridgeAndDepositNewMA.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/encode.d.ts +3 -3
- package/dist/types/services/margin-accounts/encode.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/types.d.ts +2 -2
- package/dist/types/services/margin-accounts/types.d.ts.map +1 -1
- package/dist/types/services/margin-accounts/withdrawMAAndBridge.d.ts +1 -1
- package/dist/types/services/margin-accounts/withdrawMAAndBridge.d.ts.map +1 -1
- package/dist/types/services/sign.d.ts +4 -2
- package/dist/types/services/sign.d.ts.map +1 -1
- package/dist/types/services/token/approve.d.ts.map +1 -1
- package/dist/types/services/token/getAllowance.d.ts.map +1 -1
- package/dist/types/services/token/getBalanceByChainId.d.ts.map +1 -1
- package/dist/types/services/token/index.d.ts +1 -1
- package/dist/types/services/token/index.d.ts.map +1 -1
- package/dist/types/services/token/types.d.ts +3 -3
- package/dist/types/services/token/types.d.ts.map +1 -1
- package/dist/types/utils/contractAddresses.d.ts +1 -1
- package/dist/types/utils/contractAddresses.d.ts.map +1 -1
- package/dist/utils/contractAddresses.js +3 -3
- package/dist/utils/contractAddresses.js.map +1 -1
- package/package.json +3 -3
- package/src/abis/socket/VaultWithPayload.json +31 -1
- package/src/index.ts +0 -1
- package/src/services/lp/bridgeAndDepositPassivePool.ts +6 -8
- package/src/services/lp/encode.ts +2 -7
- package/src/services/lp/simulateWithdrawPassivePoolAndBridge.ts +2 -2
- package/src/services/lp/transferFromMAToPool.ts +17 -10
- package/src/services/lp/types.ts +1 -1
- package/src/services/lp/withdrawPassivePoolAndBridge.ts +6 -11
- package/src/services/margin-accounts/bridgeAndDepositExistingMA.ts +45 -16
- package/src/services/margin-accounts/bridgeAndDepositNewMA.ts +16 -8
- package/src/services/margin-accounts/deposit.ts +3 -3
- package/src/services/margin-accounts/encode.ts +25 -16
- package/src/services/margin-accounts/transferMarginBetweenAccounts.ts +3 -3
- package/src/services/margin-accounts/types.ts +2 -2
- package/src/services/margin-accounts/withdraw.ts +3 -3
- package/src/services/margin-accounts/withdrawMAAndBridge.ts +25 -15
- package/src/services/sign.ts +33 -20
- package/src/services/token/approve.ts +29 -6
- package/src/services/token/getAllowance.ts +29 -5
- package/src/services/token/getBalanceByChainId.ts +3 -18
- package/src/services/token/index.ts +1 -1
- package/src/services/token/types.ts +2 -2
- package/src/utils/contractAddresses.ts +5 -4
- package/dist/types/utils/network.d.ts +0 -4
- package/dist/types/utils/network.d.ts.map +0 -1
- package/dist/utils/network.js +0 -25
- package/dist/utils/network.js.map +0 -1
- package/src/utils/network.ts +0 -23
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;IACP,mDAAM,CAAA;AACR,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { MoneyInOutChainId, ReyaChainId, TokenEntity } from '@reyaxyz/common';\n\nexport enum ApprovalType {\n LP,\n DEPOSIT,\n BRIDGE,\n}\n\nexport type ApproveTokenParams = {\n signer: Signer | JsonRpcSigner;\n tokenAddress: TokenEntity['address'];\n type: ApprovalType;\n};\n\nexport type GetAllowanceParams = {\n signer: Signer | JsonRpcSigner;\n tokenAddress: TokenEntity['address'];\n type: ApprovalType;\n};\n\nexport type GetBalanceByTokenAddressParams = {\n signer: Signer | JsonRpcSigner;\n tokenAddress: TokenEntity['address'];\n};\n\nexport type GetBalanceByChainIdParams = {\n signer: Signer | JsonRpcSigner;\n chainId: ReyaChainId | MoneyInOutChainId;\n};\n"]}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CA8C3C,CAAC"}
|
|
@@ -2,7 +2,7 @@ import { MethodParameters } from '../../utils/action';
|
|
|
2
2
|
import { EIP712Signature } from '../sign';
|
|
3
3
|
export declare const encodeProvideLiquidityCall: (poolId: number, accountOwner: string, amount: bigint, minShares: number) => MethodParameters;
|
|
4
4
|
export declare const encodeRemoveLiquidityCall: (poolId: number, sharesAmount: bigint, minOut: number) => MethodParameters;
|
|
5
|
-
export declare const encodeTransferFromMAToPool: (accountId: number, amount: bigint, sig: EIP712Signature, poolId: number,
|
|
6
|
-
export declare const encodeWithdrawPassivePoolAndBridge: (
|
|
5
|
+
export declare const encodeTransferFromMAToPool: (accountId: number, amount: bigint, sig: EIP712Signature, poolId: number, minShares: bigint) => MethodParameters;
|
|
6
|
+
export declare const encodeWithdrawPassivePoolAndBridge: (poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketConnector: string, receiver: string) => MethodParameters;
|
|
7
7
|
export declare const encodeBridgeAndDepositPassivePool: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint, fallbackSocketMsgGasLimit: bigint, fallbackSocketConnector: string) => MethodParameters;
|
|
8
8
|
//# sourceMappingURL=encode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,eAAO,MAAM,0BAA0B,WAC7B,MAAM,gBACA,MAAM,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC5B,MAAM,gBACA,MAAM,UACZ,MAAM,KACb,gBAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,OACT,eAAe,UACZ,MAAM,
|
|
1
|
+
{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,eAAO,MAAM,0BAA0B,WAC7B,MAAM,gBACA,MAAM,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC5B,MAAM,gBACA,MAAM,UACZ,MAAM,KACb,gBAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,OACT,eAAe,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,WACrC,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,mBACR,MAAM,YACb,MAAM,KACf,gBAgBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,6BACU,MAAM,2BACR,MAAM,KAC9B,gBAuBF,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transferFromMAToPool.d.ts","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transferFromMAToPool.d.ts","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAKjB,eAAO,MAAM,oBAAoB,WACvB,0BAA0B,KACjC,QAAQ,0BAA0B,CAuCpC,CAAC"}
|
|
@@ -18,7 +18,7 @@ export type RemoveLiquidityResult = {
|
|
|
18
18
|
};
|
|
19
19
|
export type TransferFromMAToPoolParams = {
|
|
20
20
|
signer: Signer | JsonRpcSigner;
|
|
21
|
-
owner: Pick<OwnerMetadataEntity, '
|
|
21
|
+
owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
|
|
22
22
|
marginAccountId: MarginAccountEntity['id'];
|
|
23
23
|
pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;
|
|
24
24
|
amount: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACX,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,YAAY,EACZ,uBAAuB,EACvB,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACX,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACjD,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,0BAA0B,GAAG;IACvC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,uBAAuB,CAAC,gBAAgB,CAAC,CAAC;IACtD,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kCAAkC,GAAG;IAC/C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,IAAI,EAAE,IAAI,CAAC,YAAY,EAAE,IAAI,GAAG,cAAc,CAAC,CAAC;IAChD,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iCAAiC,GAAG;IAC9C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,yCAAyC,GAAG;IACtD,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,IAAI,EAAE,MAAM,CAAC;IACb,mBAAmB,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,cAAc,EAAE,MAAM,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,WAAW,EAAE,WAAW,CAAC;IACzB,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"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,CAkD5C,CAAC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import {
|
|
2
|
-
export declare const
|
|
1
|
+
import { BridgeAndDepositExistingMAParams, BridgeAndDepositExistingMAResult } from './types';
|
|
2
|
+
export declare const bridgeAndDepositExistingMA: (params: BridgeAndDepositExistingMAParams) => Promise<BridgeAndDepositExistingMAResult>;
|
|
3
3
|
//# sourceMappingURL=bridgeAndDepositExistingMA.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositExistingMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":"AAcA,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EACjC,MAAM,SAAS,CAAC;AAMjB,eAAO,MAAM,0BAA0B,WAC7B,gCAAgC,KACvC,QAAQ,gCAAgC,CA2E1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"bridgeAndDepositNewMA.d.ts","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC5B,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,qBAAqB,WACxB,2BAA2B,KAClC,QAAQ,2BAA2B,CAgDrC,CAAC"}
|
|
@@ -4,7 +4,7 @@ export declare const encodeCreateAccountCall: (accountOwner: string) => MethodPa
|
|
|
4
4
|
export declare const encodeDeposit: (accountId: number, token: string, amount: bigint) => MethodParameters;
|
|
5
5
|
export declare const encodeWithdraw: (accountId: number, token: string, amount: bigint) => MethodParameters;
|
|
6
6
|
export declare const encodeTransferMargin: (fromMarginAccountId: number, toMarginAccountId: number, token: string, amount: bigint) => MethodParameters;
|
|
7
|
-
export declare const encodeWithdrawMAAndBridge: (accountId: number,
|
|
8
|
-
export declare const encodeBridgeAndDepositNewMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, accountOwner: string,
|
|
9
|
-
export declare const encodeBridgeAndDepositExistingMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, accountId: number,
|
|
7
|
+
export declare const encodeWithdrawMAAndBridge: (accountId: number, corePeripheryTokenAddress: string, corePeripheryTokenAmount: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketConnector: string, receiver: string) => MethodParameters;
|
|
8
|
+
export declare const encodeBridgeAndDepositNewMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, accountOwner: string, peripheryTokenAddress: string, peripheryTokenAmount: bigint, moneyInOutTokenAmount: bigint, fallbackSocketMsgGasLimit: bigint, fallbackSocketConnector: string) => MethodParameters;
|
|
9
|
+
export declare const encodeBridgeAndDepositExistingMA: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, accountId: number, peripheryTokenAddress: string, peripheryTokenAmount: bigint, sig: EIP712Signature, moneyInOutTokenAmount: bigint, fallbackSocketMsgGasLimit: bigint, fallbackSocketConnector: string) => MethodParameters;
|
|
10
10
|
//# sourceMappingURL=encode.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAYnE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,eAAO,MAAM,uBAAuB,iBACpB,MAAM,KACnB,gBAMF,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,cAAc,cACd,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,oBAAoB,wBACV,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,
|
|
1
|
+
{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,oBAAoB,CAAC;AAYnE,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE1C,eAAO,MAAM,uBAAuB,iBACpB,MAAM,KACnB,gBAMF,CAAC;AAEF,eAAO,MAAM,aAAa,cACb,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,cAAc,cACd,MAAM,SACV,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,oBAAoB,wBACV,MAAM,qBACR,MAAM,SAClB,MAAM,UACL,MAAM,KACb,gBAWF,CAAC;AAEF,eAAO,MAAM,yBAAyB,cACzB,MAAM,6BACU,MAAM,4BACP,MAAM,OAC3B,eAAe,qBACD,MAAM,mBACR,MAAM,YACb,MAAM,KACf,gBAgBF,CAAC;AAEF,eAAO,MAAM,2BAA2B,aAC5B,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,gBACJ,MAAM,yBACG,MAAM,wBACP,MAAM,yBACL,MAAM,6BACF,MAAM,2BACR,MAAM,KAC9B,gBA2BF,CAAC;AAEF,eAAO,MAAM,gCAAgC,aACjC,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,aACP,MAAM,yBACM,MAAM,wBACP,MAAM,OACvB,eAAe,yBACG,MAAM,6BACF,MAAM,2BACR,MAAM,KAC9B,gBA4BF,CAAC"}
|
|
@@ -79,14 +79,14 @@ export type BridgeAndDepositNewMAParams = {
|
|
|
79
79
|
export type BridgeAndDepositNewMAResult = {
|
|
80
80
|
transactionHash: string | null;
|
|
81
81
|
};
|
|
82
|
-
export type
|
|
82
|
+
export type BridgeAndDepositExistingMAParams = {
|
|
83
83
|
signer: Signer | JsonRpcSigner;
|
|
84
84
|
owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;
|
|
85
85
|
marginAccountId: MarginAccountEntity['id'];
|
|
86
86
|
tokenAddress: TokenEntity['address'];
|
|
87
87
|
amount: number;
|
|
88
88
|
};
|
|
89
|
-
export type
|
|
89
|
+
export type BridgeAndDepositExistingMAResult = {
|
|
90
90
|
transactionHash: string | null;
|
|
91
91
|
};
|
|
92
92
|
export type SimulateTransferMarginBetweenAccountsResult = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,mBAAmB,EACnB,WAAW,EACZ,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;CAC3D,CAAC;AAGF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,MAAM,CAAC;IAEtB,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;CAC3D,CAAC;AAGF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,mBAAmB,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC/C,iBAAiB,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC7C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,SAAS,GAAG,cAAc,CAAC,CAAC;IAC7D,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;IAEf,eAAe,CAAC,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,+BAA+B,GAAG;IAC5C,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,SAAS,CAAC,CAAC;IAC7C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import { WithdrawMAAndBridgeParams, WithdrawMAAndBridgeParamsResult } from './types';
|
|
2
|
-
export declare const withdrawMAAndBridge: ({ signer, moneyInOutChainId, marginAccountId, owner, amount, tokenAddress, receiverAddress, }: WithdrawMAAndBridgeParams) => Promise<WithdrawMAAndBridgeParamsResult>;
|
|
2
|
+
export declare const withdrawMAAndBridge: ({ signer, moneyInOutChainId, marginAccountId, owner, amount: unscaledAmount, tokenAddress, receiverAddress, }: WithdrawMAAndBridgeParams) => Promise<WithdrawMAAndBridgeParamsResult>;
|
|
3
3
|
//# sourceMappingURL=withdrawMAAndBridge.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"withdrawMAAndBridge.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,yBAAyB,EACzB,+BAA+B,EAChC,MAAM,SAAS,CAAC;AAKjB,eAAO,MAAM,mBAAmB,kHAQ7B,yBAAyB,KAAG,QAAQ,+BAA+B,CAoDrE,CAAC"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { JsonRpcSigner, Signer } from 'ethers';
|
|
2
|
+
import { Address, ReyaChainId } from '@reyaxyz/common';
|
|
3
|
+
import { Command } from '../utils/action';
|
|
2
4
|
export type EIP712Signature = {
|
|
3
5
|
v: number;
|
|
4
6
|
r: string;
|
|
5
7
|
s: string;
|
|
6
8
|
deadline: number;
|
|
7
9
|
};
|
|
8
|
-
export declare function signCoreCommands(signer: Signer | JsonRpcSigner,
|
|
9
|
-
export declare function signPoolRemoveLiquidity(signer: Signer | JsonRpcSigner,
|
|
10
|
+
export declare function signCoreCommands(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, caller: Address, accountId: number, commands: Command[], nonce: number, deadline: number): Promise<EIP712Signature>;
|
|
11
|
+
export declare function signPoolRemoveLiquidity(signer: Signer | JsonRpcSigner, reyaChainId: ReyaChainId, caller: Address, owner: Address, poolId: number, sharesAmount: bigint, minOut: bigint, nonce: number, deadline: number): Promise<EIP712Signature>;
|
|
10
12
|
//# sourceMappingURL=sign.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sign.d.ts","sourceRoot":"/","sources":["services/sign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAa,MAAM,EAAkB,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"sign.d.ts","sourceRoot":"/","sources":["services/sign.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAa,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AAE1C,MAAM,MAAM,eAAe,GAAG;IAC5B,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAcF,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,SAAS,EAAE,MAAM,EACjB,QAAQ,EAAE,OAAO,EAAE,EACnB,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CA+B1B;AAED,wBAAsB,uBAAuB,CAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,EAC9B,WAAW,EAAE,WAAW,EACxB,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC,CA6B1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"approve.d.ts","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"approve.d.ts","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAU3D,eAAO,MAAM,oBAAoB,WACvB,kBAAkB,KACzB,QAAQ,MAAM,CAiEhB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAllowance.d.ts","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"getAllowance.d.ts","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAS3D,eAAO,MAAM,YAAY,WACf,kBAAkB,KACzB,QAAQ,MAAM,CAuChB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getBalanceByChainId.d.ts","sourceRoot":"/","sources":["services/token/getBalanceByChainId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"getBalanceByChainId.d.ts","sourceRoot":"/","sources":["services/token/getBalanceByChainId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,SAAS,CAAC;AAMpD,eAAO,MAAM,mBAAmB,yBAG7B,yBAAyB,KAAG,QAAQ,MAAM,CAK5C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/token/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { JsonRpcSigner, Signer } from 'ethers';
|
|
2
|
-
import { TokenEntity } from '@reyaxyz/common';
|
|
3
|
-
import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';
|
|
2
|
+
import { MoneyInOutChainId, ReyaChainId, TokenEntity } from '@reyaxyz/common';
|
|
4
3
|
export declare enum ApprovalType {
|
|
5
4
|
LP = 0,
|
|
6
|
-
DEPOSIT = 1
|
|
5
|
+
DEPOSIT = 1,
|
|
6
|
+
BRIDGE = 2
|
|
7
7
|
}
|
|
8
8
|
export type ApproveTokenParams = {
|
|
9
9
|
signer: Signer | JsonRpcSigner;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9E,oBAAY,YAAY;IACtB,EAAE,IAAA;IACF,OAAO,IAAA;IACP,MAAM,IAAA;CACP;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,WAAW,GAAG,iBAAiB,CAAC;CAC1C,CAAC"}
|
|
@@ -4,5 +4,5 @@ export declare enum ContractType {
|
|
|
4
4
|
PASSIVE_POOL_PROXY = "passive_pool_proxy",
|
|
5
5
|
PERIPHERY_PROXY = "periphery_proxy"
|
|
6
6
|
}
|
|
7
|
-
export declare const getAddress: (chainId: number, contractName: ContractType) =>
|
|
7
|
+
export declare const getAddress: (chainId: number, contractName: ContractType) => Address;
|
|
8
8
|
//# sourceMappingURL=contractAddresses.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contractAddresses.d.ts","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAIxC,oBAAY,YAAY;IACtB,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,eAAe,oBAAoB;CACpC;
|
|
1
|
+
{"version":3,"file":"contractAddresses.d.ts","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAIxC,oBAAY,YAAY;IACtB,UAAU,eAAe;IACzB,kBAAkB,uBAAuB;IACzC,eAAe,oBAAoB;CACpC;AAkBD,eAAO,MAAM,UAAU,YACZ,MAAM,gBACD,YAAY,KACzB,OAaF,CAAC"}
|
|
@@ -14,7 +14,7 @@ var addresses = (_a = {},
|
|
|
14
14
|
_a[common_1.ReyaChainId.reyaCronos] = (_b = {},
|
|
15
15
|
_b[ContractType.CORE_PROXY] = '0xaf68ce211989a9b05a8d6212c8f432785296a847',
|
|
16
16
|
_b[ContractType.PASSIVE_POOL_PROXY] = '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',
|
|
17
|
-
_b[ContractType.PERIPHERY_PROXY] = '
|
|
17
|
+
_b[ContractType.PERIPHERY_PROXY] = '0x8a0500b4290aba646a3d46027b621e5167a56b8d',
|
|
18
18
|
_b),
|
|
19
19
|
// TODO: add proper config
|
|
20
20
|
_a[common_1.ReyaChainId.reyaNetwork] = (_c = {},
|
|
@@ -26,11 +26,11 @@ var addresses = (_a = {},
|
|
|
26
26
|
var getAddress = function (chainId, contractName) {
|
|
27
27
|
var keyChainId = chainId.toString();
|
|
28
28
|
if (!Object.keys(addresses).includes(keyChainId)) {
|
|
29
|
-
|
|
29
|
+
throw new Error("Unspecified addresses for chain id ".concat(keyChainId));
|
|
30
30
|
}
|
|
31
31
|
var networkAddresses = addresses[chainId];
|
|
32
32
|
if (!Object.keys(networkAddresses).includes(contractName)) {
|
|
33
|
-
|
|
33
|
+
throw new Error("Unspecified address for ".concat(contractName, " contract"));
|
|
34
34
|
}
|
|
35
35
|
return networkAddresses[contractName];
|
|
36
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contractAddresses.js","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":";;;;AACA,+CAA+C;AAC/C,0CAA8C;AAE9C,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,yCAAyB,CAAA;IACzB,yDAAyC,CAAA;IACzC,mDAAmC,CAAA;AACrC,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAED,IAAM,SAAS;IACb,GAAC,oBAAW,CAAC,UAAU;QACrB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"contractAddresses.js","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":";;;;AACA,+CAA+C;AAC/C,0CAA8C;AAE9C,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,yCAAyB,CAAA;IACzB,yDAAyC,CAAA;IACzC,mDAAmC,CAAA;AACrC,CAAC,EAJW,YAAY,4BAAZ,YAAY,QAIvB;AAED,IAAM,SAAS;IACb,GAAC,oBAAW,CAAC,UAAU;QACrB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAC3B,4CAA4C;WAC/C;IACD,0BAA0B;IAC1B,GAAC,oBAAW,CAAC,WAAW;QACtB,GAAC,YAAY,CAAC,UAAU,IAAG,4CAA4C;QACvE,GAAC,YAAY,CAAC,kBAAkB,IAC9B,4CAA4C;QAC9C,GAAC,YAAY,CAAC,eAAe,IAAG,MAAM;WACvC;OACF,CAAC;AACK,IAAM,UAAU,GAAG,UACxB,OAAe,EACf,YAA0B;IAE1B,IAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,MAAM,IAAI,KAAK,CAAC,6CAAsC,UAAU,CAAE,CAAC,CAAC;IACtE,CAAC;IAED,IAAM,gBAAgB,GAAG,SAAS,CAAC,OAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,KAAK,CAAC,kCAA2B,YAAY,cAAW,CAAC,CAAC;IACtE,CAAC;IAED,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,UAAU,cAgBrB","sourcesContent":["export type Address = Lowercase<string>;\n// @todo update with proper chainId for mainnet\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport enum ContractType {\n CORE_PROXY = 'core_proxy',\n PASSIVE_POOL_PROXY = 'passive_pool_proxy',\n PERIPHERY_PROXY = 'periphery_proxy',\n}\n\nconst addresses: Record<ReyaChainId, Record<ContractType, Address>> = {\n [ReyaChainId.reyaCronos]: {\n [ContractType.CORE_PROXY]: '0xaf68ce211989a9b05a8d6212c8f432785296a847',\n [ContractType.PASSIVE_POOL_PROXY]:\n '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',\n [ContractType.PERIPHERY_PROXY]:\n '0x8a0500b4290aba646a3d46027b621e5167a56b8d',\n },\n // TODO: add proper config\n [ReyaChainId.reyaNetwork]: {\n [ContractType.CORE_PROXY]: '0x79d6f095ba4b74a3d2b4522e7080ed76d8aeb940',\n [ContractType.PASSIVE_POOL_PROXY]:\n '0x63df38878c5b8e84d7dcb347b934072add64bdc5',\n [ContractType.PERIPHERY_PROXY]: 'todo',\n },\n};\nexport const getAddress = (\n chainId: number,\n contractName: ContractType,\n): Address => {\n const keyChainId = chainId.toString();\n\n if (!Object.keys(addresses).includes(keyChainId)) {\n throw new Error(`Unspecified addresses for chain id ${keyChainId}`);\n }\n\n const networkAddresses = addresses[chainId as ReyaChainId];\n if (!Object.keys(networkAddresses).includes(contractName)) {\n throw new Error(`Unspecified address for ${contractName} contract`);\n }\n\n return networkAddresses[contractName];\n};\n"]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@reyaxyz/sdk",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.35.0",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public",
|
|
6
6
|
"registry": "https://registry.npmjs.org"
|
|
@@ -29,10 +29,10 @@
|
|
|
29
29
|
"generate:coverage-badges": "npx istanbul-badges-readme --silent"
|
|
30
30
|
},
|
|
31
31
|
"dependencies": {
|
|
32
|
-
"@reyaxyz/common": "0.
|
|
32
|
+
"@reyaxyz/common": "0.48.0",
|
|
33
33
|
"bignumber.js": "^9.1.2",
|
|
34
34
|
"ethers": "6.9.0"
|
|
35
35
|
},
|
|
36
36
|
"packageManager": "pnpm@8.10.4",
|
|
37
|
-
"gitHead": "
|
|
37
|
+
"gitHead": "3710b22ddcc4be855f8f9523c970bcd2bdfa1892"
|
|
38
38
|
}
|
|
@@ -1,5 +1,35 @@
|
|
|
1
1
|
{
|
|
2
2
|
"abi": [
|
|
3
|
-
|
|
3
|
+
{
|
|
4
|
+
"type": "function",
|
|
5
|
+
"name": "depositToAppChain",
|
|
6
|
+
"inputs": [
|
|
7
|
+
{
|
|
8
|
+
"name": "receiver_",
|
|
9
|
+
"type": "address",
|
|
10
|
+
"internalType": "address"
|
|
11
|
+
},
|
|
12
|
+
{
|
|
13
|
+
"name": "amount_",
|
|
14
|
+
"type": "uint256",
|
|
15
|
+
"internalType": "uint256"
|
|
16
|
+
},
|
|
17
|
+
{
|
|
18
|
+
"name": "msgGasLimit_",
|
|
19
|
+
"type": "uint256",
|
|
20
|
+
"internalType": "uint256"
|
|
21
|
+
},
|
|
22
|
+
{
|
|
23
|
+
"name": "connector_",
|
|
24
|
+
"type": "address",
|
|
25
|
+
"internalType": "address"
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
"name": "execPayload_",
|
|
29
|
+
"type": "bytes",
|
|
30
|
+
"internalType": "bytes"
|
|
31
|
+
}
|
|
32
|
+
]
|
|
33
|
+
}
|
|
4
34
|
]
|
|
5
35
|
}
|
package/src/index.ts
CHANGED
|
@@ -2,9 +2,10 @@ import {
|
|
|
2
2
|
getSocketDepositFeesAsBigInt,
|
|
3
3
|
getSocketVault,
|
|
4
4
|
scale,
|
|
5
|
-
getTokenDetails,
|
|
6
5
|
MoneyInOutChainId,
|
|
7
6
|
getSocketConnectors,
|
|
7
|
+
getTokenInfoByAddress,
|
|
8
|
+
getReyaNetworkFromMoneyInOutChainId,
|
|
8
9
|
} from '@reyaxyz/common';
|
|
9
10
|
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
10
11
|
import { executeTransaction } from '../executeTransaction';
|
|
@@ -13,7 +14,6 @@ import {
|
|
|
13
14
|
BridgeAndDepositPassivePoolParams,
|
|
14
15
|
BridgeAndDepositPassivePoolResult,
|
|
15
16
|
} from './types';
|
|
16
|
-
import { getReyaNetworkFromMoneyInOutChainId } from '../../utils/network';
|
|
17
17
|
|
|
18
18
|
export const bridgeAndDepositPassivePool = async (
|
|
19
19
|
params: BridgeAndDepositPassivePoolParams,
|
|
@@ -21,14 +21,12 @@ export const bridgeAndDepositPassivePool = async (
|
|
|
21
21
|
const network = await params.signer.provider?.getNetwork();
|
|
22
22
|
const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);
|
|
23
23
|
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
);
|
|
27
|
-
const amount = scale(tokenDecimals)(params.amount);
|
|
24
|
+
const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);
|
|
25
|
+
const amount = scale(tokenInfo.decimals)(params.amount);
|
|
28
26
|
|
|
29
27
|
const socketConnectors = getSocketConnectors({
|
|
30
28
|
moneyInOutChainId: moneyInOutChainId,
|
|
31
|
-
tokenName:
|
|
29
|
+
tokenName: tokenInfo.name,
|
|
32
30
|
});
|
|
33
31
|
|
|
34
32
|
const peripheryAddress = getAddress(
|
|
@@ -58,7 +56,7 @@ export const bridgeAndDepositPassivePool = async (
|
|
|
58
56
|
moneyInOutChainId,
|
|
59
57
|
getSocketVault({
|
|
60
58
|
moneyInOutChainId: moneyInOutChainId,
|
|
61
|
-
tokenName:
|
|
59
|
+
tokenName: tokenInfo.name,
|
|
62
60
|
}),
|
|
63
61
|
);
|
|
64
62
|
|
|
@@ -43,38 +43,33 @@ export const encodeTransferFromMAToPool = (
|
|
|
43
43
|
amount: bigint,
|
|
44
44
|
sig: EIP712Signature,
|
|
45
45
|
poolId: number,
|
|
46
|
-
owner: string,
|
|
47
46
|
minShares: bigint,
|
|
48
47
|
): MethodParameters => {
|
|
49
48
|
const functionSignature = 'transferFromMAToPool';
|
|
50
|
-
const parameters = [{ accountId, amount, sig, poolId,
|
|
49
|
+
const parameters = [{ accountId, amount, sig, poolId, minShares }];
|
|
51
50
|
const INTERFACE = new Interface(peripheryAbi);
|
|
52
51
|
const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
|
|
53
52
|
return { calldata: calldata, value: BigInt(0).toString(10) };
|
|
54
53
|
};
|
|
55
54
|
|
|
56
55
|
export const encodeWithdrawPassivePoolAndBridge = (
|
|
57
|
-
owner: string,
|
|
58
56
|
poolId: number,
|
|
59
57
|
sharesAmount: bigint,
|
|
60
58
|
minOut: bigint,
|
|
61
59
|
sig: EIP712Signature,
|
|
62
60
|
socketMsgGasLimit: bigint,
|
|
63
61
|
socketConnector: string,
|
|
64
|
-
socketController: string,
|
|
65
62
|
receiver: string,
|
|
66
63
|
): MethodParameters => {
|
|
67
64
|
const functionSignature = 'withdrawPassivePool';
|
|
68
65
|
const parameters = [
|
|
69
66
|
{
|
|
70
|
-
owner,
|
|
71
67
|
poolId,
|
|
72
68
|
sharesAmount,
|
|
73
69
|
minOut,
|
|
74
70
|
sig,
|
|
75
71
|
socketMsgGasLimit,
|
|
76
72
|
socketConnector,
|
|
77
|
-
socketController,
|
|
78
73
|
receiver,
|
|
79
74
|
},
|
|
80
75
|
];
|
|
@@ -102,7 +97,7 @@ export const encodeBridgeAndDepositPassivePool = (
|
|
|
102
97
|
socketConnector: fallbackSocketConnector,
|
|
103
98
|
};
|
|
104
99
|
const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
|
|
105
|
-
'depositPassivePool',
|
|
100
|
+
'depositPassivePool((uint128,address,uint256,uint256),(uint256,address))',
|
|
106
101
|
[inputs, fallbackData],
|
|
107
102
|
);
|
|
108
103
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getSocketBridgeTime,
|
|
3
3
|
getSocketWithdrawFees,
|
|
4
|
-
|
|
4
|
+
getTokenInfoByAddress,
|
|
5
5
|
} from '@reyaxyz/common';
|
|
6
6
|
import {
|
|
7
7
|
SimulateWithdrawPassivePoolAndBridgeParams,
|
|
@@ -21,7 +21,7 @@ export const simulateWithdrawPassivePoolAndBridge = (
|
|
|
21
21
|
tokenAddress: params.tokenAddress,
|
|
22
22
|
});
|
|
23
23
|
|
|
24
|
-
const feesUnderlyingToken =
|
|
24
|
+
const feesUnderlyingToken = getTokenInfoByAddress(params.tokenAddress).name;
|
|
25
25
|
|
|
26
26
|
const result: SimulateWithdrawPassivePoolAndBridgeResult = {
|
|
27
27
|
fees: fees.fees,
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import {
|
|
2
2
|
getCurrentTimestampInSeconds,
|
|
3
3
|
scale,
|
|
4
|
-
|
|
4
|
+
ReyaChainId,
|
|
5
|
+
getTokenInfoByAddress,
|
|
5
6
|
} from '@reyaxyz/common';
|
|
6
|
-
import { ContractType } from '../../utils/contractAddresses';
|
|
7
|
+
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
7
8
|
import { executeTransaction } from '../executeTransaction';
|
|
8
9
|
import { signCoreCommands } from '../sign';
|
|
9
10
|
import { encodeTransferFromMAToPool } from './encode';
|
|
@@ -12,30 +13,36 @@ import {
|
|
|
12
13
|
TransferFromMAToPoolResult,
|
|
13
14
|
} from './types';
|
|
14
15
|
import { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';
|
|
16
|
+
import { MultiAction } from '../../utils/action';
|
|
17
|
+
import { encodeSingleWithdraw } from '../encode';
|
|
15
18
|
|
|
16
19
|
export const transferFromMAToPool = async (
|
|
17
20
|
params: TransferFromMAToPoolParams,
|
|
18
21
|
): Promise<TransferFromMAToPoolResult> => {
|
|
19
22
|
const network = await params.signer.provider?.getNetwork();
|
|
20
|
-
const
|
|
23
|
+
const reyaChainId: ReyaChainId = Number(network?.chainId);
|
|
21
24
|
|
|
25
|
+
const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);
|
|
26
|
+
const amount = scale(tokenInfo.decimals)(params.amount);
|
|
27
|
+
|
|
28
|
+
// transfer from MA to pool involves a core withdrawal
|
|
29
|
+
const multiAction = new MultiAction();
|
|
30
|
+
encodeSingleWithdraw(params.pool.tokenAddress, amount, multiAction);
|
|
22
31
|
const eip712Signature = await signCoreCommands(
|
|
23
32
|
params.signer,
|
|
24
|
-
|
|
33
|
+
reyaChainId,
|
|
34
|
+
getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),
|
|
25
35
|
params.marginAccountId,
|
|
26
|
-
|
|
36
|
+
multiAction.commands,
|
|
37
|
+
params.owner.coreSigNonce + 1,
|
|
27
38
|
getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
|
|
28
39
|
);
|
|
29
40
|
|
|
30
|
-
const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);
|
|
31
|
-
const amount = scale(tokenDecimals)(params.amount);
|
|
32
|
-
|
|
33
41
|
const { calldata: data, value } = encodeTransferFromMAToPool(
|
|
34
42
|
params.marginAccountId,
|
|
35
43
|
amount,
|
|
36
44
|
eip712Signature,
|
|
37
45
|
params.pool.id,
|
|
38
|
-
params.owner.address,
|
|
39
46
|
BigInt(0),
|
|
40
47
|
);
|
|
41
48
|
|
|
@@ -43,7 +50,7 @@ export const transferFromMAToPool = async (
|
|
|
43
50
|
params.signer,
|
|
44
51
|
data,
|
|
45
52
|
value,
|
|
46
|
-
|
|
53
|
+
reyaChainId,
|
|
47
54
|
ContractType.PERIPHERY_PROXY,
|
|
48
55
|
);
|
|
49
56
|
|
package/src/services/lp/types.ts
CHANGED
|
@@ -31,7 +31,7 @@ export type RemoveLiquidityResult = {
|
|
|
31
31
|
|
|
32
32
|
export type TransferFromMAToPoolParams = {
|
|
33
33
|
signer: Signer | JsonRpcSigner;
|
|
34
|
-
owner: Pick<OwnerMetadataEntity, '
|
|
34
|
+
owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;
|
|
35
35
|
marginAccountId: MarginAccountEntity['id'];
|
|
36
36
|
pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;
|
|
37
37
|
amount: number;
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { ContractType } from '../../utils/contractAddresses';
|
|
1
|
+
import { ContractType, getAddress } from '../../utils/contractAddresses';
|
|
2
2
|
import { executeTransaction } from '../executeTransaction';
|
|
3
3
|
import { signPoolRemoveLiquidity } from '../sign';
|
|
4
4
|
import {
|
|
@@ -10,8 +10,7 @@ import {
|
|
|
10
10
|
ReyaChainId,
|
|
11
11
|
getCurrentTimestampInSeconds,
|
|
12
12
|
getSocketConnectors,
|
|
13
|
-
|
|
14
|
-
getTokenDetails,
|
|
13
|
+
getTokenInfoByAddress,
|
|
15
14
|
scale,
|
|
16
15
|
} from '@reyaxyz/common';
|
|
17
16
|
import { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';
|
|
@@ -33,18 +32,18 @@ export const withdrawPassivePoolAndBridge = async (
|
|
|
33
32
|
const eip712Signature = await signPoolRemoveLiquidity(
|
|
34
33
|
params.signer,
|
|
35
34
|
reyaChainId,
|
|
35
|
+
getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),
|
|
36
36
|
params.owner.address,
|
|
37
37
|
params.pool.id,
|
|
38
38
|
sharesAmount,
|
|
39
39
|
BigInt(0),
|
|
40
|
-
params.owner.poolSigNonce,
|
|
40
|
+
params.owner.poolSigNonce + 1,
|
|
41
41
|
getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
|
|
42
42
|
);
|
|
43
43
|
|
|
44
|
-
const
|
|
44
|
+
const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);
|
|
45
45
|
|
|
46
46
|
const { calldata: data, value } = encodeWithdrawPassivePoolAndBridge(
|
|
47
|
-
params.owner.address,
|
|
48
47
|
params.pool.id,
|
|
49
48
|
sharesAmount,
|
|
50
49
|
BigInt(0),
|
|
@@ -52,12 +51,8 @@ export const withdrawPassivePoolAndBridge = async (
|
|
|
52
51
|
BigInt('10000000'), //todo
|
|
53
52
|
getSocketConnectors({
|
|
54
53
|
moneyInOutChainId: params.moneyInOutChainId,
|
|
55
|
-
tokenName:
|
|
54
|
+
tokenName: tokenInfo.name,
|
|
56
55
|
}).withdraw,
|
|
57
|
-
getSocketController({
|
|
58
|
-
reyaChainId: reyaChainId,
|
|
59
|
-
tokenName: tokenName,
|
|
60
|
-
}),
|
|
61
56
|
params.owner.address,
|
|
62
57
|
);
|
|
63
58
|
|