rubic-sdk 5.57.3-alpha.coral.2 → 5.57.3-alpha.coral.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/lib/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-trade.d.ts +0 -4
- package/lib/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-trade.js +13 -38
- package/lib/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-trade.js.map +1 -1
- package/package.json +1 -1
|
@@ -23,8 +23,6 @@ export declare class SquidrouterCrossChainTrade extends EvmCrossChainTrade {
|
|
|
23
23
|
private readonly onChainTrade;
|
|
24
24
|
private readonly transactionRequest;
|
|
25
25
|
squidrouterRequestId: string | undefined;
|
|
26
|
-
/** @internal */
|
|
27
|
-
static getGasData(from: PriceTokenAmount<EvmBlockchainName>, toToken: PriceTokenAmount<EvmBlockchainName>, transactionRequest: SquidrouterTransactionRequest, feeInfo: FeeInfo, receiverAddress: string, providerAddress: string): Promise<GasData | null>;
|
|
28
26
|
readonly type: "squidrouter";
|
|
29
27
|
readonly isAggregator = false;
|
|
30
28
|
readonly onChainSubtype: OnChainSubtype;
|
|
@@ -39,8 +37,6 @@ export declare class SquidrouterCrossChainTrade extends EvmCrossChainTrade {
|
|
|
39
37
|
protected get fromContractAddress(): string;
|
|
40
38
|
readonly feeInfo: FeeInfo;
|
|
41
39
|
protected get methodName(): string;
|
|
42
|
-
private readonly creationTimestamp;
|
|
43
|
-
private readonly timeLimitMs;
|
|
44
40
|
constructor(crossChainTrade: {
|
|
45
41
|
from: PriceTokenAmount<EvmBlockchainName>;
|
|
46
42
|
to: PriceTokenAmount<EvmBlockchainName>;
|
|
@@ -8,7 +8,6 @@ const bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
|
8
8
|
const errors_1 = require("../../../../../common/errors");
|
|
9
9
|
const errors_2 = require("../../../../../common/utils/errors");
|
|
10
10
|
const evm_web3_pure_1 = require("../../../../../core/blockchain/web3-pure/typed-web3-pure/evm-web3-pure/evm-web3-pure");
|
|
11
|
-
const injector_1 = require("../../../../../core/injector/injector");
|
|
12
11
|
const squidrouter_api_service_1 = require("../../../../common/providers/squidrouter/services/squidrouter-api-service");
|
|
13
12
|
const get_from_without_fee_1 = require("../../../../common/utils/get-from-without-fee");
|
|
14
13
|
const cross_chain_trade_type_1 = require("../../models/cross-chain-trade-type");
|
|
@@ -18,50 +17,23 @@ const gateway_rubic_cross_chain_abi_1 = require("../common/evm-cross-chain-trade
|
|
|
18
17
|
const evm_cross_chain_trade_1 = require("../common/evm-cross-chain-trade/evm-cross-chain-trade");
|
|
19
18
|
const bridge_type_1 = require("../common/models/bridge-type");
|
|
20
19
|
const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-facade/proxy-cross-chain-evm-trade");
|
|
21
|
-
const squidrouter_contract_address_1 = require("./constants/squidrouter-contract-address");
|
|
22
|
-
const get_cross_chain_gas_data_1 = require("../../utils/get-cross-chain-gas-data");
|
|
23
20
|
/**
|
|
24
21
|
* Calculated DeBridge cross-chain trade.
|
|
25
22
|
*/
|
|
26
23
|
class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
27
|
-
/** @internal */
|
|
28
|
-
static async getGasData(from, toToken, transactionRequest, feeInfo, receiverAddress, providerAddress) {
|
|
29
|
-
const fromBlockchain = from.blockchain;
|
|
30
|
-
const walletAddress = injector_1.Injector.web3PrivateService.getWeb3PrivateByBlockchain(fromBlockchain).address;
|
|
31
|
-
if (!walletAddress) {
|
|
32
|
-
return null;
|
|
33
|
-
}
|
|
34
|
-
try {
|
|
35
|
-
const trade = new SquidrouterCrossChainTrade({
|
|
36
|
-
from,
|
|
37
|
-
to: toToken,
|
|
38
|
-
gasData: null,
|
|
39
|
-
priceImpact: 0,
|
|
40
|
-
allowanceTarget: '',
|
|
41
|
-
slippage: 0,
|
|
42
|
-
feeInfo,
|
|
43
|
-
cryptoFeeToken: from,
|
|
44
|
-
onChainTrade: null,
|
|
45
|
-
onChainSubtype: { from: undefined, to: undefined },
|
|
46
|
-
transactionRequest
|
|
47
|
-
}, providerAddress || evm_web3_pure_1.EvmWeb3Pure.EMPTY_ADDRESS, [], false);
|
|
48
|
-
return (0, get_cross_chain_gas_data_1.getCrossChainGasData)(trade, receiverAddress);
|
|
49
|
-
}
|
|
50
|
-
catch (_err) {
|
|
51
|
-
return null;
|
|
52
|
-
}
|
|
53
|
-
}
|
|
54
24
|
get fromBlockchain() {
|
|
55
25
|
return this.from.blockchain;
|
|
56
26
|
}
|
|
57
27
|
get fromContractAddress() {
|
|
58
28
|
return this.isProxyTrade
|
|
59
29
|
? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].gateway
|
|
60
|
-
:
|
|
30
|
+
: this.allowanceTarget;
|
|
61
31
|
}
|
|
62
32
|
get methodName() {
|
|
63
33
|
return 'startBridgeTokensViaGenericCrossChain';
|
|
64
34
|
}
|
|
35
|
+
// private readonly creationTimestamp: number;
|
|
36
|
+
// private readonly timeLimitMs: number = 25 * 1_000;
|
|
65
37
|
constructor(crossChainTrade, providerAddress, routePath, useProxy) {
|
|
66
38
|
super(providerAddress, routePath, useProxy);
|
|
67
39
|
this.type = cross_chain_trade_type_1.CROSS_CHAIN_TRADE_TYPE.SQUIDROUTER;
|
|
@@ -71,8 +43,7 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
|
|
|
71
43
|
to: undefined
|
|
72
44
|
};
|
|
73
45
|
this.bridgeType = bridge_type_1.BRIDGE_TYPE.SQUIDROUTER;
|
|
74
|
-
this.
|
|
75
|
-
this.creationTimestamp = Date.now();
|
|
46
|
+
// this.creationTimestamp = Date.now();
|
|
76
47
|
this.from = crossChainTrade.from;
|
|
77
48
|
this.to = crossChainTrade.to;
|
|
78
49
|
this.gasData = crossChainTrade.gasData;
|
|
@@ -157,11 +128,15 @@ class SquidrouterCrossChainTrade extends evm_cross_chain_trade_1.EvmCrossChainTr
|
|
|
157
128
|
};
|
|
158
129
|
}
|
|
159
130
|
async getTransactionConfigAndAmount(receiverAddress) {
|
|
160
|
-
const currentTimestamp = Date.now();
|
|
161
|
-
const spentTime = currentTimestamp - this.creationTimestamp;
|
|
162
|
-
if (spentTime > this.timeLimitMs) {
|
|
163
|
-
|
|
164
|
-
|
|
131
|
+
// const currentTimestamp = Date.now();
|
|
132
|
+
// const spentTime = currentTimestamp - this.creationTimestamp;
|
|
133
|
+
// if (spentTime > this.timeLimitMs) {
|
|
134
|
+
// throw new TimeoutError(
|
|
135
|
+
// `Coral trade lives only 25 seconds from creation. Already spent ${
|
|
136
|
+
// spentTime / 1000
|
|
137
|
+
// } seconds.`
|
|
138
|
+
// );
|
|
139
|
+
// }
|
|
165
140
|
const requestParams = {
|
|
166
141
|
...this.transactionRequest,
|
|
167
142
|
toAddress: receiverAddress
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"squidrouter-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-trade.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"squidrouter-cross-chain-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/squidrouter-provider/squidrouter-cross-chain-trade.ts"],"names":[],"mappings":"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"}
|