@sodax/sdk 0.0.1-rc.1 → 0.0.1-rc.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -2
- package/dist/constants.d.ts +17 -32
- package/dist/constants.d.ts.map +1 -1
- package/dist/constants.js +17 -59
- 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 +5 -3
- package/dist/services/moneyMarket/MoneyMarketService.d.ts.map +1 -1
- package/dist/services/moneyMarket/MoneyMarketService.js +21 -13
- 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 +3 -1
- package/dist/services/solver/SolverService.d.ts.map +1 -1
- package/dist/services/solver/SolverService.js +10 -5
- 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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Erc20Service.d.ts","sourceRoot":"","sources":["../../../src/services/shared/Erc20Service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"Erc20Service.d.ts","sourceRoot":"","sources":["../../../src/services/shared/Erc20Service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgC,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AACpE,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;AAE7D,qBAAa,YAAY;IACvB,OAAO;IAEP;;;;;;;;OAQG;WACU,gBAAgB,CAC3B,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,OAAO,EACd,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IA4B3B;;;;;;OAMG;WACU,OAAO,CAClB,KAAK,EAAE,OAAO,EACd,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,OAAO,EAChB,aAAa,EAAE,gBAAgB,GAC9B,OAAO,CAAC,MAAM,CAAC,wBAAwB,CAAC,CAAC;IA0B5C;;;;;;OAMG;WACW,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe;IAYzF;;;;;;OAMG;WACW,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,eAAe;CAW1F"}
|
|
@@ -5,8 +5,8 @@ export class Erc20Service {
|
|
|
5
5
|
* Check if spender has enough ERC20 allowance for given amount
|
|
6
6
|
* @param token - ERC20 token address
|
|
7
7
|
* @param amount - Amount to check allowance for
|
|
8
|
-
* @param
|
|
9
|
-
* @param
|
|
8
|
+
* @param owner - User wallet address
|
|
9
|
+
* @param spender - Spender address
|
|
10
10
|
* @param spokeProvider - EVM Spoke provider
|
|
11
11
|
* @return - True if spender is allowed to spend amount on behalf of owner
|
|
12
12
|
*/
|
|
@@ -40,19 +40,20 @@ export class Erc20Service {
|
|
|
40
40
|
* Approve ERC20 amount spending
|
|
41
41
|
* @param token - ERC20 token address
|
|
42
42
|
* @param amount - Amount to approve
|
|
43
|
-
* @param
|
|
43
|
+
* @param spender - Spender address
|
|
44
44
|
* @param provider - EVM Provider
|
|
45
45
|
*/
|
|
46
|
-
static async approve(token, amount,
|
|
46
|
+
static async approve(token, amount, spender, spokeProvider) {
|
|
47
47
|
try {
|
|
48
|
+
const walletAddress = (await spokeProvider.walletProvider.getWalletAddress());
|
|
48
49
|
const hash = await spokeProvider.walletProvider.sendTransaction({
|
|
49
|
-
from:
|
|
50
|
+
from: walletAddress,
|
|
50
51
|
to: token,
|
|
51
52
|
value: 0n,
|
|
52
53
|
data: encodeFunctionData({
|
|
53
54
|
abi: erc20Abi,
|
|
54
55
|
functionName: 'approve',
|
|
55
|
-
args: [
|
|
56
|
+
args: [spender, amount],
|
|
56
57
|
}),
|
|
57
58
|
});
|
|
58
59
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Erc20Service.js","sourceRoot":"","sources":["../../../src/services/shared/Erc20Service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAgB,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"Erc20Service.js","sourceRoot":"","sources":["../../../src/services/shared/Erc20Service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAgB,MAAM,MAAM,CAAC;AAKlE,MAAM,OAAO,YAAY;IACvB,gBAAuB,CAAC;IAExB;;;;;;;;OAQG;IACH,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAC3B,KAAc,EACd,MAAc,EACd,KAAc,EACd,OAAgB,EAChB,aAA+B;QAE/B,IAAI,CAAC;YACH,IAAI,KAAK,CAAC,WAAW,EAAE,KAAK,aAAa,CAAC,WAAW,CAAC,WAAW,CAAC,WAAW,EAAE,EAAE,CAAC;gBAChF,OAAO;oBACL,EAAE,EAAE,IAAI;oBACR,KAAK,EAAE,IAAI;iBACZ,CAAC;YACJ,CAAC;YAED,MAAM,aAAa,GAAG,MAAM,aAAa,CAAC,YAAY,CAAC,YAAY,CAAC;gBAClE,OAAO,EAAE,KAAK;gBACd,GAAG,EAAE,QAAQ;gBACb,YAAY,EAAE,WAAW;gBACzB,IAAI,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC;aACvB,CAAC,CAAC;YAEH,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,aAAa,IAAI,MAAM;aAC/B,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,CAAC;aACT,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAClB,KAAc,EACd,MAAc,EACd,OAAgB,EAChB,aAA+B;QAE/B,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,CAAC,MAAM,aAAa,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAY,CAAC;YACzF,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC;gBAC9D,IAAI,EAAE,aAAa;gBACnB,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,kBAAkB,CAAC;oBACvB,GAAG,EAAE,QAAQ;oBACb,YAAY,EAAE,SAAS;oBACvB,IAAI,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;iBACxB,CAAC;aACH,CAAC,CAAC;YAEH,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,MAAM,aAAa,CAAC,cAAc,CAAC,yBAAyB,CAAC,IAAI,CAAC;aAC1E,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,CAAC;aACT,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,KAAc,EAAE,EAAW,EAAE,MAAc;QACrE,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,kBAAkB,CAAC;gBACvB,GAAG,EAAE,QAAQ;gBACb,YAAY,EAAE,UAAU;gBACxB,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;aACnB,CAAC;SACH,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACI,MAAM,CAAC,aAAa,CAAC,KAAc,EAAE,EAAW,EAAE,MAAc;QACrE,OAAO;YACL,OAAO,EAAE,KAAK;YACd,KAAK,EAAE,EAAE;YACT,IAAI,EAAE,kBAAkB,CAAC;gBACvB,GAAG,EAAE,QAAQ;gBACb,YAAY,EAAE,SAAS;gBACvB,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,CAAC;aACnB,CAAC;SACH,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
2
|
-
import {
|
|
2
|
+
import { getHubAssetInfo, IntentErrorCode, } from '../../index.js';
|
|
3
3
|
import { SolverApiService } from './SolverApiService.js';
|
|
4
|
+
import { ARBITRUM_MAINNET_CHAIN_ID, BSC_MAINNET_CHAIN_ID } from '@sodax/types';
|
|
4
5
|
// Mock fetch
|
|
5
6
|
const mockFetch = vi.fn();
|
|
6
7
|
global.fetch = mockFetch;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolverApiService.test.js","sourceRoot":"","sources":["../../../src/services/solver/SolverApiService.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"SolverApiService.test.js","sourceRoot":"","sources":["../../../src/services/solver/SolverApiService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { type EvmHubProvider, type IntentRelayRequest, type PacketData, type RelayErrorCode, type SpokeProvider, type WaitUntilIntentExecutedPayload } from '../../index.js';
|
|
2
|
-
import type {
|
|
2
|
+
import type { FeeAmount, HttpUrl, IntentErrorResponse, IntentExecutionRequest, IntentExecutionResponse, IntentQuoteRequest, IntentQuoteResponse, IntentRelayChainId, IntentStatusRequest, IntentStatusResponse, PartnerFee, Result, SolverConfigParams, TxReturnType } from '../../types.js';
|
|
3
|
+
import type { Address, Hex, EvmRawTransactionReceipt, Hash } from '@sodax/types';
|
|
4
|
+
import { type SpokeChainId } from '@sodax/types';
|
|
3
5
|
export type CreateIntentParams = {
|
|
4
6
|
inputToken: string;
|
|
5
7
|
outputToken: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolverService.d.ts","sourceRoot":"","sources":["../../../src/services/solver/SolverService.ts"],"names":[],"mappings":"AACA,OAAO,EAIL,KAAK,cAAc,EAEnB,KAAK,kBAAkB,EACvB,KAAK,UAAU,EACf,KAAK,cAAc,
|
|
1
|
+
{"version":3,"file":"SolverService.d.ts","sourceRoot":"","sources":["../../../src/services/solver/SolverService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import invariant from 'tiny-invariant';
|
|
2
|
-
import { DEFAULT_RELAYER_API_ENDPOINT, DEFAULT_RELAY_TX_TIMEOUT, Erc20Service, EvmSpokeProvider,
|
|
2
|
+
import { DEFAULT_RELAYER_API_ENDPOINT, DEFAULT_RELAY_TX_TIMEOUT, Erc20Service, EvmSpokeProvider, SpokeService, calculateFeeAmount, encodeContractCalls, getIntentRelayChainId, getSolverConfig, isConfiguredSolverConfig, isValidIntentRelayChainId, isValidOriginalAssetAddress, isValidSpokeChainId, submitTransaction, waitUntilIntentExecuted, } from '../../index.js';
|
|
3
3
|
import { EvmWalletAbstraction } from '../hub/EvmWalletAbstraction.js';
|
|
4
4
|
import { EvmSolverService } from './EvmSolverService.js';
|
|
5
5
|
import { SolverApiService } from './SolverApiService.js';
|
|
6
|
+
import { SONIC_MAINNET_CHAIN_ID } from '@sodax/types';
|
|
6
7
|
// Data types for arbitrary data
|
|
7
8
|
export var IntentDataType;
|
|
8
9
|
(function (IntentDataType) {
|
|
@@ -204,7 +205,8 @@ export class SolverService {
|
|
|
204
205
|
async isAllowanceValid(params, spokeProvider) {
|
|
205
206
|
try {
|
|
206
207
|
if (spokeProvider instanceof EvmSpokeProvider) {
|
|
207
|
-
|
|
208
|
+
const walletAddress = (await spokeProvider.walletProvider.getWalletAddress());
|
|
209
|
+
return Erc20Service.isAllowanceValid(params.inputToken, params.inputAmount, walletAddress, spokeProvider.chainConfig.addresses.assetManager, spokeProvider);
|
|
208
210
|
}
|
|
209
211
|
return {
|
|
210
212
|
ok: true,
|
|
@@ -257,12 +259,14 @@ export class SolverService {
|
|
|
257
259
|
invariant(isValidSpokeChainId(params.srcChain), `Invalid spoke chain (params.srcChain): ${params.srcChain}`);
|
|
258
260
|
invariant(isValidSpokeChainId(params.dstChain), `Invalid spoke chain (params.dstChain): ${params.dstChain}`);
|
|
259
261
|
try {
|
|
262
|
+
const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
|
|
260
263
|
// derive users hub wallet address
|
|
261
|
-
const creatorHubWalletAddress = await EvmWalletAbstraction.getUserHubWalletAddress(params.srcChain,
|
|
264
|
+
const creatorHubWalletAddress = await EvmWalletAbstraction.getUserHubWalletAddress(params.srcChain, walletAddressBytes, this.hubProvider);
|
|
262
265
|
// construct the intent data
|
|
263
266
|
const [data, intent, feeAmount] = EvmSolverService.constructCreateIntentData(params, creatorHubWalletAddress, this.config, fee);
|
|
267
|
+
const walletAddress = (await spokeProvider.walletProvider.getWalletAddress());
|
|
264
268
|
const txResult = await SpokeService.deposit({
|
|
265
|
-
from:
|
|
269
|
+
from: walletAddress,
|
|
266
270
|
to: creatorHubWalletAddress,
|
|
267
271
|
token: params.inputToken,
|
|
268
272
|
amount: params.inputAmount + feeAmount,
|
|
@@ -296,8 +300,9 @@ export class SolverService {
|
|
|
296
300
|
async cancelIntent(intent, spokeProvider, raw) {
|
|
297
301
|
invariant(isValidIntentRelayChainId(intent.srcChain), `Invalid intent.srcChain: ${intent.srcChain}`);
|
|
298
302
|
invariant(isValidIntentRelayChainId(intent.dstChain), `Invalid intent.dstChain: ${intent.dstChain}`);
|
|
303
|
+
const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
|
|
299
304
|
// derive users hub wallet address
|
|
300
|
-
const creatorHubWalletAddress = await EvmWalletAbstraction.getUserHubWalletAddress(spokeProvider.chainConfig.chain.id,
|
|
305
|
+
const creatorHubWalletAddress = await EvmWalletAbstraction.getUserHubWalletAddress(spokeProvider.chainConfig.chain.id, walletAddressBytes, this.hubProvider);
|
|
301
306
|
const calls = [];
|
|
302
307
|
const intentsContract = this.config.intentsContract;
|
|
303
308
|
calls.push(EvmSolverService.encodeCancelIntent(intent, intentsContract));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolverService.js","sourceRoot":"","sources":["../../../src/services/solver/SolverService.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,YAAY,EAEZ,gBAAgB,
|
|
1
|
+
{"version":3,"file":"SolverService.js","sourceRoot":"","sources":["../../../src/services/solver/SolverService.ts"],"names":[],"mappings":"AAAA,OAAO,SAAS,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,4BAA4B,EAC5B,wBAAwB,EACxB,YAAY,EAEZ,gBAAgB,EAKhB,YAAY,EAEZ,kBAAkB,EAClB,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EACf,wBAAwB,EACxB,yBAAyB,EACzB,2BAA2B,EAC3B,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,GACxB,MAAM,gBAAgB,CAAC;AAqBxB,OAAO,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAqB,MAAM,cAAc,CAAC;AAkCzE,gCAAgC;AAChC,MAAM,CAAN,IAAY,cAEX;AAFD,WAAY,cAAc;IACxB,iDAAO,CAAA;AACT,CAAC,EAFW,cAAc,KAAd,cAAc,QAEzB;AAkDD,MAAM,OAAO,aAAa;IACP,MAAM,CAAsB;IAC5B,WAAW,CAAiB;IAE7C,YACE,MAAsC,EACtC,WAA2B,EAC3B,kBAA4B;QAE5B,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,4BAA4B;YAC5B,IAAI,CAAC,MAAM,GAAG;gBACZ,GAAG,eAAe,CAAC,sBAAsB,CAAC,EAAE,4BAA4B;gBACxE,UAAU,EAAE,SAAS;gBACrB,kBAAkB,EAAE,kBAAkB,IAAI,4BAA4B;aACvE,CAAC;QACJ,CAAC;aAAM,IAAI,wBAAwB,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5C,IAAI,CAAC,MAAM,GAAG;gBACZ,GAAG,MAAM;gBACT,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,kBAAkB,EAAE,kBAAkB,IAAI,4BAA4B;aACvE,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,GAAG;gBACZ,GAAG,eAAe,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,4BAA4B;gBAClF,UAAU,EAAE,MAAM,CAAC,UAAU;gBAC7B,kBAAkB,EAAE,kBAAkB,IAAI,4BAA4B;aACvE,CAAC;QACJ,CAAC;QACD,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED;;;;;;;;;;;;;;;;;;;OAmBG;IACI,KAAK,CAAC,QAAQ,CAAC,OAA2B;QAC/C,OAAO,gBAAgB,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACzD,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,MAAM,CAAC,WAAmB;QACrC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;YAC5B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,kBAAkB,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;IACjE,CAAC;IAED;;;;;;;;;;;;;;;OAeG;IACI,KAAK,CAAC,SAAS,CACpB,mBAAwC;QAExC,OAAO,gBAAgB,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IACtE,CAAC;IAED;;;;;;;;;;;;;;;;;;;;;;OAsBG;IACI,KAAK,CAAC,aAAa,CACxB,sBAA8C;QAE9C,OAAO,gBAAgB,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC7E,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,qBAAqB,CAChC,OAA2B,EAC3B,aAAgB,EAChB,GAAgB,EAChB,OAAO,GAAG,wBAAwB;QAElC,IAAI,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;YAEvF,IAAI,CAAC,kBAAkB,CAAC,EAAE,EAAE,CAAC;gBAC3B,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,kBAAkB,CAAC,KAAK;iBAChC,CAAC;YACJ,CAAC;YAED,MAAM,CAAC,WAAW,EAAE,MAAM,CAAC,GAAG,kBAAkB,CAAC,KAAK,CAAC;YACvD,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC9E,MAAM,aAAa,GAAiC;gBAClD,MAAM,EAAE,QAAQ;gBAChB,MAAM,EAAE;oBACN,QAAQ,EAAE,kBAAkB;oBAC5B,OAAO,EAAE,WAAW;iBACrB;aACF,CAAC;YAEF,MAAM,YAAY,GAAG,MAAM,iBAAiB,CAAC,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC;YAE5F,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;gBAC1B,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE;wBACL,IAAI,EAAE,kBAAkB;wBACxB,IAAI,EAAE;4BACJ,OAAO,EAAE,aAAa;4BACtB,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;yBACvC;qBACF;iBACF,CAAC;YACJ,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,uBAAuB,CAAC;gBAC3C,kBAAkB;gBAClB,WAAW;gBACX,OAAO;gBACP,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,kBAAkB;aACvC,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE,MAAM,CAAC,KAAK;iBACpB,CAAC;YACJ,CAAC;YAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC;gBACtC,cAAc,EAAE,MAAM,CAAC,KAAK,CAAC,WAA4B;aAC1D,CAAC,CAAC;YAEH,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;gBACf,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,KAAK,EAAE;wBACL,IAAI,EAAE,uBAAuB;wBAC7B,IAAI,EAAE,MAAM,CAAC,KAAK;qBACnB;iBACF,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC;aAC5C,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE;oBACL,IAAI,EAAE,SAAS;oBACf,IAAI,EAAE;wBACJ,OAAO,EAAE,OAAO;wBAChB,KAAK,EAAE,KAAK;qBACb;iBACF;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACI,KAAK,CAAC,gBAAgB,CAC3B,MAA0B,EAC1B,aAAgB;QAEhB,IAAI,CAAC;YACH,IAAI,aAAa,YAAY,gBAAgB,EAAE,CAAC;gBAC9C,MAAM,aAAa,GAAG,CAAC,MAAM,aAAa,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAkB,CAAC;gBAC/F,OAAO,YAAY,CAAC,gBAAgB,CAClC,MAAM,CAAC,UAAqB,EAC5B,MAAM,CAAC,WAAW,EAClB,aAAa,EACb,aAAa,CAAC,WAAW,CAAC,SAAS,CAAC,YAAY,EAChD,aAAa,CACd,CAAC;YACJ,CAAC;YAED,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,IAAI;aACZ,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,KAAK;aACb,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,OAAO,CAClB,KAAc,EACd,MAAc,EACd,OAAgB,EAChB,aAAgB;QAEhB,IAAI,CAAC;YACH,IAAI,aAAa,YAAY,gBAAgB,EAAE,CAAC;gBAC9C,OAAO,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;YACrE,CAAC;YAED,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,IAAI,KAAK,CAAC,6CAA6C,CAAC;aAChE,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,KAAK;aACb,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACI,KAAK,CAAC,YAAY,CACvB,MAA0B,EAC1B,aAAgB,EAChB,GAAgB,EAChB,GAAO;QAEP,SAAS,CACP,2BAA2B,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,UAAU,CAAC,EAC/D,oDAAoD,MAAM,CAAC,QAAQ,yBAAyB,MAAM,CAAC,UAAU,EAAE,CAChH,CAAC;QACF,SAAS,CACP,2BAA2B,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,EAChE,oDAAoD,MAAM,CAAC,QAAQ,0BAA0B,MAAM,CAAC,WAAW,EAAE,CAClH,CAAC;QACF,SAAS,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,0CAA0C,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7G,SAAS,CAAC,mBAAmB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,0CAA0C,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAE7G,IAAI,CAAC;YACH,MAAM,kBAAkB,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,qBAAqB,EAAE,CAAC;YACtF,kCAAkC;YAClC,MAAM,uBAAuB,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAChF,MAAM,CAAC,QAAQ,EACf,kBAAkB,EAClB,IAAI,CAAC,WAAW,CACjB,CAAC;YAEF,4BAA4B;YAC5B,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,CAAC,GAAG,gBAAgB,CAAC,yBAAyB,CAC1E,MAAM,EACN,uBAAuB,EACvB,IAAI,CAAC,MAAM,EACX,GAAG,CACJ,CAAC;YAEF,MAAM,aAAa,GAAG,CAAC,MAAM,aAAa,CAAC,cAAc,CAAC,gBAAgB,EAAE,CAAkB,CAAC;YAC/F,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,OAAO,CACzC;gBACE,IAAI,EAAE,aAAa;gBACnB,EAAE,EAAE,uBAAuB;gBAC3B,KAAK,EAAE,MAAM,CAAC,UAAU;gBACxB,MAAM,EAAE,MAAM,CAAC,WAAW,GAAG,SAAS;gBACtC,IAAI,EAAE,IAAI;aACqB,EACjC,aAAyB,EACzB,IAAI,CAAC,WAAW,EAChB,GAAG,CACJ,CAAC;YAEF,OAAO;gBACL,EAAE,EAAE,IAAI;gBACR,KAAK,EAAE,CAAC,QAA8B,EAAE,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,CAA6C;aAC9G,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE;oBACL,IAAI,EAAE,iBAAiB;oBACvB,IAAI,EAAE;wBACJ,OAAO,EAAE,MAAM;wBACf,KAAK,EAAE,KAAK;qBACb;iBACF;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;OAMG;IACI,KAAK,CAAC,YAAY,CACvB,MAAc,EACd,aAAgB,EAChB,GAAO;QAEP,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,4BAA4B,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACrG,SAAS,CAAC,yBAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,4BAA4B,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QAErG,MAAM,kBAAkB,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC,qBAAqB,EAAE,CAAC;QACtF,kCAAkC;QAClC,MAAM,uBAAuB,GAAG,MAAM,oBAAoB,CAAC,uBAAuB,CAChF,aAAa,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,EAClC,kBAAkB,EAClB,IAAI,CAAC,WAAW,CACjB,CAAC;QAEF,MAAM,KAAK,GAAsB,EAAE,CAAC;QACpC,MAAM,eAAe,GAAG,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC;QACpD,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;QACzE,MAAM,IAAI,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;QACxC,OAAO,YAAY,CAAC,UAAU,CAAC,uBAAuB,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;IACtG,CAAC;IAED;;;;OAIG;IACI,SAAS,CAAC,MAAY;QAC3B,OAAO,gBAAgB,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3E,CAAC;IAED;;;;OAIG;IACI,aAAa,CAAC,MAAc;QACjC,OAAO,gBAAgB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;CACF"}
|
|
@@ -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":"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"}
|