rubic-sdk 5.24.0-alpha.owlto.1 → 5.24.0-alpha.owlto.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/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/models/owl-to-trade-types.d.ts +2 -0
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.js +6 -4
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.js.map +1 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.d.ts +2 -1
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js +7 -3
- package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js.map +1 -1
- package/package.json +1 -1
@@ -12,6 +12,7 @@ export interface OwlToGetGasDataParams {
|
|
12
12
|
providerAddress: string;
|
13
13
|
gasLimit: BigNumber;
|
14
14
|
swapParams: OwlTopSwapRequest;
|
15
|
+
approveAddress: string;
|
15
16
|
}
|
16
17
|
export interface OwlToTradeParams {
|
17
18
|
crossChainTrade: {
|
@@ -21,6 +22,7 @@ export interface OwlToTradeParams {
|
|
21
22
|
feeInfo: FeeInfo;
|
22
23
|
priceImpact: number | null;
|
23
24
|
swapParams: OwlTopSwapRequest;
|
25
|
+
approveAddress: string;
|
24
26
|
};
|
25
27
|
providerAddress: string;
|
26
28
|
routePath: RubicStep[];
|
@@ -43,7 +43,7 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
43
43
|
tokenSymbol: pairInfo.token_name,
|
44
44
|
walletAddress
|
45
45
|
};
|
46
|
-
const { receive_value, gas_fee } = await owl_to_api_service_1.OwlToApiService.getSwapInfo(swapParams);
|
46
|
+
const { receive_value, gas_fee, txs } = await owl_to_api_service_1.OwlToApiService.getSwapInfo(swapParams);
|
47
47
|
const to = new tokens_1.PriceTokenAmount({
|
48
48
|
...toToken.asStruct,
|
49
49
|
weiAmount: new bignumber_js_1.default(receive_value.raw_value)
|
@@ -55,7 +55,8 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
55
55
|
toToken: to,
|
56
56
|
providerAddress: options.providerAddress,
|
57
57
|
gasLimit: new bignumber_js_1.default(gas_fee.raw_value),
|
58
|
-
swapParams
|
58
|
+
swapParams,
|
59
|
+
approveAddress: txs.transfer_body.to
|
59
60
|
})
|
60
61
|
: null;
|
61
62
|
const trade = new owl_to_bridge_trade_1.OwlToBridgeTrade({
|
@@ -65,12 +66,13 @@ class OwlToBridgeProvider extends cross_chain_provider_1.CrossChainProvider {
|
|
65
66
|
to,
|
66
67
|
gasData,
|
67
68
|
priceImpact: from.calculatePriceImpactPercent(to),
|
68
|
-
swapParams
|
69
|
+
swapParams,
|
70
|
+
approveAddress: txs.transfer_body.to
|
69
71
|
},
|
70
72
|
providerAddress: options.providerAddress,
|
71
73
|
routePath: await this.getRoutePath(from, to)
|
72
74
|
});
|
73
|
-
if (from.tokenAmount.lt(
|
75
|
+
if (from.tokenAmount.lt(minAmountBN)) {
|
74
76
|
return {
|
75
77
|
trade,
|
76
78
|
error: new errors_1.MinAmountError(minAmountBN, from.symbol),
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"owl-to-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.ts"],"names":[],"mappings":";;;;;;AAAA,gEAAqC;AACrC,8CAAmE;AACnE,8CAAiE;AAEjE,sGAAkG;AAClG,qHAA+G;AAC/G,yFAAmF;AAInF,yEAAoE;AACpE,8DAA2D;AAI3D,oHAA6G;AAC7G,iFAG6C;AAE7C,+DAAyD;AACzD,sEAAgE;AAEhE,MAAa,mBAAoB,SAAQ,yCAAkB;IAA3D;;QACW,SAAI,GAAwB,yBAAW,CAAC,aAAa,CAAC;
|
1
|
+
{"version":3,"file":"owl-to-bridge-provider.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-provider.ts"],"names":[],"mappings":"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"}
|
@@ -14,7 +14,7 @@ import { TradeInfo } from '../common/models/trade-info';
|
|
14
14
|
import { OwlToGetGasDataParams, OwlToTradeParams } from './models/owl-to-trade-types';
|
15
15
|
export declare class OwlToBridgeTrade extends EvmCrossChainTrade {
|
16
16
|
/** @internal */
|
17
|
-
static getGasData({ feeInfo, fromToken, toToken, providerAddress, gasLimit, swapParams }: OwlToGetGasDataParams): Promise<GasData | null>;
|
17
|
+
static getGasData({ feeInfo, fromToken, toToken, providerAddress, gasLimit, swapParams, approveAddress }: OwlToGetGasDataParams): Promise<GasData | null>;
|
18
18
|
/**ABSTRACT PROPS */
|
19
19
|
readonly type: CrossChainTradeType;
|
20
20
|
readonly isAggregator: boolean;
|
@@ -28,6 +28,7 @@ export declare class OwlToBridgeTrade extends EvmCrossChainTrade {
|
|
28
28
|
readonly priceImpact: number | null;
|
29
29
|
/** */
|
30
30
|
private readonly swapParams;
|
31
|
+
private readonly providerGateway;
|
31
32
|
private get fromBlockchain();
|
32
33
|
protected get fromContractAddress(): string;
|
33
34
|
protected get methodName(): string;
|
package/lib/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.js
CHANGED
@@ -16,7 +16,7 @@ const proxy_cross_chain_evm_trade_1 = require("../common/proxy-cross-chain-evm-f
|
|
16
16
|
const owl_to_api_service_1 = require("./services/owl-to-api-service");
|
17
17
|
class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
18
18
|
/** @internal */
|
19
|
-
static async getGasData({ feeInfo, fromToken, toToken, providerAddress, gasLimit, swapParams }) {
|
19
|
+
static async getGasData({ feeInfo, fromToken, toToken, providerAddress, gasLimit, swapParams, approveAddress }) {
|
20
20
|
try {
|
21
21
|
const trade = new OwlToBridgeTrade({
|
22
22
|
crossChainTrade: {
|
@@ -25,7 +25,8 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
25
25
|
to: toToken,
|
26
26
|
priceImpact: fromToken.calculatePriceImpactPercent(toToken) || 0,
|
27
27
|
gasData: null,
|
28
|
-
swapParams
|
28
|
+
swapParams,
|
29
|
+
approveAddress
|
29
30
|
},
|
30
31
|
providerAddress,
|
31
32
|
routePath: []
|
@@ -43,7 +44,9 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
43
44
|
}
|
44
45
|
get fromContractAddress() {
|
45
46
|
// @TODO Add owl-to contract addresses
|
46
|
-
return this.isProxyTrade
|
47
|
+
return this.isProxyTrade
|
48
|
+
? rubic_proxy_contract_address_1.rubicProxyContractAddress[this.fromBlockchain].gateway
|
49
|
+
: this.providerGateway;
|
47
50
|
}
|
48
51
|
get methodName() {
|
49
52
|
return 'startBridgeTokensViaTransfer';
|
@@ -62,6 +65,7 @@ class OwlToBridgeTrade extends evm_cross_chain_trade_1.EvmCrossChainTrade {
|
|
62
65
|
this.toTokenAmountMin = crossChainTrade.to.tokenAmount;
|
63
66
|
this.feeInfo = crossChainTrade.feeInfo;
|
64
67
|
this.swapParams = crossChainTrade.swapParams;
|
68
|
+
this.providerGateway = crossChainTrade.approveAddress;
|
65
69
|
}
|
66
70
|
async getContractParams(options) {
|
67
71
|
const receiverAddress = options?.receiverAddress || this.walletAddress;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"owl-to-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.ts"],"names":[],"mappings":";;;AAGA,6GAAwG;AAExG,yDAAsD;AACtD,2FAAwF;AAGxF,gFAAkG;AAClG,qEAAmE;AACnE,mFAA4E;AAC5E,mGAA6F;AAC7F,qHAA8G;AAC9G,2HAAoH;AACpH,iGAA2F;AAE3F,8DAAuE;AAKvE,oHAA6G;AAI7G,sEAAgE;AAEhE,MAAa,gBAAiB,SAAQ,0CAAkB;IACpD,gBAAgB;IACT,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAC3B,OAAO,EACP,SAAS,EACT,OAAO,EACP,eAAe,EACf,QAAQ,EACR,UAAU,
|
1
|
+
{"version":3,"file":"owl-to-bridge-trade.js","sourceRoot":"","sources":["../../../../../../src/features/cross-chain/calculation-manager/providers/owl-to-bridge/owl-to-bridge-trade.ts"],"names":[],"mappings":"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"}
|