@sodax/sdk 0.0.1-rc.2 → 0.0.1-rc.4
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 +2 -0
- package/dist/constants.d.ts +17 -32
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +67 -67
- package/dist/constants.js.map +1 -1
- package/dist/constants.test.js +3 -2
- package/dist/constants.test.js.map +1 -1
- package/dist/entities/Providers.d.ts +3 -10
- package/dist/entities/Providers.d.ts.map +1 -1
- package/dist/entities/Providers.js +2 -2
- package/dist/entities/Providers.js.map +1 -1
- package/dist/entities/Sodax.test.js +120 -104
- package/dist/entities/Sodax.test.js.map +1 -1
- package/dist/entities/cosmos/CWSpokeProvider.d.ts +2 -1
- package/dist/entities/cosmos/CWSpokeProvider.d.ts.map +1 -1
- package/dist/entities/cosmos/CWSpokeProvider.js.map +1 -1
- package/dist/entities/cosmos/CosmosWalletProvider.d.ts +2 -2
- package/dist/entities/cosmos/CosmosWalletProvider.d.ts.map +1 -1
- package/dist/entities/cosmos/CosmosWalletProvider.js +4 -4
- package/dist/entities/cosmos/CosmosWalletProvider.js.map +1 -1
- package/dist/entities/cosmos/InjectiveWalletProvider.d.ts +2 -2
- package/dist/entities/cosmos/InjectiveWalletProvider.d.ts.map +1 -1
- package/dist/entities/cosmos/InjectiveWalletProvider.js +4 -4
- package/dist/entities/cosmos/InjectiveWalletProvider.js.map +1 -1
- package/dist/entities/icon/IconSpokeProvider.d.ts +5 -3
- package/dist/entities/icon/IconSpokeProvider.d.ts.map +1 -1
- package/dist/entities/icon/IconSpokeProvider.js +4 -1
- package/dist/entities/icon/IconSpokeProvider.js.map +1 -1
- package/dist/entities/icon/index.d.ts +0 -1
- package/dist/entities/icon/index.d.ts.map +1 -1
- package/dist/entities/icon/index.js +0 -1
- package/dist/entities/icon/index.js.map +1 -1
- package/dist/entities/index.d.ts +0 -1
- package/dist/entities/index.d.ts.map +1 -1
- package/dist/entities/index.js +0 -1
- package/dist/entities/index.js.map +1 -1
- package/dist/entities/solana/SolanaWalletProvider.d.ts +3 -3
- package/dist/entities/solana/SolanaWalletProvider.d.ts.map +1 -1
- package/dist/entities/solana/SolanaWalletProvider.js +3 -3
- package/dist/entities/solana/SolanaWalletProvider.js.map +1 -1
- package/dist/entities/solana/utils/utils.js +2 -1
- package/dist/entities/solana/utils/utils.js.map +1 -1
- package/dist/entities/stellar/StellarSpokeProvider.d.ts +4 -11
- package/dist/entities/stellar/StellarSpokeProvider.d.ts.map +1 -1
- package/dist/entities/stellar/StellarSpokeProvider.js +27 -31
- package/dist/entities/stellar/StellarSpokeProvider.js.map +1 -1
- package/dist/entities/sui/SuiSpokeProvider.d.ts +6 -5
- package/dist/entities/sui/SuiSpokeProvider.d.ts.map +1 -1
- package/dist/entities/sui/SuiSpokeProvider.js +9 -7
- package/dist/entities/sui/SuiSpokeProvider.js.map +1 -1
- package/dist/guards.js +8 -8
- package/dist/guards.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/services/hub/EvmAssetManagerService.d.ts +2 -1
- package/dist/services/hub/EvmAssetManagerService.d.ts.map +1 -1
- package/dist/services/hub/EvmAssetManagerService.js.map +1 -1
- package/dist/services/hub/EvmVaultTokenService.d.ts.map +1 -1
- package/dist/services/hub/EvmVaultTokenService.js +4 -2
- package/dist/services/hub/EvmVaultTokenService.js.map +1 -1
- package/dist/services/hub/EvmWalletAbstraction.d.ts +2 -1
- package/dist/services/hub/EvmWalletAbstraction.d.ts.map +1 -1
- package/dist/services/hub/EvmWalletAbstraction.js.map +1 -1
- package/dist/services/intentRelay/IntentRelayApiService.d.ts +2 -1
- package/dist/services/intentRelay/IntentRelayApiService.d.ts.map +1 -1
- package/dist/services/intentRelay/IntentRelayApiService.js.map +1 -1
- package/dist/services/moneyMarket/MoneyMarketService.d.ts +267 -63
- package/dist/services/moneyMarket/MoneyMarketService.d.ts.map +1 -1
- package/dist/services/moneyMarket/MoneyMarketService.js +283 -73
- package/dist/services/moneyMarket/MoneyMarketService.js.map +1 -1
- package/dist/services/moneyMarket/MoneyMarketService.test.js +36 -19
- package/dist/services/moneyMarket/MoneyMarketService.test.js.map +1 -1
- package/dist/services/shared/Erc20Service.d.ts +6 -5
- package/dist/services/shared/Erc20Service.d.ts.map +1 -1
- package/dist/services/shared/Erc20Service.js +7 -6
- package/dist/services/shared/Erc20Service.js.map +1 -1
- package/dist/services/solver/SolverApiService.test.js +2 -1
- package/dist/services/solver/SolverApiService.test.js.map +1 -1
- package/dist/services/solver/SolverService.d.ts +138 -37
- package/dist/services/solver/SolverService.d.ts.map +1 -1
- package/dist/services/solver/SolverService.js +146 -41
- package/dist/services/solver/SolverService.js.map +1 -1
- package/dist/services/solver/SolverService.test.js +89 -143
- package/dist/services/solver/SolverService.test.js.map +1 -1
- package/dist/services/spoke/CWSpokeService.d.ts +1 -1
- package/dist/services/spoke/CWSpokeService.d.ts.map +1 -1
- package/dist/services/spoke/CWSpokeService.js +2 -2
- package/dist/services/spoke/CWSpokeService.js.map +1 -1
- package/dist/services/spoke/EvmSpokeService.d.ts +3 -2
- package/dist/services/spoke/EvmSpokeService.d.ts.map +1 -1
- package/dist/services/spoke/EvmSpokeService.js +4 -2
- package/dist/services/spoke/EvmSpokeService.js.map +1 -1
- package/dist/services/spoke/IconSpokeService.d.ts +4 -3
- package/dist/services/spoke/IconSpokeService.d.ts.map +1 -1
- package/dist/services/spoke/IconSpokeService.js +28 -15
- package/dist/services/spoke/IconSpokeService.js.map +1 -1
- package/dist/services/spoke/SolanaSpokeService.d.ts +3 -2
- package/dist/services/spoke/SolanaSpokeService.d.ts.map +1 -1
- package/dist/services/spoke/SolanaSpokeService.js.map +1 -1
- package/dist/services/spoke/SpokeService.d.ts +2 -1
- package/dist/services/spoke/SpokeService.d.ts.map +1 -1
- package/dist/services/spoke/SpokeService.js.map +1 -1
- package/dist/services/spoke/StellarSpokeService.d.ts +1 -1
- package/dist/services/spoke/StellarSpokeService.d.ts.map +1 -1
- package/dist/services/spoke/SuiSpokeService.d.ts +1 -1
- package/dist/services/spoke/SuiSpokeService.d.ts.map +1 -1
- package/dist/tests/services/hub/EvmAssetManagerService.test.js +45 -30
- package/dist/tests/services/hub/EvmAssetManagerService.test.js.map +1 -1
- package/dist/tests/services/spoke/EvmSpokeService.test.js +7 -6
- package/dist/tests/services/spoke/EvmSpokeService.test.js.map +1 -1
- package/dist/types.d.ts +28 -71
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js.map +1 -1
- package/dist/utils/evm-utils.d.ts +2 -2
- package/dist/utils/evm-utils.d.ts.map +1 -1
- package/dist/utils/shared-utils.d.ts +2 -1
- package/dist/utils/shared-utils.d.ts.map +1 -1
- package/dist/utils/shared-utils.js +3 -0
- package/dist/utils/shared-utils.js.map +1 -1
- package/package.json +3 -3
- package/dist/entities/icon/IconWalletProvider.d.ts +0 -12
- package/dist/entities/icon/IconWalletProvider.d.ts.map +0 -1
- package/dist/entities/icon/IconWalletProvider.js +0 -34
- package/dist/entities/icon/IconWalletProvider.js.map +0 -1
- package/dist/entities/sui/SuiWalletProvider.d.ts +0 -15
- package/dist/entities/sui/SuiWalletProvider.d.ts.map +0 -1
- package/dist/entities/sui/SuiWalletProvider.js +0 -43
- package/dist/entities/sui/SuiWalletProvider.js.map +0 -1
- package/dist/interfaces.d.ts +0 -8
- package/dist/interfaces.d.ts.map +0 -1
- package/dist/interfaces.js +0 -2
- package/dist/interfaces.js.map +0 -1
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { afterEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
-
import {
|
|
2
|
+
import { EvmHubProvider, EvmSpokeProvider, IntentErrorCode, SolverService, getHubAssetInfo, getHubChainConfig, getIntentRelayChainId, spokeChainConfig, } from '../../index.js';
|
|
3
3
|
import * as IntentRelayApiService from '../intentRelay/IntentRelayApiService.js';
|
|
4
4
|
import { EvmWalletAbstraction } from '../hub/EvmWalletAbstraction.js';
|
|
5
5
|
import { EvmSolverService } from './EvmSolverService.js';
|
|
6
|
+
import { ARBITRUM_MAINNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID, SONIC_MAINNET_CHAIN_ID } from '@sodax/types';
|
|
6
7
|
describe('SolverService', () => {
|
|
7
8
|
const mockIntentsContract = '0x0987654321098765432109876543210987654321';
|
|
8
9
|
const bscEthToken = '0x2170Ed0880ac9A755fd29B2688956BD959F933F8';
|
|
@@ -49,8 +50,8 @@ describe('SolverService', () => {
|
|
|
49
50
|
}, mockHubProvider);
|
|
50
51
|
const mockEvmWalletProvider = {
|
|
51
52
|
sendTransaction: vi.fn(),
|
|
52
|
-
getWalletAddress: vi.fn().
|
|
53
|
-
getWalletAddressBytes: vi.fn().
|
|
53
|
+
getWalletAddress: vi.fn().mockResolvedValue('0x9999999999999999999999999999999999999999'),
|
|
54
|
+
getWalletAddressBytes: vi.fn().mockResolvedValue('0x9999999999999999999999999999999999999999'),
|
|
54
55
|
waitForTransactionReceipt: vi.fn(),
|
|
55
56
|
};
|
|
56
57
|
const mockFee = {
|
|
@@ -58,11 +59,60 @@ describe('SolverService', () => {
|
|
|
58
59
|
amount: feeAmount,
|
|
59
60
|
};
|
|
60
61
|
const mockBscSpokeProvider = new EvmSpokeProvider(mockEvmWalletProvider, spokeChainConfig[BSC_MAINNET_CHAIN_ID]);
|
|
61
|
-
const mockIntentConfig = {
|
|
62
|
-
intentsContract: mockIntentsContract,
|
|
63
|
-
solverApiEndpoint: 'https://staging-new-world.iconblockchain.xyz',
|
|
64
|
-
};
|
|
65
62
|
const mockCreatorHubWalletAddress = '0x1234567890123456789012345678901234567890';
|
|
63
|
+
const mockPacketData = {
|
|
64
|
+
src_chain_id: Number(getIntentRelayChainId(BSC_MAINNET_CHAIN_ID)), // BSC chain ID
|
|
65
|
+
src_tx_hash: '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
|
|
66
|
+
src_address: '0x1234567890123456789012345678901234567890',
|
|
67
|
+
status: 'executed',
|
|
68
|
+
dst_chain_id: Number(getIntentRelayChainId(ARBITRUM_MAINNET_CHAIN_ID)), // Arbitrum chain ID
|
|
69
|
+
conn_sn: 1,
|
|
70
|
+
dst_address: '0x1234567890123456789012345678901234567890',
|
|
71
|
+
dst_tx_hash: '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
|
|
72
|
+
signatures: ['0x1234567890123456789012345678901234567890'],
|
|
73
|
+
payload: '0x',
|
|
74
|
+
};
|
|
75
|
+
// Helper function to create mock intent params with resolved addresses
|
|
76
|
+
const createMockIntentParams = async () => {
|
|
77
|
+
const srcAddress = await mockEvmWalletProvider.getWalletAddressBytes();
|
|
78
|
+
const dstAddress = await mockEvmWalletProvider.getWalletAddressBytes();
|
|
79
|
+
return {
|
|
80
|
+
inputToken: bscEthToken,
|
|
81
|
+
outputToken: arbWbtcToken,
|
|
82
|
+
inputAmount: BigInt(1000000),
|
|
83
|
+
minOutputAmount: BigInt(900000),
|
|
84
|
+
deadline: BigInt(0),
|
|
85
|
+
allowPartialFill: false,
|
|
86
|
+
srcChain: BSC_MAINNET_CHAIN_ID,
|
|
87
|
+
dstChain: ARBITRUM_MAINNET_CHAIN_ID,
|
|
88
|
+
srcAddress,
|
|
89
|
+
dstAddress,
|
|
90
|
+
solver: '0x0000000000000000000000000000000000000000',
|
|
91
|
+
data: '0x',
|
|
92
|
+
};
|
|
93
|
+
};
|
|
94
|
+
// Helper function to create mock intent with resolved addresses
|
|
95
|
+
const createMockIntent = async (params) => {
|
|
96
|
+
const creator = await mockBscSpokeProvider.walletProvider.getWalletAddress();
|
|
97
|
+
const srcAddress = await mockEvmWalletProvider.getWalletAddressBytes();
|
|
98
|
+
const dstAddress = await mockEvmWalletProvider.getWalletAddressBytes();
|
|
99
|
+
return {
|
|
100
|
+
intentId: BigInt(1),
|
|
101
|
+
creator: creator,
|
|
102
|
+
inputToken: getHubAssetInfo(params.srcChain, params.inputToken)?.asset ?? '0x',
|
|
103
|
+
outputToken: getHubAssetInfo(params.dstChain, params.outputToken)?.asset ?? '0x',
|
|
104
|
+
inputAmount: params.inputAmount,
|
|
105
|
+
minOutputAmount: params.minOutputAmount,
|
|
106
|
+
deadline: params.deadline,
|
|
107
|
+
allowPartialFill: params.allowPartialFill,
|
|
108
|
+
srcChain: getIntentRelayChainId(params.srcChain),
|
|
109
|
+
dstChain: getIntentRelayChainId(params.dstChain),
|
|
110
|
+
srcAddress,
|
|
111
|
+
dstAddress,
|
|
112
|
+
solver: params.solver,
|
|
113
|
+
data: params.data,
|
|
114
|
+
};
|
|
115
|
+
};
|
|
66
116
|
afterEach(() => {
|
|
67
117
|
vi.clearAllMocks();
|
|
68
118
|
vi.restoreAllMocks();
|
|
@@ -243,56 +293,16 @@ describe('SolverService', () => {
|
|
|
243
293
|
});
|
|
244
294
|
});
|
|
245
295
|
describe('createAndSubmitIntent', () => {
|
|
246
|
-
const mockCreateIntentParams = {
|
|
247
|
-
inputToken: bscEthToken,
|
|
248
|
-
outputToken: arbWbtcToken,
|
|
249
|
-
inputAmount: BigInt(1000000),
|
|
250
|
-
minOutputAmount: BigInt(900000),
|
|
251
|
-
deadline: BigInt(0),
|
|
252
|
-
allowPartialFill: false,
|
|
253
|
-
srcChain: BSC_MAINNET_CHAIN_ID,
|
|
254
|
-
dstChain: ARBITRUM_MAINNET_CHAIN_ID,
|
|
255
|
-
srcAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
256
|
-
dstAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
257
|
-
solver: '0x0000000000000000000000000000000000000000',
|
|
258
|
-
data: '0x',
|
|
259
|
-
};
|
|
260
|
-
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
261
|
-
const mockIntent = {
|
|
262
|
-
intentId: BigInt(1),
|
|
263
|
-
creator: mockBscSpokeProvider.walletProvider.getWalletAddress(),
|
|
264
|
-
inputToken: getHubAssetInfo(mockCreateIntentParams.srcChain, mockCreateIntentParams.inputToken)?.asset ?? '0x',
|
|
265
|
-
outputToken: getHubAssetInfo(mockCreateIntentParams.dstChain, mockCreateIntentParams.outputToken)?.asset ?? '0x',
|
|
266
|
-
inputAmount: mockCreateIntentParams.inputAmount,
|
|
267
|
-
minOutputAmount: mockCreateIntentParams.minOutputAmount,
|
|
268
|
-
deadline: mockCreateIntentParams.deadline,
|
|
269
|
-
allowPartialFill: mockCreateIntentParams.allowPartialFill,
|
|
270
|
-
srcChain: getIntentRelayChainId(mockCreateIntentParams.srcChain),
|
|
271
|
-
dstChain: getIntentRelayChainId(mockCreateIntentParams.dstChain),
|
|
272
|
-
srcAddress: mockCreateIntentParams.srcAddress,
|
|
273
|
-
dstAddress: mockCreateIntentParams.dstAddress,
|
|
274
|
-
solver: mockCreateIntentParams.solver,
|
|
275
|
-
data: mockCreateIntentParams.data,
|
|
276
|
-
feeAmount: feeAmount,
|
|
277
|
-
};
|
|
278
|
-
const mockPacketData = {
|
|
279
|
-
src_chain_id: Number(getIntentRelayChainId(BSC_MAINNET_CHAIN_ID)), // BSC chain ID
|
|
280
|
-
src_tx_hash: '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
|
|
281
|
-
src_address: '0x1234567890123456789012345678901234567890',
|
|
282
|
-
status: 'executed',
|
|
283
|
-
dst_chain_id: Number(getIntentRelayChainId(ARBITRUM_MAINNET_CHAIN_ID)), // Arbitrum chain ID
|
|
284
|
-
conn_sn: 1,
|
|
285
|
-
dst_address: '0x1234567890123456789012345678901234567890',
|
|
286
|
-
dst_tx_hash: '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890',
|
|
287
|
-
signatures: ['0x1234567890123456789012345678901234567890'],
|
|
288
|
-
payload: '0x',
|
|
289
|
-
};
|
|
290
296
|
it('should successfully create and submit an intent', async () => {
|
|
297
|
+
const mockCreateIntentParams = await createMockIntentParams();
|
|
298
|
+
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
299
|
+
const mockIntent = await createMockIntent(mockCreateIntentParams);
|
|
300
|
+
const mockIntentWithFee = { ...mockIntent, feeAmount };
|
|
291
301
|
vi.spyOn(solverService, 'createIntent').mockResolvedValueOnce({
|
|
292
302
|
ok: true,
|
|
293
|
-
value: [mockTxHash,
|
|
303
|
+
value: [mockTxHash, mockIntentWithFee],
|
|
294
304
|
});
|
|
295
|
-
vi.spyOn(EvmWalletAbstraction, 'getUserHubWalletAddress').mockResolvedValueOnce(
|
|
305
|
+
vi.spyOn(EvmWalletAbstraction, 'getUserHubWalletAddress').mockResolvedValueOnce(mockCreatorHubWalletAddress);
|
|
296
306
|
vi.spyOn(IntentRelayApiService, 'submitTransaction').mockResolvedValueOnce({
|
|
297
307
|
success: true,
|
|
298
308
|
message: 'Transaction submitted successfully',
|
|
@@ -313,7 +323,7 @@ describe('SolverService', () => {
|
|
|
313
323
|
if (result.ok) {
|
|
314
324
|
expect(result.value).toBeDefined();
|
|
315
325
|
expect(result.value[0]).toBeDefined();
|
|
316
|
-
expect(result.value[1]).toEqual(
|
|
326
|
+
expect(result.value[1]).toEqual(mockIntentWithFee);
|
|
317
327
|
}
|
|
318
328
|
expect(solverService['createIntent']).toHaveBeenCalledWith(mockCreateIntentParams, mockBscSpokeProvider, mockFee, false);
|
|
319
329
|
expect(solverService['postExecution']).toHaveBeenCalledWith({
|
|
@@ -322,6 +332,7 @@ describe('SolverService', () => {
|
|
|
322
332
|
expect(IntentRelayApiService.submitTransaction).toHaveBeenCalled();
|
|
323
333
|
});
|
|
324
334
|
it('should handle postExecution error', async () => {
|
|
335
|
+
const mockCreateIntentParams = await createMockIntentParams();
|
|
325
336
|
vi.spyOn(solverService, 'postExecution').mockResolvedValueOnce({
|
|
326
337
|
ok: false,
|
|
327
338
|
error: {
|
|
@@ -338,6 +349,9 @@ describe('SolverService', () => {
|
|
|
338
349
|
}
|
|
339
350
|
});
|
|
340
351
|
it('should handle submitTransaction error', async () => {
|
|
352
|
+
const mockCreateIntentParams = await createMockIntentParams();
|
|
353
|
+
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
354
|
+
const mockIntent = await createMockIntent(mockCreateIntentParams);
|
|
341
355
|
vi.spyOn(solverService, 'createIntent').mockResolvedValueOnce({
|
|
342
356
|
ok: true,
|
|
343
357
|
value: [mockTxHash, { ...mockIntent, feeAmount: feeAmount }],
|
|
@@ -373,119 +387,51 @@ describe('SolverService', () => {
|
|
|
373
387
|
});
|
|
374
388
|
});
|
|
375
389
|
describe('createIntent', () => {
|
|
376
|
-
const mockCreateIntentParams = {
|
|
377
|
-
inputToken: bscEthToken,
|
|
378
|
-
outputToken: arbWbtcToken,
|
|
379
|
-
inputAmount: BigInt(1000000),
|
|
380
|
-
minOutputAmount: BigInt(900000),
|
|
381
|
-
deadline: BigInt(0),
|
|
382
|
-
allowPartialFill: false,
|
|
383
|
-
srcChain: BSC_MAINNET_CHAIN_ID,
|
|
384
|
-
dstChain: ARBITRUM_MAINNET_CHAIN_ID,
|
|
385
|
-
srcAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
386
|
-
dstAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
387
|
-
solver: '0x0000000000000000000000000000000000000000',
|
|
388
|
-
data: '0x',
|
|
389
|
-
};
|
|
390
|
-
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
391
|
-
const [, intent, feeAmount] = EvmSolverService.constructCreateIntentData(mockCreateIntentParams, mockCreatorHubWalletAddress, mockIntentConfig, mockFee);
|
|
392
390
|
it('should successfully create an intent for EVM chain', async () => {
|
|
391
|
+
const mockCreateIntentParams = await createMockIntentParams();
|
|
392
|
+
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
393
|
+
const mockIntent = await createMockIntent(mockCreateIntentParams);
|
|
394
|
+
const mockIntentWithFee = { ...mockIntent, feeAmount };
|
|
393
395
|
vi.spyOn(solverService, 'createIntent').mockResolvedValueOnce({
|
|
394
396
|
ok: true,
|
|
395
|
-
value: [mockTxHash,
|
|
397
|
+
value: [mockTxHash, mockIntentWithFee],
|
|
396
398
|
});
|
|
397
399
|
vi.spyOn(EvmWalletAbstraction, 'getUserHubWalletAddress').mockResolvedValueOnce(mockCreatorHubWalletAddress);
|
|
398
400
|
const result = await solverService.createIntent(mockCreateIntentParams, mockBscSpokeProvider, mockFee, false);
|
|
399
|
-
|
|
400
|
-
|
|
401
|
+
expect(result.ok).toBe(true);
|
|
402
|
+
if (result.ok) {
|
|
403
|
+
const [txHash, resultingIntent] = result.value;
|
|
404
|
+
expect(txHash).toBe(mockTxHash);
|
|
405
|
+
expect(resultingIntent).toEqual(mockIntentWithFee);
|
|
401
406
|
}
|
|
402
|
-
const [txHash, resultingIntent] = result.value;
|
|
403
|
-
expect(txHash).toBeDefined();
|
|
404
|
-
expect(txHash).toBe(mockTxHash);
|
|
405
|
-
resultingIntent.intentId = intent.intentId;
|
|
406
|
-
expect(resultingIntent).toEqual({ ...intent, feeAmount });
|
|
407
407
|
});
|
|
408
408
|
});
|
|
409
409
|
describe('cancelIntent', () => {
|
|
410
|
-
const mockCreateIntentParams = {
|
|
411
|
-
inputToken: bscEthToken,
|
|
412
|
-
outputToken: arbWbtcToken,
|
|
413
|
-
inputAmount: BigInt(1000000),
|
|
414
|
-
minOutputAmount: BigInt(900000),
|
|
415
|
-
deadline: BigInt(0),
|
|
416
|
-
allowPartialFill: false,
|
|
417
|
-
srcChain: BSC_MAINNET_CHAIN_ID,
|
|
418
|
-
dstChain: ARBITRUM_MAINNET_CHAIN_ID,
|
|
419
|
-
srcAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
420
|
-
dstAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
421
|
-
solver: '0x0000000000000000000000000000000000000000',
|
|
422
|
-
data: '0x',
|
|
423
|
-
};
|
|
424
|
-
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
425
|
-
const [, intent] = EvmSolverService.constructCreateIntentData(mockCreateIntentParams, mockCreatorHubWalletAddress, mockIntentConfig, mockFee);
|
|
426
410
|
it('should successfully cancel an intent for EVM chain', async () => {
|
|
411
|
+
const mockCreateIntentParams = await createMockIntentParams();
|
|
412
|
+
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
413
|
+
const mockIntent = await createMockIntent(mockCreateIntentParams);
|
|
427
414
|
vi.spyOn(solverService, 'cancelIntent').mockResolvedValueOnce(mockTxHash);
|
|
428
|
-
const result = await solverService.cancelIntent(
|
|
415
|
+
const result = await solverService.cancelIntent(mockIntent, mockBscSpokeProvider, false);
|
|
429
416
|
expect(result).toBe(mockTxHash);
|
|
430
417
|
});
|
|
431
418
|
});
|
|
432
419
|
describe('getIntent', () => {
|
|
433
|
-
const mockCreateIntentParams = {
|
|
434
|
-
inputToken: bscEthToken,
|
|
435
|
-
outputToken: arbWbtcToken,
|
|
436
|
-
inputAmount: BigInt(1000000),
|
|
437
|
-
minOutputAmount: BigInt(900000),
|
|
438
|
-
deadline: BigInt(0),
|
|
439
|
-
allowPartialFill: false,
|
|
440
|
-
srcChain: BSC_MAINNET_CHAIN_ID,
|
|
441
|
-
dstChain: ARBITRUM_MAINNET_CHAIN_ID,
|
|
442
|
-
srcAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
443
|
-
dstAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
444
|
-
solver: '0x0000000000000000000000000000000000000000',
|
|
445
|
-
data: '0x',
|
|
446
|
-
};
|
|
447
|
-
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
448
|
-
const mockIntent = {
|
|
449
|
-
intentId: BigInt(1),
|
|
450
|
-
creator: mockBscSpokeProvider.walletProvider.getWalletAddress(),
|
|
451
|
-
inputToken: getHubAssetInfo(mockCreateIntentParams.srcChain, mockCreateIntentParams.inputToken)?.asset ?? '0x',
|
|
452
|
-
outputToken: getHubAssetInfo(mockCreateIntentParams.dstChain, mockCreateIntentParams.outputToken)?.asset ?? '0x',
|
|
453
|
-
inputAmount: mockCreateIntentParams.inputAmount,
|
|
454
|
-
minOutputAmount: mockCreateIntentParams.minOutputAmount,
|
|
455
|
-
deadline: mockCreateIntentParams.deadline,
|
|
456
|
-
allowPartialFill: mockCreateIntentParams.allowPartialFill,
|
|
457
|
-
srcChain: getIntentRelayChainId(mockCreateIntentParams.srcChain),
|
|
458
|
-
dstChain: getIntentRelayChainId(mockCreateIntentParams.dstChain),
|
|
459
|
-
srcAddress: mockCreateIntentParams.srcAddress,
|
|
460
|
-
dstAddress: mockCreateIntentParams.dstAddress,
|
|
461
|
-
solver: mockCreateIntentParams.solver,
|
|
462
|
-
data: mockCreateIntentParams.data,
|
|
463
|
-
};
|
|
464
420
|
it('should successfully get an intent for EVM chain', async () => {
|
|
421
|
+
const mockCreateIntentParams = await createMockIntentParams();
|
|
422
|
+
const mockTxHash = '0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890';
|
|
423
|
+
const mockIntent = await createMockIntent(mockCreateIntentParams);
|
|
465
424
|
vi.spyOn(EvmSolverService, 'getIntent').mockResolvedValueOnce(mockIntent);
|
|
466
425
|
const result = await solverService.getIntent(mockTxHash);
|
|
467
426
|
expect(result).toEqual(mockIntent);
|
|
468
427
|
});
|
|
469
428
|
});
|
|
470
429
|
describe('getIntentHash', () => {
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
inputAmount: BigInt(1000000),
|
|
475
|
-
minOutputAmount: BigInt(900000),
|
|
476
|
-
deadline: BigInt(0),
|
|
477
|
-
allowPartialFill: false,
|
|
478
|
-
srcChain: BSC_MAINNET_CHAIN_ID,
|
|
479
|
-
dstChain: ARBITRUM_MAINNET_CHAIN_ID,
|
|
480
|
-
srcAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
481
|
-
dstAddress: mockEvmWalletProvider.getWalletAddressBytes(),
|
|
482
|
-
solver: '0x0000000000000000000000000000000000000000',
|
|
483
|
-
data: '0x',
|
|
484
|
-
};
|
|
485
|
-
const [, intent] = EvmSolverService.constructCreateIntentData(mockCreateIntentParams, mockCreatorHubWalletAddress, mockIntentConfig, mockFee);
|
|
486
|
-
it('should successfully get an intent hash', () => {
|
|
430
|
+
it('should successfully get an intent hash', async () => {
|
|
431
|
+
const mockCreateIntentParams = await createMockIntentParams();
|
|
432
|
+
const mockIntent = await createMockIntent(mockCreateIntentParams);
|
|
487
433
|
vi.spyOn(solverService, 'getIntentHash').mockReturnValueOnce('0x8196c6646c0d811b2ff19ffdf61533ad2d73d724fcd69c77ec243a908364a35e');
|
|
488
|
-
const result = solverService.getIntentHash(
|
|
434
|
+
const result = solverService.getIntentHash(mockIntent);
|
|
489
435
|
expect(result).toBe('0x8196c6646c0d811b2ff19ffdf61533ad2d73d724fcd69c77ec243a908364a35e');
|
|
490
436
|
});
|
|
491
437
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolverService.test.js","sourceRoot":"","sources":["../../../src/services/solver/SolverService.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"SolverService.test.js","sourceRoot":"","sources":["../../../src/services/solver/SolverService.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAEL,cAAc,EAEd,gBAAgB,EAIhB,eAAe,EAYf,aAAa,EACb,eAAe,EACf,iBAAiB,EACjB,qBAAqB,EAErB,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,KAAK,qBAAqB,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAKvG,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,MAAM,mBAAmB,GAAG,4CAA8D,CAAC;IAC3F,MAAM,WAAW,GAAG,4CAA4C,CAAC;IACjE,MAAM,YAAY,GAAG,4CAA4C,CAAC;IAElE,MAAM,gBAAgB,GAAG;QACvB,eAAe,EAAE,mBAAmB;QACpC,iBAAiB,EAAE,8CAA8C;KAC3C,CAAC;IAEzB,MAAM,aAAa,GAAG;QACpB,SAAS,EAAE,2BAA2B;QACtC,WAAW,EAAE,iBAAiB,CAAC,sBAAsB,CAAC;KACxB,CAAC;IAEjC,MAAM,eAAe,GAAG,IAAI,cAAc,CAAC,aAAa,CAAC,CAAC;IAE1D,MAAM,gBAAgB,GAAG;QACvB,SAAS,EAAE,WAAW;QACtB,SAAS,EAAE,YAAY;QACvB,uBAAuB,EAAE,oBAAoB;QAC7C,uBAAuB,EAAE,yBAAyB;QAClD,MAAM,EAAE,KAAK;QACb,UAAU,EAAE,aAAa;KACG,CAAC;IAE/B,MAAM,oBAAoB,GAAG;QAC3B,cAAc,EAAE,oEAAoE;KACpD,CAAC;IAEnC,MAAM,iBAAiB,GAAG;QACxB,cAAc,EAAE,oEAAoE;KACvD,CAAC;IAEhC,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,sBAAsB;IAC/C,MAAM,aAAa,GAAG,GAAG,CAAC,CAAC,SAAS;IAEpC,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,gBAAgB,EAAE,eAAe,CAAC,CAAC;IAC3E,MAAM,8BAA8B,GAAG,IAAI,aAAa,CACtD;QACE,GAAG,gBAAgB;QACnB,UAAU,EAAE;YACV,OAAO,EAAE,4CAA4C;YACrD,UAAU,EAAE,aAAa;SAC1B;KACF,EACD,eAAe,CAChB,CAAC;IACF,MAAM,0BAA0B,GAAG,IAAI,aAAa,CAClD;QACE,GAAG,gBAAgB;QACnB,UAAU,EAAE;YACV,OAAO,EAAE,4CAA4C;YACrD,MAAM,EAAE,SAAS;SAClB;KACF,EACD,eAAe,CAChB,CAAC;IAEF,MAAM,qBAAqB,GAAG;QAC5B,eAAe,EAAE,EAAE,CAAC,EAAE,EAAE;QACxB,gBAAgB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,4CAA6D,CAAC;QAC1G,qBAAqB,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,4CAA6D,CAAC;QAC/G,yBAAyB,EAAE,EAAE,CAAC,EAAE,EAAE;KACF,CAAC;IAEnC,MAAM,OAAO,GAAG;QACd,OAAO,EAAE,4CAA4C;QACrD,MAAM,EAAE,SAAS;KACG,CAAC;IAEvB,MAAM,oBAAoB,GAAG,IAAI,gBAAgB,CAAC,qBAAqB,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAEjH,MAAM,2BAA2B,GAAG,4CAA6D,CAAC;IAElG,MAAM,cAAc,GAAG;QACrB,YAAY,EAAE,MAAM,CAAC,qBAAqB,CAAC,oBAAoB,CAAC,CAAC,EAAE,eAAe;QAClF,WAAW,EAAE,oEAAoE;QACjF,WAAW,EAAE,4CAA4C;QACzD,MAAM,EAAE,UAAkC;QAC1C,YAAY,EAAE,MAAM,CAAC,qBAAqB,CAAC,yBAAyB,CAAC,CAAC,EAAE,oBAAoB;QAC5F,OAAO,EAAE,CAAC;QACV,WAAW,EAAE,4CAA4C;QACzD,WAAW,EAAE,oEAAoE;QACjF,UAAU,EAAE,CAAC,4CAA4C,CAAC;QAC1D,OAAO,EAAE,IAAI;KACO,CAAC;IAEvB,uEAAuE;IACvE,MAAM,sBAAsB,GAAG,KAAK,IAAiC,EAAE;QACrE,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,qBAAqB,EAAE,CAAC;QACvE,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,qBAAqB,EAAE,CAAC;QACvE,OAAO;YACL,UAAU,EAAE,WAAW;YACvB,WAAW,EAAE,YAAY;YACzB,WAAW,EAAE,MAAM,CAAC,OAAO,CAAC;YAC5B,eAAe,EAAE,MAAM,CAAC,MAAM,CAAC;YAC/B,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;YACnB,gBAAgB,EAAE,KAAK;YACvB,QAAQ,EAAE,oBAAoB;YAC9B,QAAQ,EAAE,yBAAyB;YACnC,UAAU;YACV,UAAU;YACV,MAAM,EAAE,4CAA4C;YACpD,IAAI,EAAE,IAAI;SACkB,CAAC;IACjC,CAAC,CAAC;IAEF,gEAAgE;IAChE,MAAM,gBAAgB,GAAG,KAAK,EAAE,MAA0B,EAAmB,EAAE;QAC7E,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QAC7E,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,qBAAqB,EAAE,CAAC;QACvE,MAAM,UAAU,GAAG,MAAM,qBAAqB,CAAC,qBAAqB,EAAE,CAAC;QAEvE,OAAO;YACL,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;YACnB,OAAO,EAAE,OAAwB;YACjC,UAAU,EAAE,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,EAAE,KAAK,IAAI,IAAI;YAC9E,WAAW,EAAE,eAAe,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,EAAE,KAAK,IAAI,IAAI;YAChF,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,eAAe,EAAE,MAAM,CAAC,eAAe;YACvC,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,gBAAgB,EAAE,MAAM,CAAC,gBAAgB;YACzC,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC;YAChD,QAAQ,EAAE,qBAAqB,CAAC,MAAM,CAAC,QAAQ,CAAC;YAChD,UAAU;YACV,UAAU;YACV,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,IAAI,EAAE,MAAM,CAAC,IAAI;SACD,CAAC;IACrB,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,eAAe,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,UAAU,EAAE,GAAG,EAAE;QACxB,EAAE,CAAC,2CAA2C,EAAE,KAAK,IAAI,EAAE;YACzD,sBAAsB;YACtB,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC;gBAC3C,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACjB,aAAa,EAAE,KAAK;oBACpB,IAAI,EAAE,sCAAsC;iBAC7C,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YAE9D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAChD,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAChC,GAAG,gBAAgB,CAAC,iBAAiB,QAAQ,EAC7C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aACzB,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,4BAA4B;YAC5B,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC;gBAC3C,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACjB,MAAM,EAAE;wBACN,IAAI,EAAE,eAAe,CAAC,aAAa;wBACnC,OAAO,EAAE,4BAA4B;qBACtC;iBACF,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YAE9D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;YAC5C,+BAA+B;YAC/B,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;YAEzE,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;YAE9D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YACjE,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,QAAQ,EAAE,GAAG,EAAE;QACtB,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;YACrE,MAAM,WAAW,GAAG,KAAK,CAAC;YAC1B,MAAM,WAAW,GAAG,GAAG,CAAC,CAAC,kBAAkB;YAE3C,MAAM,MAAM,GAAG,MAAM,8BAA8B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAExE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC/C,MAAM,WAAW,GAAG,EAAE,CAAC;YAEvB,MAAM,MAAM,CAAC,8BAA8B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,WAAW,GAAG,EAAE,IAAI,IAAI,GAAG,EAAE,CAAC;YACpC,MAAM,MAAM,GAAG,MAAM,8BAA8B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAExE,MAAM,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;YAC7B,MAAM,CAAC,OAAO,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACnD,MAAM,WAAW,GAAG,CAAC,KAAK,CAAC;YAE3B,MAAM,MAAM,CAAC,8BAA8B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACrF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YACpD,yCAAyC;YACzC,MAAM,MAAM,CAAC,8BAA8B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QACnF,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC/C,yCAAyC;YACzC,MAAM,MAAM,CAAC,8BAA8B,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC9E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0BAA0B,EAAE,KAAK,IAAI,EAAE;YACxC,MAAM,WAAW,GAAG,KAAK,CAAC;YAC1B,MAAM,MAAM,GAAG,MAAM,0BAA0B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;YAEpE,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sCAAsC,EAAE,KAAK,IAAI,EAAE;YACpD,yCAAyC;YACzC,MAAM,MAAM,CAAC,0BAA0B,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC/E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iCAAiC,EAAE,KAAK,IAAI,EAAE;YAC/C,yCAAyC;YACzC,MAAM,MAAM,CAAC,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1E,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,sBAAsB;YACtB,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC;gBAC3C,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,KAAK,IAAI,EAAE,CACf,CAAC;oBACC,MAAM,EAAE,IAAI;oBACZ,WAAW,EAAE,oEAAoE;iBAClF,CAAmC;aACvC,CAAC,CAAC;YAEH,MAAM,MAAM,GACV,MAAM,aAAa,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;YAE1D,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,WAAW,EAAE,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzC,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAChC,GAAG,gBAAgB,CAAC,iBAAiB,UAAU,EAC/C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aACzB,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,4BAA4B;YAC5B,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC;gBAC3C,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACjB,MAAM,EAAE;wBACN,IAAI,EAAE,eAAe,CAAC,eAAe;wBACrC,OAAO,EAAE,kBAAkB;qBAC5B;iBACF,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;YAEvE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;YAC1D,sBAAsB;YACtB,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC;gBAC3C,EAAE,EAAE,IAAI;gBACR,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACjB,MAAM,EAAE,CAAC;oBACT,WAAW,EAAE,oEAAoE;iBAClF,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAEhE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACtC,CAAC;YACD,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAChC,GAAG,gBAAgB,CAAC,iBAAiB,SAAS,EAC9C,MAAM,CAAC,gBAAgB,CAAC;gBACtB,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC;aACzB,CAAC,CACH,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,4BAA4B;YAC5B,MAAM,CAAC,KAAK,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,qBAAqB,CAAC;gBAC3C,EAAE,EAAE,KAAK;gBACT,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC;oBACjB,MAAM,EAAE;wBACN,IAAI,EAAE,eAAe,CAAC,aAAa;wBACnC,OAAO,EAAE,kBAAkB;qBAC5B;iBACF,CAAC;aACH,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;YAEhE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;QACrC,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,sBAAsB,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAC9D,MAAM,UAAU,GAAG,oEAAoE,CAAC;YACxF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;YAClE,MAAM,iBAAiB,GAAkB,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,CAAC;YAEtE,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,qBAAqB,CAAC;gBAC5D,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,CAAC,UAAmD,EAAE,iBAAiB,CAAC;aAChF,CAAC,CAAC;YACH,EAAE,CAAC,KAAK,CAAC,oBAAoB,EAAE,yBAAyB,CAAC,CAAC,qBAAqB,CAAC,2BAA2B,CAAC,CAAC;YAC7G,EAAE,CAAC,KAAK,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,CAAC,qBAAqB,CAAC;gBACzE,OAAO,EAAE,IAAI;gBACb,OAAO,EAAE,oCAAoC;aAC9C,CAAC,CAAC;YACH,EAAE,CAAC,KAAK,CAAC,qBAAqB,EAAE,yBAAyB,CAAC,CAAC,qBAAqB,CAAC;gBAC/E,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,cAAc;aACtB,CAAC,CAAC;YACH,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,qBAAqB,CAAC;gBAC7D,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;oBACZ,WAAW,EAAE,UAAU;iBACxB;aACF,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,qBAAqB,CAAC,sBAAsB,EAAE,oBAAoB,EAAE,OAAO,CAAC,CAAC;YAEhH,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;gBACnC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;gBACtC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACrD,CAAC;YACD,MAAM,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,CAAC,oBAAoB,CACxD,sBAAsB,EACtB,oBAAoB,EACpB,OAAO,EACP,KAAK,CACN,CAAC;YACF,MAAM,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC,CAAC,oBAAoB,CAAC;gBAC1D,cAAc,EAAE,UAAU;aAC3B,CAAC,CAAC;YACH,MAAM,CAAC,qBAAqB,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;QACrE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,sBAAsB,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAE9D,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,qBAAqB,CAAC;gBAC7D,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE;oBACL,MAAM,EAAE;wBACN,IAAI,EAAE,eAAe,CAAC,OAAO;wBAC7B,OAAO,EAAE,uBAAuB;qBACjC;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,qBAAqB,CAAC,sBAAsB,EAAE,oBAAoB,EAAE,OAAO,CAAC,CAAC;YAEhH,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,CAAC;YACrC,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;YACrD,MAAM,sBAAsB,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAC9D,MAAM,UAAU,GAAG,oEAAoE,CAAC;YACxF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;YAElE,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,qBAAqB,CAAC;gBAC5D,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,CAAC,UAAmD,EAAE,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;aACtG,CAAC,CAAC;YACH,EAAE,CAAC,KAAK,CAAC,qBAAqB,EAAE,mBAAmB,CAAC,CAAC,qBAAqB,CAAC;gBACzE,OAAO,EAAE,KAAK;gBACd,OAAO,EAAE,+BAA+B;aACzC,CAAC,CAAC;YACH,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,qBAAqB,CAAC;gBAC7D,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE;oBACL,MAAM,EAAE,IAAI;oBACZ,WAAW,EAAE,UAAU;iBACxB;aACF,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,qBAAqB,CAAC,sBAAsB,EAAE,oBAAoB,EAAE,OAAO,CAAC,CAAC;YAEhH,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC;oBAC3B,IAAI,EAAE,kBAAkB;oBACxB,IAAI,EAAE;wBACJ,MAAM,EAAE,2CAA2C;wBACnD,OAAO,EAAE;4BACP,MAAM,EAAE,QAAQ;4BAChB,MAAM,EAAE;gCACN,QAAQ,EAAE,GAAG;gCACb,OAAO,EAAE,oEAAoE;6BAC9E;yBACF;qBACF;iBAC8C,CAAC,CAAC;YACrD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,sBAAsB,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAC9D,MAAM,UAAU,GAAG,oEAAoE,CAAC;YACxF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;YAClE,MAAM,iBAAiB,GAAkB,EAAE,GAAG,UAAU,EAAE,SAAS,EAAE,CAAC;YAEtE,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,qBAAqB,CAAC;gBAC5D,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,CAAC,UAAmD,EAAE,iBAAiB,CAAC;aAChF,CAAC,CAAC;YACH,EAAE,CAAC,KAAK,CAAC,oBAAoB,EAAE,yBAAyB,CAAC,CAAC,qBAAqB,CAAC,2BAA2B,CAAC,CAAC;YAE7G,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,sBAAsB,EAAE,oBAAoB,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YAE9G,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,IAAI,MAAM,CAAC,EAAE,EAAE,CAAC;gBACd,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC;gBAC/C,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAChC,MAAM,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACrD,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;QAC5B,EAAE,CAAC,oDAAoD,EAAE,KAAK,IAAI,EAAE;YAClE,MAAM,sBAAsB,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAC9D,MAAM,UAAU,GAAG,oEAAoE,CAAC;YACxF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;YAElE,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAC1E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,UAAU,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAC;YAEzF,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,WAAW,EAAE,GAAG,EAAE;QACzB,EAAE,CAAC,iDAAiD,EAAE,KAAK,IAAI,EAAE;YAC/D,MAAM,sBAAsB,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAC9D,MAAM,UAAU,GAAG,oEAAoE,CAAC;YACxF,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;YAElE,EAAE,CAAC,KAAK,CAAC,gBAAgB,EAAE,WAAW,CAAC,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;YAC1E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YAEzD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;QAC7B,EAAE,CAAC,wCAAwC,EAAE,KAAK,IAAI,EAAE;YACtD,MAAM,sBAAsB,GAAG,MAAM,sBAAsB,EAAE,CAAC;YAC9D,MAAM,UAAU,GAAG,MAAM,gBAAgB,CAAC,sBAAsB,CAAC,CAAC;YAElE,EAAE,CAAC,KAAK,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,mBAAmB,CAC1D,oEAAoE,CACrE,CAAC;YACF,MAAM,MAAM,GAAG,aAAa,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YAEvD,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,oEAAoE,CAAC,CAAC;QAC5F,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -4,7 +4,7 @@ import type { EvmHubProvider } from '../../entities/index.js';
|
|
|
4
4
|
import { type HubAddress, type PromiseCWTxReturnType } from '../../index.js';
|
|
5
5
|
export type CWSpokeDepositParams = {
|
|
6
6
|
from: string;
|
|
7
|
-
to?:
|
|
7
|
+
to?: HubAddress;
|
|
8
8
|
token: string;
|
|
9
9
|
amount: bigint;
|
|
10
10
|
data: Hex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CWSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/CWSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,GAAG,EAAS,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,qBAAqB,EAAyB,MAAM,gBAAgB,CAAC;AAGpG,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"CWSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/CWSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,GAAG,EAAS,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,qBAAqB,EAAyB,MAAM,gBAAgB,CAAC;AAGpG,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,qBAAa,cAAc;IACzB,OAAO;IAEP;;;;;;;OAOG;WACiB,OAAO,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACnD,MAAM,EAAE,oBAAoB,EAC5B,aAAa,EAAE,eAAe,EAC9B,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,qBAAqB,CAAC,CAAC,CAAC;IAqB3B;;;;;OAKG;WACiB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;IAK9F;;;;;;;OAOG;WACiB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACtD,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,eAAe,EAC9B,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,qBAAqB,CAAC,CAAC,CAAC;IAK3B;;;;;;;;;;OAUG;mBACkB,QAAQ;IAS7B;;;;;;;OAOG;mBACkB,IAAI;CAU1B"}
|
|
@@ -56,7 +56,7 @@ export class CWSpokeService {
|
|
|
56
56
|
* @returns {PromiseCWTxReturnType<R>} A promise that resolves to the transaction hash.
|
|
57
57
|
*/
|
|
58
58
|
static async transfer({ token, recipient, amount, data = '0x' }, spokeProvider, raw) {
|
|
59
|
-
const sender = spokeProvider.walletProvider.getWalletAddress();
|
|
59
|
+
const sender = await spokeProvider.walletProvider.getWalletAddress();
|
|
60
60
|
return CWSpokeProvider.deposit(sender, token, recipient, amount, data, spokeProvider, raw);
|
|
61
61
|
}
|
|
62
62
|
/**
|
|
@@ -68,7 +68,7 @@ export class CWSpokeService {
|
|
|
68
68
|
* @returns {PromiseCWTxReturnType<R>} A promise that resolves to the transaction hash.
|
|
69
69
|
*/
|
|
70
70
|
static async call(dstChainId, dstAddress, payload, spokeProvider, raw) {
|
|
71
|
-
const sender = spokeProvider.walletProvider.getWalletAddress();
|
|
71
|
+
const sender = await spokeProvider.walletProvider.getWalletAddress();
|
|
72
72
|
return spokeProvider.send_message(sender, dstChainId.toString(), dstAddress, payload, raw);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CWSpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/CWSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E,OAAO,EAA+C,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAiBvD,MAAM,OAAO,cAAc;IACzB,gBAAuB,CAAC;IAExB;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,OAAO,CACzB,MAA4B,EAC5B,aAA8B,EAC9B,WAA2B,EAC3B,GAAO;QAEP,MAAM,UAAU,GACd,MAAM,CAAC,EAAE;YACT,CAAC,MAAM,oBAAoB,CAAC,uBAAuB,CACjD,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAClC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EACxC,WAAW,CACZ,CAAC,CAAC;QAEL,OAAO,cAAc,CAAC,QAAQ,CAC5B;YACE,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS,EAAE,UAAU;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;YAChC,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,EACD,aAAa,EACb,GAAG,CACJ,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,aAA8B;QAC1E,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAC5B,IAAgB,EAChB,OAAY,EACZ,aAA8B,EAC9B,WAA2B,EAC3B,GAAO;QAEP,MAAM,OAAO,GAAG,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;IACjF,CAAC;IAED;;;;;;;;;;OAUG;IACK,MAAM,CAAC,KAAK,CAAC,QAAQ,CAC3B,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,GAAG,IAAI,EAAuB,EAC9D,aAA8B,EAC9B,GAAO;QAEP,MAAM,MAAM,GAAG,aAAa,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"CWSpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/CWSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E,OAAO,EAA+C,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACpG,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAiBvD,MAAM,OAAO,cAAc;IACzB,gBAAuB,CAAC;IAExB;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,OAAO,CACzB,MAA4B,EAC5B,aAA8B,EAC9B,WAA2B,EAC3B,GAAO;QAEP,MAAM,UAAU,GACd,MAAM,CAAC,EAAE;YACT,CAAC,MAAM,oBAAoB,CAAC,uBAAuB,CACjD,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAClC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EACxC,WAAW,CACZ,CAAC,CAAC;QAEL,OAAO,cAAc,CAAC,QAAQ,CAC5B;YACE,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS,EAAE,UAAU;YACrB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE;YAChC,IAAI,EAAE,MAAM,CAAC,IAAI;SAClB,EACD,aAAa,EACb,GAAG,CACJ,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,KAAa,EAAE,aAA8B;QAC1E,MAAM,GAAG,GAAG,MAAM,aAAa,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;QAClD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;IAED;;;;;;;OAOG;IACI,MAAM,CAAC,KAAK,CAAC,UAAU,CAC5B,IAAgB,EAChB,OAAY,EACZ,aAA8B,EAC9B,WAA2B,EAC3B,GAAO;QAEP,MAAM,OAAO,GAAG,qBAAqB,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACxE,OAAO,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;IACjF,CAAC;IAED;;;;;;;;;;OAUG;IACK,MAAM,CAAC,KAAK,CAAC,QAAQ,CAC3B,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,GAAG,IAAI,EAAuB,EAC9D,aAA8B,EAC9B,GAAO;QAEP,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACrE,OAAO,eAAe,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,CAAC;IAC7F,CAAC;IAED;;;;;;;OAOG;IACK,MAAM,CAAC,KAAK,CAAC,IAAI,CACvB,UAAkB,EAClB,UAAe,EACf,OAAY,EACZ,aAA8B,EAC9B,GAAO;QAEP,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACrE,OAAO,aAAa,CAAC,YAAY,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC;IAC7F,CAAC;CACF"}
|
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { type Address } from 'viem';
|
|
2
2
|
import type { EvmHubProvider, EvmSpokeProvider } from '../../entities/index.js';
|
|
3
|
-
import type {
|
|
3
|
+
import type { PromiseEvmTxReturnType, TxReturnType } from '../../types.js';
|
|
4
|
+
import type { Hex, HubAddress } from '@sodax/types';
|
|
4
5
|
export type EvmSpokeDepositParams = {
|
|
5
6
|
from: Address;
|
|
6
|
-
to?:
|
|
7
|
+
to?: HubAddress;
|
|
7
8
|
token: Hex;
|
|
8
9
|
amount: bigint;
|
|
9
10
|
data: Hex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/EvmSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAsB,MAAM,MAAM,CAAC;AAExD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"EvmSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/EvmSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAsB,MAAM,MAAM,CAAC;AAExD,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhF,OAAO,KAAK,EAAyC,sBAAsB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAClH,OAAO,KAAK,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAGpD,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,qBAAa,eAAe;IAC1B,OAAO;IAEP;;;;;;OAMG;WACiB,OAAO,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACnD,MAAM,EAAE,qBAAqB,EAC7B,aAAa,EAAE,gBAAgB,EAC/B,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,sBAAsB,CAAC,CAAC,CAAC;IAqB5B;;;;;OAKG;WACiB,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAShG;;;;;;;;OAQG;WACiB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACtD,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,gBAAgB,EAC/B,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,OAAO,CAAC,YAAY,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC;IAO7C;;;;;;;;;;OAUG;mBACkB,QAAQ;IAgC7B;;;;;;;;OAQG;mBACkB,IAAI;CAgC1B"}
|
|
@@ -68,8 +68,9 @@ export class EvmSpokeService {
|
|
|
68
68
|
args: [token, recipient, amount, data],
|
|
69
69
|
value: token.toLowerCase() === spokeProvider.chainConfig.nativeToken.toLowerCase() ? amount : undefined,
|
|
70
70
|
};
|
|
71
|
+
const from = (await spokeProvider.walletProvider.getWalletAddress());
|
|
71
72
|
const rawTx = {
|
|
72
|
-
from
|
|
73
|
+
from,
|
|
73
74
|
to: txPayload.address,
|
|
74
75
|
value: txPayload.value ?? 0n,
|
|
75
76
|
data: encodeFunctionData({
|
|
@@ -99,8 +100,9 @@ export class EvmSpokeService {
|
|
|
99
100
|
functionName: 'sendMessage',
|
|
100
101
|
args: [dstChainId, dstAddress, payload],
|
|
101
102
|
};
|
|
103
|
+
const from = (await spokeProvider.walletProvider.getWalletAddress());
|
|
102
104
|
const rawTx = {
|
|
103
|
-
from
|
|
105
|
+
from,
|
|
104
106
|
to: txPayload.address,
|
|
105
107
|
value: 0n,
|
|
106
108
|
data: encodeFunctionData({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmSpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/EvmSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAErE,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"EvmSpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/EvmSpokeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import type { Address, Hex } from 'viem';
|
|
2
2
|
import type { IconSpokeProvider } from '../../entities/icon/IconSpokeProvider.js';
|
|
3
3
|
import type { EvmHubProvider } from '../../entities/index.js';
|
|
4
|
-
import type {
|
|
4
|
+
import type { IconAddress, PromiseIconTxReturnType } from '../../types.js';
|
|
5
|
+
import type { HubAddress } from '@sodax/types';
|
|
5
6
|
export type IconSpokeDepositParams = {
|
|
6
7
|
from: IconAddress;
|
|
7
|
-
to?:
|
|
8
|
+
to?: HubAddress;
|
|
8
9
|
token: string;
|
|
9
10
|
amount: bigint;
|
|
10
11
|
data: Hex;
|
|
@@ -12,7 +13,7 @@ export type IconSpokeDepositParams = {
|
|
|
12
13
|
export type TransferToHubParams = {
|
|
13
14
|
token: string;
|
|
14
15
|
recipient: Address;
|
|
15
|
-
amount:
|
|
16
|
+
amount: bigint;
|
|
16
17
|
data: Hex;
|
|
17
18
|
};
|
|
18
19
|
export declare class IconSpokeService {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IconSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/IconSpokeService.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAElF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"IconSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/IconSpokeService.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,MAAM,CAAC;AACzC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAElF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,WAAW,EAAkB,uBAAuB,EAAE,MAAM,gBAAgB,CAAC;AAC3F,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG/C,MAAM,MAAM,sBAAsB,GAAG;IACnC,IAAI,EAAE,WAAW,CAAC;IAClB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,OAAO,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,qBAAa,gBAAgB;IAC3B,OAAO;IAEP;;;;;;;OAOG;WACiB,OAAO,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACnD,MAAM,EAAE,sBAAsB,EAC9B,aAAa,EAAE,iBAAiB,EAChC,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,uBAAuB,CAAC,CAAC,CAAC;IAqB7B;;;;;OAKG;WACiB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAUhG;;;;;;;;OAQG;WACiB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACtD,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,iBAAiB,EAChC,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,uBAAuB,CAAC,CAAC,CAAC;IAK7B;;OAEG;mBACkB,QAAQ;IA6C7B;;OAEG;mBACkB,IAAI;CAuC1B"}
|