@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,7 +1,7 @@
|
|
|
1
1
|
import IconService from 'icon-sdk-js';
|
|
2
2
|
import * as rlp from 'rlp';
|
|
3
3
|
import { getIconAddressBytes } from '../../entities/icon/utils.js';
|
|
4
|
-
import { getIntentRelayChainId } from '../../index.js';
|
|
4
|
+
import { BigIntToHex, getIntentRelayChainId, isNativeToken } from '../../index.js';
|
|
5
5
|
import { EvmWalletAbstraction } from '../hub/index.js';
|
|
6
6
|
export class IconSpokeService {
|
|
7
7
|
constructor() { }
|
|
@@ -19,7 +19,7 @@ export class IconSpokeService {
|
|
|
19
19
|
return IconSpokeService.transfer({
|
|
20
20
|
token: params.token,
|
|
21
21
|
recipient: userWallet,
|
|
22
|
-
amount: params.amount
|
|
22
|
+
amount: params.amount,
|
|
23
23
|
data: params.data,
|
|
24
24
|
}, spokeProvider, raw);
|
|
25
25
|
}
|
|
@@ -35,7 +35,7 @@ export class IconSpokeService {
|
|
|
35
35
|
.method('balanceOf')
|
|
36
36
|
.params({ _owner: spokeProvider.chainConfig.addresses.assetManager })
|
|
37
37
|
.build();
|
|
38
|
-
const result = await spokeProvider.
|
|
38
|
+
const result = await spokeProvider.iconService.call(transaction).execute();
|
|
39
39
|
return BigInt(result.value);
|
|
40
40
|
}
|
|
41
41
|
/**
|
|
@@ -60,15 +60,13 @@ export class IconSpokeService {
|
|
|
60
60
|
const hexData = `0x${Buffer.from(rlpEncodedData).toString('hex')}`;
|
|
61
61
|
const params = {
|
|
62
62
|
_to: spokeProvider.chainConfig.addresses.assetManager,
|
|
63
|
-
_value: amount,
|
|
63
|
+
_value: BigIntToHex(amount),
|
|
64
64
|
_data: hexData,
|
|
65
65
|
};
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const transaction = new IconService.CallTransactionBuilder()
|
|
71
|
-
.from(spokeProvider.walletProvider.getWalletAddress())
|
|
66
|
+
const value = isNativeToken(spokeProvider.chainConfig.chain.id, token) ? BigIntToHex(amount) : '0x0';
|
|
67
|
+
const walletAddress = await spokeProvider.walletProvider.getWalletAddress();
|
|
68
|
+
const rawTransaction = IconService.Converter.toRawTransaction(new IconService.CallTransactionBuilder()
|
|
69
|
+
.from(walletAddress)
|
|
72
70
|
.to(token)
|
|
73
71
|
.stepLimit(IconService.Converter.toBigNumber('2000000'))
|
|
74
72
|
.nid(spokeProvider.chainConfig.nid)
|
|
@@ -77,11 +75,18 @@ export class IconSpokeService {
|
|
|
77
75
|
.value(value)
|
|
78
76
|
.method('transfer')
|
|
79
77
|
.params(params)
|
|
80
|
-
.build();
|
|
78
|
+
.build());
|
|
81
79
|
if (raw) {
|
|
82
|
-
return
|
|
80
|
+
return rawTransaction;
|
|
83
81
|
}
|
|
84
|
-
return spokeProvider.walletProvider.sendTransaction(
|
|
82
|
+
return spokeProvider.walletProvider.sendTransaction({
|
|
83
|
+
from: walletAddress,
|
|
84
|
+
to: token,
|
|
85
|
+
value: value,
|
|
86
|
+
nid: spokeProvider.chainConfig.nid,
|
|
87
|
+
method: 'transfer',
|
|
88
|
+
params: params,
|
|
89
|
+
});
|
|
85
90
|
}
|
|
86
91
|
/**
|
|
87
92
|
* Sends a message to the hub chain.
|
|
@@ -92,8 +97,9 @@ export class IconSpokeService {
|
|
|
92
97
|
dstAddress: dstAddress,
|
|
93
98
|
payload: payload,
|
|
94
99
|
};
|
|
100
|
+
const walletAddressBytes = await spokeProvider.walletProvider.getWalletAddressBytes();
|
|
95
101
|
const transaction = new IconService.CallTransactionBuilder()
|
|
96
|
-
.from(
|
|
102
|
+
.from(walletAddressBytes)
|
|
97
103
|
.to(spokeProvider.chainConfig.addresses.connection)
|
|
98
104
|
.stepLimit(IconService.Converter.toBigNumber('2000000'))
|
|
99
105
|
.nid(spokeProvider.chainConfig.nid)
|
|
@@ -105,7 +111,14 @@ export class IconSpokeService {
|
|
|
105
111
|
if (raw) {
|
|
106
112
|
return IconService.Converter.toRawTransaction(transaction);
|
|
107
113
|
}
|
|
108
|
-
return spokeProvider.walletProvider.sendTransaction(
|
|
114
|
+
return spokeProvider.walletProvider.sendTransaction({
|
|
115
|
+
from: walletAddressBytes,
|
|
116
|
+
to: spokeProvider.chainConfig.addresses.connection,
|
|
117
|
+
nid: spokeProvider.chainConfig.nid,
|
|
118
|
+
value: '0x0',
|
|
119
|
+
method: 'sendMessage',
|
|
120
|
+
params: params,
|
|
121
|
+
});
|
|
109
122
|
}
|
|
110
123
|
}
|
|
111
124
|
//# sourceMappingURL=IconSpokeService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IconSpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/IconSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,WAAW,MAAM,aAAa,CAAC;AACtC,OAAO,KAAK,GAAG,MAAM,KAAK,CAAC;AAG3B,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"IconSpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/IconSpokeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,11 @@ import { PublicKey } from '@solana/web3.js';
|
|
|
2
2
|
import { type Hex } from 'viem';
|
|
3
3
|
import type { EvmHubProvider } from '../../entities/index.js';
|
|
4
4
|
import type { SolanaSpokeProvider } from '../../entities/solana/SolanaSpokeProvider.js';
|
|
5
|
-
import type {
|
|
5
|
+
import type { PromiseSolanaTxReturnType } from '../../types.js';
|
|
6
|
+
import type { HubAddress } from '@sodax/types';
|
|
6
7
|
export type SolanaSpokeDepositParams = {
|
|
7
8
|
from: PublicKey;
|
|
8
|
-
to?:
|
|
9
|
+
to?: HubAddress;
|
|
9
10
|
token: PublicKey;
|
|
10
11
|
amount: bigint;
|
|
11
12
|
data: Hex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolanaSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/SolanaSpokeService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,SAAS,EAA8C,MAAM,iBAAiB,CAAC;AAE9G,OAAO,EAAgB,KAAK,GAAG,EAAS,MAAM,MAAM,CAAC;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAGxF,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"SolanaSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/SolanaSpokeService.ts"],"names":[],"mappings":"AAEA,OAAO,EAAwB,SAAS,EAA8C,MAAM,iBAAiB,CAAC;AAE9G,OAAO,EAAgB,KAAK,GAAG,EAAS,MAAM,MAAM,CAAC;AAErD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8CAA8C,CAAC;AAGxF,OAAO,KAAK,EAAE,yBAAyB,EAAoB,MAAM,gBAAgB,CAAC;AAClF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG/C,MAAM,MAAM,wBAAwB,GAAG;IACrC,IAAI,EAAE,SAAS,CAAC;IAChB,EAAE,CAAC,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,SAAS,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,SAAS,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,GAAG,CAAC;CACX,CAAC;AAEF,qBAAa,kBAAkB;IAC7B,OAAO;WAEa,OAAO,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACnD,MAAM,EAAE,wBAAwB,EAChC,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,yBAAyB,CAAC,CAAC,CAAC;WAqBX,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC;IAkBlG;;;;;;;;OAQG;WACiB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACtD,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,mBAAmB,EAClC,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,yBAAyB,CAAC,CAAC,CAAC;mBAUV,QAAQ;IAkG7B;;;;;;;;OAQG;mBACkB,IAAI;CAuD1B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SolanaSpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/SolanaSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,6CAA6C,CAAC;AAChF,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,oBAAoB,EAAE,SAAS,EAAE,aAAa,EAA+B,MAAM,iBAAiB,CAAC;AAC9G,OAAO,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAC3B,OAAO,EAA0B,KAAK,EAAE,MAAM,MAAM,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,OAAO,EAAE,sBAAsB,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAEhG,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,MAAM,kCAAkC,CAAC;AACxF,OAAO,EAAE,QAAQ,EAAE,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"SolanaSpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/SolanaSpokeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { type EvmHubProvider, type SpokeProvider } from '../../entities/index.js';
|
|
2
|
-
import type {
|
|
2
|
+
import type { GetSpokeDepositParamsType, PromiseTxReturnType, TxReturnType } from '../../types.js';
|
|
3
|
+
import type { Address, Hex, HubAddress } from '@sodax/types';
|
|
3
4
|
/**
|
|
4
5
|
* SpokeService is a main class that provides functionalities for dealing with spoke chains.
|
|
5
6
|
* It uses command pattern to execute different spoke chain operations.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/SpokeService.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,cAAc,EAGnB,KAAK,aAAa,EAGnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"SpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/SpokeService.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,cAAc,EAGnB,KAAK,aAAa,EAGnB,MAAM,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,yBAAyB,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACnG,OAAO,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAgB7D;;;GAGG;AAGH,qBAAa,YAAY;IACvB;;;;;;OAMG;WACiB,OAAO,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,CAAC,SAAS,OAAO,GAAG,KAAK,EAC5F,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAC,EACpC,aAAa,EAAE,CAAC,EAChB,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAuDrC;;;;;OAKG;WACW,UAAU,CAAC,KAAK,EAAE,OAAO,EAAE,aAAa,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC;IAuBvF;;;;;;;OAOG;WACiB,UAAU,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,EAAE,CAAC,SAAS,OAAO,GAAG,KAAK,EAC/F,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,CAAC,EAChB,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,OAAO,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;CA2C/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/SpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,OAAO,EAEL,gBAAgB,EAChB,mBAAmB,EAEnB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"SpokeService.js","sourceRoot":"","sources":["../../../src/services/spoke/SpokeService.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ import type { StellarSpokeProvider } from '../../entities/stellar/StellarSpokePr
|
|
|
4
4
|
import { type HubAddress, type PromiseStellarTxReturnType } from '../../index.js';
|
|
5
5
|
export type StellarSpokeDepositParams = {
|
|
6
6
|
from: Hex;
|
|
7
|
-
to?:
|
|
7
|
+
to?: HubAddress;
|
|
8
8
|
token: string;
|
|
9
9
|
amount: bigint;
|
|
10
10
|
data: Hex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StellarSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/StellarSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,GAAG,EAAW,MAAM,MAAM,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAC3F,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,0BAA0B,EAAyB,MAAM,gBAAgB,CAAC;AAGzG,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,GAAG,CAAC;IACV,EAAE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"StellarSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/StellarSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,GAAG,EAAW,MAAM,MAAM,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,gDAAgD,CAAC;AAC3F,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,0BAA0B,EAAyB,MAAM,gBAAgB,CAAC;AAGzG,MAAM,MAAM,yBAAyB,GAAG;IACtC,IAAI,EAAE,GAAG,CAAC;IACV,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,mBAAmB;IAC9B,OAAO;WAEa,OAAO,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACnD,MAAM,EAAE,yBAAyB,EACjC,aAAa,EAAE,oBAAoB,EACnC,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,0BAA0B,CAAC,CAAC,CAAC;WAqBZ,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE,oBAAoB,GAAG,OAAO,CAAC,MAAM,CAAC;IAInG;;;;;;;;OAQG;WACiB,UAAU,CAAC,CAAC,SAAS,OAAO,GAAG,KAAK,EACtD,IAAI,EAAE,UAAU,EAChB,OAAO,EAAE,GAAG,EACZ,aAAa,EAAE,oBAAoB,EACnC,WAAW,EAAE,cAAc,EAC3B,GAAG,CAAC,EAAE,CAAC,GACN,0BAA0B,CAAC,CAAC,CAAC;mBAKX,QAAQ;mBAcR,IAAI;CAc1B"}
|
|
@@ -4,7 +4,7 @@ import type { SuiSpokeProvider } from '../../entities/sui/SuiSpokeProvider.js';
|
|
|
4
4
|
import { type HubAddress, type PromiseSuiTxReturnType } from '../../index.js';
|
|
5
5
|
export type SuiSpokeDepositParams = {
|
|
6
6
|
from: Hex;
|
|
7
|
-
to?:
|
|
7
|
+
to?: HubAddress;
|
|
8
8
|
token: string;
|
|
9
9
|
amount: bigint;
|
|
10
10
|
data: Hex;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SuiSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/SuiSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,GAAG,EAAW,MAAM,MAAM,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,sBAAsB,EAAyB,MAAM,gBAAgB,CAAC;AAGrG,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,GAAG,CAAC;IACV,EAAE,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"SuiSpokeService.d.ts","sourceRoot":"","sources":["../../../src/services/spoke/SuiSpokeService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,GAAG,EAAW,MAAM,MAAM,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,wCAAwC,CAAC;AAC/E,OAAO,EAAE,KAAK,UAAU,EAAE,KAAK,sBAAsB,EAAyB,MAAM,gBAAgB,CAAC;AAGrG,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,GAAG,CAAC;IACV,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,eAAe;IAC1B,OAAO;IAEP;;;;;;;OAOG;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,MAAM,EAAE,aAAa,EAAE,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC;IAI/F;;;;;;;;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,sBAAsB,CAAC,CAAC,CAAC;IAU5B;;;;;;;;;;OAUG;mBACkB,QAAQ;IAQ7B;;;;;;;;OAQG;mBACkB,IAAI;CAS1B"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
|
-
import { describe, it, expect, vi } from 'vitest';
|
|
1
|
+
import { describe, it, expect, vi, beforeEach } from 'vitest';
|
|
2
2
|
import { decodeFunctionData } from 'viem';
|
|
3
3
|
import { assetManagerAbi } from '../../../abis/index.js';
|
|
4
|
-
import { EvmAssetManagerService, EvmSpokeProvider, spokeChainConfig, getHubChainConfig, EvmHubProvider,
|
|
4
|
+
import { EvmAssetManagerService, EvmSpokeProvider, spokeChainConfig, getHubChainConfig, EvmHubProvider, } from '../../../index.js';
|
|
5
|
+
import { BSC_MAINNET_CHAIN_ID, SONIC_MAINNET_CHAIN_ID } from '@sodax/types';
|
|
5
6
|
describe('EvmAssetManagerService', () => {
|
|
6
7
|
const bscEthToken = '0x2170Ed0880ac9A755fd29B2688956BD959F933F8';
|
|
7
8
|
const mockEvmWalletProvider = {
|
|
8
9
|
sendTransaction: vi.fn(),
|
|
9
|
-
getWalletAddress: vi.fn().
|
|
10
|
-
getWalletAddressBytes: vi.fn().
|
|
10
|
+
getWalletAddress: vi.fn().mockResolvedValue('0x9999999999999999999999999999999999999999'),
|
|
11
|
+
getWalletAddressBytes: vi.fn().mockResolvedValue('0x9999999999999999999999999999999999999999'),
|
|
11
12
|
waitForTransactionReceipt: vi.fn(),
|
|
12
13
|
};
|
|
13
14
|
const mockBscSpokeProvider = new EvmSpokeProvider(mockEvmWalletProvider, spokeChainConfig[BSC_MAINNET_CHAIN_ID]);
|
|
@@ -46,8 +47,9 @@ describe('EvmAssetManagerService', () => {
|
|
|
46
47
|
});
|
|
47
48
|
});
|
|
48
49
|
describe('encodeTransfer', () => {
|
|
49
|
-
it('should correctly encode transfer transaction data', () => {
|
|
50
|
-
const
|
|
50
|
+
it('should correctly encode transfer transaction data', async () => {
|
|
51
|
+
const walletAddress = (await mockEvmWalletProvider.getWalletAddress());
|
|
52
|
+
const encodedCall = EvmAssetManagerService.encodeTransfer(bscEthToken, walletAddress, 1000000000000000000n, mockBscSpokeProvider.chainConfig.addresses.assetManager);
|
|
51
53
|
expect(encodedCall).toEqual({
|
|
52
54
|
address: mockBscSpokeProvider.chainConfig.addresses.assetManager,
|
|
53
55
|
value: 0n,
|
|
@@ -58,28 +60,31 @@ describe('EvmAssetManagerService', () => {
|
|
|
58
60
|
data: encodedCall.data,
|
|
59
61
|
});
|
|
60
62
|
expect(decoded.functionName).toBe('transfer');
|
|
61
|
-
expect(decoded.args).toEqual([bscEthToken,
|
|
63
|
+
expect(decoded.args).toEqual([bscEthToken, walletAddress, 1000000000000000000n, '0x']);
|
|
62
64
|
});
|
|
63
|
-
it('should handle zero amount transfers', () => {
|
|
64
|
-
const
|
|
65
|
+
it('should handle zero amount transfers', async () => {
|
|
66
|
+
const walletAddress = (await mockEvmWalletProvider.getWalletAddress());
|
|
67
|
+
const encodedCall = EvmAssetManagerService.encodeTransfer(bscEthToken, walletAddress, 0n, mockBscSpokeProvider.chainConfig.addresses.assetManager);
|
|
65
68
|
const decoded = decodeFunctionData({
|
|
66
69
|
abi: assetManagerAbi,
|
|
67
70
|
data: encodedCall.data,
|
|
68
71
|
});
|
|
69
|
-
expect(decoded.args).toEqual([bscEthToken,
|
|
72
|
+
expect(decoded.args).toEqual([bscEthToken, walletAddress, 0n, '0x']);
|
|
70
73
|
});
|
|
71
|
-
it('should handle maximum uint256 amount', () => {
|
|
74
|
+
it('should handle maximum uint256 amount', async () => {
|
|
75
|
+
const walletAddress = (await mockEvmWalletProvider.getWalletAddress());
|
|
72
76
|
const maxUint256 = 2n ** 256n - 1n;
|
|
73
|
-
const encodedCall = EvmAssetManagerService.encodeTransfer(bscEthToken,
|
|
77
|
+
const encodedCall = EvmAssetManagerService.encodeTransfer(bscEthToken, walletAddress, maxUint256, mockBscSpokeProvider.chainConfig.addresses.assetManager);
|
|
74
78
|
const decoded = decodeFunctionData({
|
|
75
79
|
abi: assetManagerAbi,
|
|
76
80
|
data: encodedCall.data,
|
|
77
81
|
});
|
|
78
82
|
expect(decoded.args?.[2]).toBe(maxUint256);
|
|
79
83
|
});
|
|
80
|
-
it('should maintain data precision for large numbers', () => {
|
|
84
|
+
it('should maintain data precision for large numbers', async () => {
|
|
85
|
+
const walletAddress = (await mockEvmWalletProvider.getWalletAddress());
|
|
81
86
|
const largeAmount = 2n ** 128n;
|
|
82
|
-
const encodedCall = EvmAssetManagerService.encodeTransfer(bscEthToken,
|
|
87
|
+
const encodedCall = EvmAssetManagerService.encodeTransfer(bscEthToken, walletAddress, largeAmount, mockBscSpokeProvider.chainConfig.addresses.assetManager);
|
|
83
88
|
const decoded = decodeFunctionData({
|
|
84
89
|
abi: assetManagerAbi,
|
|
85
90
|
data: encodedCall.data,
|
|
@@ -88,34 +93,44 @@ describe('EvmAssetManagerService', () => {
|
|
|
88
93
|
});
|
|
89
94
|
});
|
|
90
95
|
describe('depositToData', () => {
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
96
|
+
let depositParams;
|
|
97
|
+
beforeEach(async () => {
|
|
98
|
+
const walletAddress = (await mockEvmWalletProvider.getWalletAddress());
|
|
99
|
+
depositParams = {
|
|
100
|
+
token: bscEthToken,
|
|
101
|
+
to: walletAddress,
|
|
102
|
+
amount: 1000000000000000000n,
|
|
103
|
+
};
|
|
104
|
+
});
|
|
105
|
+
it('should correctly encode deposit transaction data', async () => {
|
|
97
106
|
const result = EvmAssetManagerService.depositToData(depositParams, mockBscSpokeProvider.chainConfig.chain.id);
|
|
98
107
|
expect(result).toBe('0x0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000022000000000000000000000000057fc2ac5701e463ae261adbd6c99fbeb48ce5293000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000004effb5813271699683c25c734f4dabc45b3637090000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000000000000000000000000000000000000000000000000000000000004effb5813271699683c25c734f4dabc45b36370900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000004447e7ef2400000000000000000000000057fc2ac5701e463ae261adbd6c99fbeb48ce52930000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000000000000000000000000000000000000000000000000000000000004effb5813271699683c25c734f4dabc45b363709000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000044a9059cbb00000000000000000000000099999999999999999999999999999999999999990000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000');
|
|
99
108
|
});
|
|
100
|
-
it('should throw error if asset config not found', () => {
|
|
109
|
+
it('should throw error if asset config not found', async () => {
|
|
110
|
+
const walletAddress = (await mockEvmWalletProvider.getWalletAddress());
|
|
101
111
|
const invalidToken = '0x9999999999999999999999999999999999999999';
|
|
102
|
-
const invalidParams = { ...depositParams, token: invalidToken };
|
|
112
|
+
const invalidParams = { ...depositParams, token: invalidToken, to: walletAddress };
|
|
103
113
|
expect(() => EvmAssetManagerService.depositToData(invalidParams, mockBscSpokeProvider.chainConfig.chain.id)).toThrow('[depositToData] Hub asset not found');
|
|
104
114
|
});
|
|
105
115
|
});
|
|
106
116
|
describe('withdrawAssetData', () => {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
117
|
+
let withdrawParams;
|
|
118
|
+
beforeEach(async () => {
|
|
119
|
+
const walletAddress = (await mockEvmWalletProvider.getWalletAddress());
|
|
120
|
+
withdrawParams = {
|
|
121
|
+
token: bscEthToken,
|
|
122
|
+
to: walletAddress,
|
|
123
|
+
amount: 1000000000000000000n,
|
|
124
|
+
};
|
|
125
|
+
});
|
|
126
|
+
it('should correctly encode withdraw transaction data', async () => {
|
|
113
127
|
const result = EvmAssetManagerService.withdrawAssetData(withdrawParams, mockHubProvider, mockBscSpokeProvider.chainConfig.chain.id);
|
|
114
128
|
expect(result).toBe('0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002000000000000000000000000060c5681bd1db4e50735c4ca3386005a4ba4937c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000e4c6b4180b00000000000000000000000057fc2ac5701e463ae261adbd6c99fbeb48ce529300000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000149999999999999999999999999999999999999999000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000');
|
|
115
129
|
});
|
|
116
|
-
it('should throw error if asset config not found', () => {
|
|
130
|
+
it('should throw error if asset config not found', async () => {
|
|
131
|
+
const walletAddress = (await mockEvmWalletProvider.getWalletAddress());
|
|
117
132
|
const invalidToken = '0x9999999999999999999999999999999999999999';
|
|
118
|
-
const invalidParams = { ...withdrawParams, token: invalidToken };
|
|
133
|
+
const invalidParams = { ...withdrawParams, token: invalidToken, to: walletAddress };
|
|
119
134
|
expect(() => EvmAssetManagerService.withdrawAssetData(invalidParams, mockHubProvider, mockBscSpokeProvider.chainConfig.chain.id)).toThrow('[withdrawAssetData] Hub asset not found');
|
|
120
135
|
});
|
|
121
136
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmAssetManagerService.test.js","sourceRoot":"","sources":["../../../../src/tests/services/hub/EvmAssetManagerService.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"EvmAssetManagerService.test.js","sourceRoot":"","sources":["../../../../src/tests/services/hub/EvmAssetManagerService.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getIntentRelayChainId } from '../../../index.js';
|
|
2
2
|
import { encodeFunctionData } from 'viem';
|
|
3
3
|
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
4
4
|
import { connectionAbi } from '../../../abis/index.js';
|
|
5
|
-
import { getHubChainConfig,
|
|
5
|
+
import { getHubChainConfig, spokeChainConfig, EvmHubProvider, EvmSpokeService, } from '../../../index.js';
|
|
6
|
+
import { AVALANCHE_MAINNET_CHAIN_ID, SONIC_MAINNET_CHAIN_ID } from '@sodax/types';
|
|
6
7
|
// Hoisted mocks must be before any other code
|
|
7
8
|
vi.mock('../../../utils/evm-utils.js', () => ({
|
|
8
9
|
encodeContractCalls: () => '0xencoded',
|
|
@@ -30,7 +31,7 @@ vi.mock('../../../constants.js', async (importOriginal) => {
|
|
|
30
31
|
chain: {
|
|
31
32
|
id: '0xa86a.avax',
|
|
32
33
|
name: 'Avalanche',
|
|
33
|
-
type: '
|
|
34
|
+
type: 'EVM',
|
|
34
35
|
},
|
|
35
36
|
addresses: {
|
|
36
37
|
assetManager: '0x5555555555555555555555555555555555555555',
|
|
@@ -44,7 +45,7 @@ vi.mock('../../../constants.js', async (importOriginal) => {
|
|
|
44
45
|
chain: {
|
|
45
46
|
id: 57054,
|
|
46
47
|
name: 'Mock Hub Chain',
|
|
47
|
-
type: '
|
|
48
|
+
type: 'EVM',
|
|
48
49
|
},
|
|
49
50
|
addresses: {
|
|
50
51
|
assetManager: '0x7777777777777777777777777777777777777777',
|
|
@@ -80,7 +81,7 @@ describe('EvmSpokeService', () => {
|
|
|
80
81
|
chain: {
|
|
81
82
|
id: mockChainId,
|
|
82
83
|
name: 'Avalanche',
|
|
83
|
-
type: '
|
|
84
|
+
type: 'EVM',
|
|
84
85
|
},
|
|
85
86
|
addresses: {
|
|
86
87
|
assetManager: '0x5555555555555555555555555555555555555555',
|
|
@@ -147,7 +148,7 @@ describe('EvmSpokeService', () => {
|
|
|
147
148
|
vi.mocked(mockSpokeWalletProvider.sendTransaction).mockResolvedValueOnce(mockTxHash);
|
|
148
149
|
await EvmSpokeService.callWallet(mockUser, mockPayload, mockSpokeProvider, mockHubProvider);
|
|
149
150
|
expect(mockSpokeWalletProvider.sendTransaction).toHaveBeenCalledWith(expect.objectContaining({
|
|
150
|
-
from: mockSpokeProvider.walletProvider.getWalletAddress(),
|
|
151
|
+
from: await mockSpokeProvider.walletProvider.getWalletAddress(),
|
|
151
152
|
to: mockSpokeProvider.chainConfig.addresses.connection,
|
|
152
153
|
data: encodeFunctionData({
|
|
153
154
|
abi: connectionAbi,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EvmSpokeService.test.js","sourceRoot":"","sources":["../../../../src/tests/services/spoke/EvmSpokeService.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"EvmSpokeService.test.js","sourceRoot":"","sources":["../../../../src/tests/services/spoke/EvmSpokeService.test.ts"],"names":[],"mappings":"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"}
|