rubic-sdk 5.42.0-alpha.oneinch.5 → 5.42.0-alpha.oneinch.7
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/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.d.ts +1 -0
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.js +11 -7
- package/lib/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.js.map +1 -1
- package/package.json +1 -1
|
@@ -11,4 +11,5 @@ export declare class OneinchCcrApiService {
|
|
|
11
11
|
static fetchReadySecrets(orderHash: string): Promise<OneinchReadySecretsResponse>;
|
|
12
12
|
static submitSecretForSwapOrder(orderHash: string, secret: string): Promise<void>;
|
|
13
13
|
static fetchTxStatus(data: CrossChainTradeData): Promise<TxStatusData>;
|
|
14
|
+
private static getApiTokenAddress;
|
|
14
15
|
}
|
|
@@ -5,6 +5,7 @@ const blockchain_id_1 = require("../../../../../../core/blockchain/utils/blockch
|
|
|
5
5
|
const tx_status_1 = require("../../../../../../core/blockchain/web3-public-service/web3-public/models/tx-status");
|
|
6
6
|
const injector_1 = require("../../../../../../core/injector/injector");
|
|
7
7
|
const fake_wallet_address_1 = require("../../../../../common/constants/fake-wallet-address");
|
|
8
|
+
const oneinch_ccr_native_address_1 = require("../constants/oneinch-ccr-native-address");
|
|
8
9
|
const oneinch_ccr_utils_1 = require("./oneinch-ccr-utils");
|
|
9
10
|
class OneinchCcrApiService {
|
|
10
11
|
static async fetchQuote({ srcToken, dstToken, walletAddress }) {
|
|
@@ -14,13 +15,13 @@ class OneinchCcrApiService {
|
|
|
14
15
|
params: {
|
|
15
16
|
srcChain: blockchain_id_1.blockchainId[srcToken.blockchain],
|
|
16
17
|
dstChain: blockchain_id_1.blockchainId[dstToken.blockchain],
|
|
17
|
-
srcTokenAddress: srcToken
|
|
18
|
-
dstTokenAddress: dstToken
|
|
18
|
+
srcTokenAddress: this.getApiTokenAddress(srcToken),
|
|
19
|
+
dstTokenAddress: this.getApiTokenAddress(dstToken),
|
|
19
20
|
amount: srcToken.stringWeiAmount,
|
|
20
21
|
walletAddress: walletAddress || fake_wallet_address_1.FAKE_WALLET_ADDRESS,
|
|
21
|
-
enableEstimate: false
|
|
22
|
-
fee: 100
|
|
23
|
-
source: 'rubic'
|
|
22
|
+
enableEstimate: false
|
|
23
|
+
// fee: 100
|
|
24
|
+
// source: 'rubic'
|
|
24
25
|
}
|
|
25
26
|
});
|
|
26
27
|
return res;
|
|
@@ -34,8 +35,8 @@ class OneinchCcrApiService {
|
|
|
34
35
|
try {
|
|
35
36
|
const queryParams = `srcChain=${blockchain_id_1.blockchainId[srcToken.blockchain]}&
|
|
36
37
|
dstChain=${blockchain_id_1.blockchainId[dstToken.blockchain]}&
|
|
37
|
-
srcTokenAddress=${srcToken
|
|
38
|
-
dstTokenAddress=${dstToken
|
|
38
|
+
srcTokenAddress=${this.getApiTokenAddress(srcToken)}&
|
|
39
|
+
dstTokenAddress=${this.getApiTokenAddress(dstToken)}&
|
|
39
40
|
amount=${srcToken.stringWeiAmount}&
|
|
40
41
|
walletAddress=${walletAddress}&
|
|
41
42
|
fee=100&
|
|
@@ -107,6 +108,9 @@ preset=${quote.recommendedPreset}`;
|
|
|
107
108
|
return { status: tx_status_1.TX_STATUS.PENDING, hash: null };
|
|
108
109
|
}
|
|
109
110
|
}
|
|
111
|
+
static getApiTokenAddress(token) {
|
|
112
|
+
return token.isNative ? oneinch_ccr_native_address_1.ONEINCH_NATIVE_ADDRESS : token.address;
|
|
113
|
+
}
|
|
110
114
|
}
|
|
111
115
|
exports.OneinchCcrApiService = OneinchCcrApiService;
|
|
112
116
|
OneinchCcrApiService.apiUrl = 'https://api.1inch.dev/fusion-plus';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oneinch-ccr-api-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"oneinch-ccr-api-service.js","sourceRoot":"","sources":["../../../../../../../src/features/cross-chain/calculation-manager/providers/oneinch-provider/services/oneinch-ccr-api-service.ts"],"names":[],"mappings":"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"}
|